[SQL-CVS] r212 - trunk/SQLObject/sqlobject/firebird

[<sub...@co...>]

Author: ianb
Date: 2004-09-03 07:53:06 -0400 (Fri, 03 Sep 2004)
New Revision: 212

Modified:
   trunk/SQLObject/sqlobject/firebird/firebirdconnection.py
Log:
Added extra arguments that get passed to firebird connections


Modified: trunk/SQLObject/sqlobject/firebird/firebirdconnection.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/firebird/firebirdconnection.py	2004-09-03 1=
1:50:04 UTC (rev 211)
+++ trunk/SQLObject/sqlobject/firebird/firebirdconnection.py	2004-09-03 1=
1:53:06 UTC (rev 212)
@@ -10,7 +10,8 @@
     schemes =3D [dbName]
=20
     def __init__(self, host, db, user=3D'sysdba',
-                 passwd=3D'masterkey', autoCommit=3D1, **kw):
+                 passwd=3D'masterkey', autoCommit=3D1,
+                 dialect=3DNone, role=3DNone, charset=3DNone, **kw):
         global kinterbasdb
         if kinterbasdb is None:
             import kinterbasdb
@@ -25,6 +26,9 @@
         self.db =3D db
         self.user =3D user
         self.passwd =3D passwd
+        self.dialect =3D dialect
+        self.role =3D role
+        self.charset =3D charset
=20
         DBAPI.__init__(self, **kw)
=20
@@ -62,8 +66,13 @@
=20
     def makeConnection(self):
         return kinterbasdb.connect(
-            host =3D self.host, database =3D self.db,
-            user =3D self.user, password =3D self.passwd
+            host=3Dself.host,
+            database=3Dself.db,
+            user=3Dself.user,
+            password=3Dself.passwd,
+            dialect=3Dself.dialect,
+            role=3Dself.role,
+            charset=3Dself.charset,
             )
=20
     def _queryInsertID(self, conn, table, idName, id, names, values):