Merge branch '345-fix-pg-detection'

ckan · Feb 6, 2013 · 27b7753 · 27b7753
2 parents 4fe7b50 + 6c5453a
commit 27b7753
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ckan/model/meta.py b/ckan/model/meta.py
@@ -161,4 +161,6 @@ def engine_is_sqlite():
 
 def engine_is_pg():
     # Returns true iff the engine is connected to a postgresql database.
-    return engine.url.drivername in ['psycopg2', 'postgres']
+    # According to http://docs.sqlalchemy.org/en/latest/core/engines.html#postgresql
+    # all Postgres driver names start with `postgresql`
+    return engine.url.drivername.startswith('postgresql')
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
@@ -68,8 +68,7 @@ def configure(self, config):
                 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.")
+                    "Permission checks and the creation of _table_metadata are skipped.")
         else:
             log.warn("We detected that you do not use a PostgreSQL database. "
                     "The DataStore will NOT work and datastore tests will be skipped.")