enable search for _table_metadata

ckan · Sep 10, 2012 · f5868ac · f5868ac
1 parent e986099
commit f5868ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
@@ -67,7 +67,7 @@ def datastore_upsert(context, data_dict):
         :param upsert: update if record with same key already exists,
                         otherwise insert
         :param insert: insert only, faster because checks are omitted
-        :param update: update only, exception if duplicates occur
+        :param update: update only, exception if key does not exist
     :type method: string
 
     :returns: the newly created data object.
@@ -173,7 +173,7 @@ def datastore_search(context, data_dict):
         if result:
             alias_exists = model.Resource.get(result[0].strip('"'))
 
-    if not (res_exists or alias_exists):
+    if not (res_exists or alias_exists or res_id=='_table_metadata'):
         raise p.toolkit.ObjectNotFound(p.toolkit._(
             'Resource "{}" was not found.'.format(res_id)
         ))

diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
@@ -1,6 +1,5 @@
 import logging
 import pylons
-import sqlalchemy
 from sqlalchemy.exc import ProgrammingError
 import ckan.plugins as p
 import ckanext.datastore.logic.action as action
@@ -129,18 +128,20 @@ def _check_read_permissions(self):
 
     def _create_alias_table(self):
         mapping_sql = '''
-            SELECT distinct
+            SELECT DISTINCT ON (r.ev_class, dependent.relname)
+                r.ev_class AS "_id",
                 dependee.relname AS name,
-                -- r.ev_class::regclass AS oid,
+                -- r.ev_class AS oid,
                 dependent.relname AS alias_of
-                -- d.refobjid::regclass AS oid,
+                -- d.refobjid::regclass AS oid
             FROM
-                pg_attribute    as a
-                JOIN pg_depend  as d on d.refobjid = a.attrelid AND d.refobjsubid = a.attnum
-                JOIN pg_rewrite as r ON d.objid = r.oid
-                JOIN pg_class as dependee ON r.ev_class = dependee.oid
-                JOIN pg_class as dependent ON d.refobjid = dependent.oid
+                pg_attribute    AS a
+                JOIN pg_depend  aS d on d.refobjid = a.attrelid AND d.refobjsubid = a.attnum
+                JOIN pg_rewrite AS r ON d.objid = r.oid
+                JOIN pg_class AS dependee ON r.ev_class = dependee.oid
+                JOIN pg_class AS dependent ON d.refobjid = dependent.oid
             WHERE dependee.relnamespace = (SELECT oid FROM pg_namespace WHERE nspname='public')
+            ORDER BY r.ev_class ASC
         '''
         create_alias_table_sql = u'create or replace view "_table_metadata" as {}'.format(mapping_sql)
         connection = db._get_engine(None,