Hard-code provider name in connector, so existing test is fixed

qgis · Jan 9, 2020 · 67ce48f · 67ce48f
1 parent 6aa87fa
commit 67ce48f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/python/plugins/db_manager/db_plugins/postgis/connector.py b/python/plugins/db_manager/db_plugins/postgis/connector.py
@@ -161,7 +161,7 @@ def close(self):
 
 class PostGisDBConnector(DBConnector):
 
-    def __init__(self, uri, dbplugin):
+    def __init__(self, uri):
         """Creates a new PostgreSQL connector
 
         :param uri: data source URI
@@ -178,11 +178,8 @@ def __init__(self, uri, dbplugin):
         #self.passwd = uri.password()
         self.host = uri.host()
 
-        self.dbplugin = dbplugin
-        md = QgsProviderRegistry.instance().providerMetadata(dbplugin.providerName())
-        self.core_connection = md.findConnection(dbplugin.connectionName())
-        if self.core_connection is None:
-            self.core_connection = md.createConnection(dbplugin.connectionName(), uri.database())
+        md = QgsProviderRegistry.instance().providerMetadata('postgres')
+        self.core_connection = md.createConnection(uri.database())
 
         c = self._execute(None, u"SELECT current_user,current_database()")
         self.user, self.dbname = self._fetchone(c)

diff --git a/python/plugins/db_manager/db_plugins/postgis/plugin.py b/python/plugins/db_manager/db_plugins/postgis/plugin.py
@@ -112,7 +112,7 @@ def __init__(self, connection, uri):
         Database.__init__(self, connection, uri)
 
     def connectorsFactory(self, uri):
-        return PostGisDBConnector(uri, self.connection())
+        return PostGisDBConnector(uri)
 
     def dataTablesFactory(self, row, db, schema=None):
         return PGTable(row, db, schema)