evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add sql param to Database constructor - aim is to have just one SQL instance passed around and to use Database for db connections and methods

Browse Source
This commit is contained in:
sqlcoder
2009-06-23 23:44:37 +01:00
parent 84cc951045
commit 9b50987d0c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pyfpdb/Database.py
+7 -2
View File
@@ -39,7 +39,8 @@ import SQL
import Card
class Database:
def __init__(self, c, db_name = None, game = None): # db_name and game not used any more
def __init__(self, c, db_name = None, game = None, sql = None): # db_name and game not used any more
print "creating Database instance, sql =", sql
self.fdb = fpdb_db.fpdb_db() # sets self.fdb.db self.fdb.cursor and self.fdb.sql
self.fdb.do_connect(c)
self.connection = self.fdb.db
@@ -48,7 +49,11 @@ class Database:
self.import_options = c.get_import_parameters()
self.type = db_params['db-type']
self.backend = db_params['db-backend']
self.sql = SQL.Sql(type = self.type, db_server = db_params['db-server'])
# where possible avoid creating new SQL instance by using the global one passed in
if sql == None:
self.sql = SQL.Sql(type = self.type, db_server = db_params['db-server'])
else:
self.sql = sql
self.connection.rollback()
# To add to config: