dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed 'fdb' is not defined issue, thanks villas

Browse Source
This commit is contained in:
mdipierro
2012-08-30 20:24:56 -05:00
parent 017fd0dd14
commit efbabbafa3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.3 (2012-08-30 20:18:58) stable Version 2.0.3 (2012-08-30 20:24:53) stable
gluon/dal.py
+6 -2
View File
@@ -3196,7 +3196,7 @@ class FireBirdAdapter(BaseAdapter):
def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8', def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
credential_decoder=IDENTITY, driver_args={}, credential_decoder=IDENTITY, driver_args={},
adapter_args={}): adapter_args={}):
if 'driver_name' in adapter_args: if 'driver_name' in adapter_args:
if adapter_args['driver_name'] == 'fdb': if adapter_args['driver_name'] == 'fdb':
self.driver = fdb self.driver = fdb
@@ -3204,8 +3204,12 @@ class FireBirdAdapter(BaseAdapter):
self.driver = firebirdsql self.driver = firebirdsql
elif adapter_args['driver_name'] == 'kinterbasdb': elif adapter_args['driver_name'] == 'kinterbasdb':
self.driver = kinterbasdb self.driver = kinterbasdb
else: elif 'fdb' in globals():
self.driver = fdb self.driver = fdb
elif 'kinterbasdb' in globals():
self.driver = kinterbasdb
else:
raise RuntimeError, "no fdb and no kinterbasdb driver found"
if not self.driver: if not self.driver:
raise RuntimeError, "Unable to import driver" raise RuntimeError, "Unable to import driver"