Merge pull request #58 from plone/plone-newt

fix plone newt support
plone · Jan 28, 2017 · 01a7113 · 01a7113
2 parents 9a7266e + b86fb70
commit 01a7113
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/plone.server/plone/server/factory.py b/src/plone.server/plone/server/factory.py
@@ -485,12 +485,9 @@ def make_app(config_file=None, settings=None):
                 dbo = Database(key, db)
             elif dbconfig['storage'] == 'NEWT' and NEWT:
                 options = Options(**dbconfig['options'])
-                if dbconfig['type'] == 'postgres':
-                    from relstorage.adapters.postgresql import PostgreSQLAdapter
-                    dsn = "dbname={dbname} user={username} host={host} password={password} port={port}".format(**dbconfig['dsn'])
-                    adapter = PostgreSQLAdapter(dsn=dsn, options=options)
-                rs = RelStorage(adapter=adapter, options=options)
-                db = DB(rs)
+                dsn = "dbname={dbname} user={username} host={host} password={password} port={port}".format(**dbconfig['dsn'])
+                adapter = newt.db.storage(dsn=dsn, **dbconfig['options'])
+                db = newt.db.DB(dsn, **dbconfig['options'])
                 try:
                     conn = db.open()
                     rootobj = conn.root()
@@ -503,8 +500,8 @@ def make_app(config_file=None, settings=None):
                     rootobj = None
                     conn.close()
                     db.close()
-                rs = RelStorage(adapter=adapter, options=options)
-                db = newt.db._db.NewtDB(RequestAwareDB(rs, **config))
+                adapter = newt.db.storage(dsn, **dbconfig['options'])
+                db = newt.db._db.NewtDB(RequestAwareDB(adapter, **config))
                 dbo = Database(key, db)
             elif dbconfig['storage'] == 'DEMO':
                 storage = DemoStorage(name=dbconfig['name'])