code cleanup

ckanext/datastore/plugin.py

@@ -56,7 +56,7 @@ def new_resource_show(context, data_dict):
             try:
                 connection = engine.connect()
                 result = connection.execute(
-                    'select * from pg_tables where tablename = %s',
+                    'select 1 from pg_tables where tablename = %s',
                     new_data_dict['id']
                 ).fetchone()
                 if result:
@@ -78,7 +78,7 @@ def new_resource_show(context, data_dict):
     def _check_separate_db(self):
         '''
         Make sure the datastore is on a separate db. Otherwise one could access
-        all internal tables via the api. 
+        all internal tables via the api.
         '''
 
         if  self.write_url == self.read_url:
@@ -95,16 +95,16 @@ def _check_read_permissions(self):
         Check whether the right permissions are set for the read only user.
         A table is created by the write user to test the read only user.
         '''
-        write_connection = db._get_engine(None, 
+        write_connection = db._get_engine(None,
             {'connection_url': self.write_url}).connect()
         write_connection.execute(u"CREATE TABLE public.foo (id INTEGER NOT NULL, name VARCHAR)")
 
-        read_connection = db._get_engine(None, 
+        read_connection = db._get_engine(None,
             {'connection_url': self.read_url}).connect()
         read_trans = read_connection.begin()
 
         statements = [
-            u"CREATE TABLE public.bar (id INTEGER NOT NULL, name VARCHAR)", 
+            u"CREATE TABLE public.bar (id INTEGER NOT NULL, name VARCHAR)",
             u"INSERT INTO public.foo VALUES (1, 'okfn')"
         ]
 
@@ -129,7 +129,7 @@ def _check_read_permissions(self):
 
     def _create_alias_table(self):
         mapping_sql = '''
-            SELECT distinct 
+            SELECT distinct
                 d.refobjid::regclass AS main,
                 r.ev_class::regclass AS alias
             FROM

ckanext/datastore/tests/test_datastore.py

@@ -271,7 +271,7 @@ def test_guess_types(self):
         assert results.rowcount == 3
         for i, row in enumerate(results):
             assert data['records'][i].get('book') == row['book']
-            assert data['records'][i].get('author') == (json.loads(row['author'][0]) if row['author'] else None) 
+            assert data['records'][i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
         model.Session.remove()
 
         ### extend types
@@ -802,7 +802,7 @@ def teardown_class(cls):
         model.repo.rebuild_db()
 
     def test_is_single_statement(self):
-        singles = ['SELECT * FROM footable', 
+        singles = ['SELECT * FROM footable',
             'SELECT * FROM "bartable"',
             'SELECT * FROM "bartable";',
             "select 'foo'||chr(59)||'bar'"]