Merge branch '345-fix-pg-detection'

ckan · Feb 4, 2013 · 854a0e6 · 854a0e6
2 parents ca1a7d7 + e5485d9
commit 854a0e6
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/ckan/model/meta.py b/ckan/model/meta.py
@@ -153,14 +153,12 @@ def after_rollback(self, session):
 # names, you'll need a metadata for each database
 metadata = MetaData()
 
+
 def engine_is_sqlite():
-    """
-    Returns true iff the engine is connected to a sqlite database.
-    """
+    # 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'
+    # Returns true iff the engine is connected to a postgresql database.
+    return engine.url.drivername in ['psycopg2', 'postgres']