Changeset 3852 for TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/db_funcs.py

Timestamp:

07/05/08 10:16:54 (13 years ago)

Author:

cbyrom

Message:

Add port to db_connect and adjust set up of connection to allow this to
be specified (connection string doesn't seem to allow the inclusion of this).
Also, remove default connection settings, to avoid security issues.

File:

• TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/db_funcs.py (modified) (2 diffs)

TI01-discovery/branches/ingestAutomation-upgrade/OAIBatch/db_funcs.py

@@ -5 +5 @@
 import pgdb, logging, sys
 
-def db_connect(databaseName='discoverydb', hostName='localhost', userName='postgres', password='pass01word'):
+def db_connect(databaseName, hostName, userName, password, port='5432'):
         '''
         Open a Postgres database connection
@@ -12 +12 @@
         @param userName: Name of user to connect to DB as
         @param password: Password for user 
+        @param port: Port to use - defaults to 5432
         '''
         logging.info("Setting up connection to DB: " + databaseName + " on " + hostName)
-        connection_string = hostName + ':' + databaseName + ':' + userName + ':' + password
-        connection = pgdb.connect(connection_string)
+        connection = pgdb.connect(host = hostName + ":" + port, database= databaseName, \
+                                                          user = userName, password = password)
         logging.info("DB connection established")
         return connection