sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow db_manager use of connections with no parameters

Browse Source 
Fixes 'Error: database "" does not exist' message.
Closes bug #9037
This commit is contained in:
Sandro Santilli 2014-06-16 12:03:14 +02:00
parent acc6271f18
commit 39b3e5fa10
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/plugins/db_manager/db_plugins/postgis/connector.py
View File

@ -28,6 +28,7 @@ from PyQt4.QtGui import *
from ..connector import DBConnector
from ..plugin import ConnectionError, DbError, Table
import os
import psycopg2
import psycopg2.extensions
# use unicode!
@ -42,14 +43,11 @@ class PostGisDBConnector(DBConnector):
def __init__(self, uri):
DBConnector.__init__(self, uri)
self.host = uri.host()
self.port = uri.port()
self.dbname = uri.database()
self.user = uri.username()
self.passwd = uri.password()
if self.dbname == '' or self.dbname is None:
self.dbname = self.user
self.host = uri.host() or os.environ.get('PGHOST')
self.port = uri.port() or os.environ.get('PGPORT')
self.user = uri.username() or os.environ.get('PGUSER') or os.environ.get('USER')
self.dbname = uri.database() or os.environ.get('PGDATABASE') or self.user
self.passwd = uri.password() or os.environ.get('PGPASSWORD')
try:
self.connection = psycopg2.connect( self._connectionInfo().encode('utf-8') )