Merge branch '287-datastore-tests-only-on-pg'

ckan/model/__init__.py

@@ -13,6 +13,7 @@
 from meta import (
     Session,
     engine_is_sqlite,
+    engine_is_pg,
 )
 from core import (
     System,

ckan/model/meta.py

@@ -10,7 +10,7 @@
 import extension
 import ckan.lib.activity_streams_session_extension as activity
 
-__all__ = ['Session', 'engine_is_sqlite']
+__all__ = ['Session', 'engine_is_sqlite', 'engine_is_pg']
 
 
 class CkanCacheExtension(SessionExtension):
@@ -158,3 +158,9 @@ def engine_is_sqlite():
     Returns true iff the engine is connected to a sqlite database.
     """
     return engine.url.drivername == 'sqlite'
+
+def engine_is_pg():
+    """
+    Returns true iff the engine is connected to a postgresql database.
+    """
+    return engine.url.drivername == 'psycopg2'

ckan/tests/__init__.py

@@ -330,6 +330,10 @@ def is_migration_supported():
     is_supported_db = not model.engine_is_sqlite()
     return is_supported_db
 
+def is_datastore_supported():
+    is_supported_db = model.engine_is_pg()
+    return is_supported_db
+
 def search_related(test):
     def skip_test(*args):
         raise SkipTest("Search not supported")

ckanext/datastore/plugin.py

@@ -1,11 +1,13 @@
 import logging
 import pylons
 from sqlalchemy.exc import ProgrammingError
+
 import ckan.plugins as p
 import ckanext.datastore.logic.action as action
 import ckanext.datastore.logic.auth as auth
 import ckanext.datastore.db as db
 import ckan.logic as logic
+import ckan.model as model
 
 log = logging.getLogger(__name__)
 _get_or_bust = logic.get_or_bust
@@ -52,21 +54,25 @@ def configure(self, config):
         else:
             self.read_url = self.config['ckan.datastore.read_url']
 
-        if not self._is_read_only_database():
-            # Make sure that the right permissions are set
-            # so that no harmful queries can be made
-            if not ('debug' in config and config['debug']):
-                self._check_separate_db()
-            if self.legacy_mode:
-                log.warn('Legacy mode active. The sql search will not be available.')
-            else:
-                self._check_read_permissions()
+        if model.engine_is_pg():
+            if not self._is_read_only_database():
+                # Make sure that the right permissions are set
+                # so that no harmful queries can be made
+                if not ('debug' in config and config['debug']):
+                    self._check_separate_db()
+                if self.legacy_mode:
+                    log.warn('Legacy mode active. The sql search will not be available.')
+                else:
+                    self._check_read_permissions()
 
-            self._create_alias_table()
+                self._create_alias_table()
+            else:
+                log.warn("We detected that CKAN is running on a read only database. "
+                    "Permission checks and _table_metadata creation are skipped."
+                    "Make sure that replication is properly set-up.")
         else:
-            log.warn("We detected that CKAN is running on a read only database. "
-                "Permission checks and _table_metadata creation are skipped."
-                "Make sure that replication is properly set-up.")
+            log.warn("We detected that you do not use a PostgreSQL database. "
+                    "The DataStore will NOT work and datastore tests will be skipped.")
 
         ## Do light wrapping around action function to add datastore_active
         ## to resource dict.  Not using IAction extension as this prevents other plugins

ckanext/datastore/tests/test_create.py

@@ -1,4 +1,5 @@
 import json
+import nose
 
 import sqlalchemy.orm as orm
 
@@ -18,6 +19,8 @@ class TestDatastoreCreate(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')

ckanext/datastore/tests/test_delete.py

@@ -1,4 +1,5 @@
 import json
+import nose
 
 import sqlalchemy
 import sqlalchemy.orm as orm
@@ -19,6 +20,8 @@ class TestDatastoreDelete(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')

ckanext/datastore/tests/test_search.py

@@ -1,4 +1,5 @@
 import json
+import nose
 import pprint
 
 import sqlalchemy.orm as orm
@@ -18,6 +19,8 @@ class TestDatastoreSearch(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -331,6 +334,8 @@ def test_search_table_metadata(self):
 class TestDatastoreFullTextSearch(tests.WsgiAppCase):
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -397,6 +402,8 @@ class TestDatastoreSQL(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')

ckanext/datastore/tests/test_upsert.py

@@ -1,4 +1,5 @@
 import json
+import nose
 import datetime
 
 import sqlalchemy.orm as orm
@@ -19,6 +20,8 @@ class TestDatastoreUpsert(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -243,6 +246,8 @@ class TestDatastoreInsert(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
@@ -344,6 +349,8 @@ class TestDatastoreUpdate(tests.WsgiAppCase):
 
     @classmethod
     def setup_class(cls):
+        if not tests.is_datastore_supported():
+            raise nose.SkipTest("Datastore not supported")
         p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')