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

self.connector

Browse Source
This commit is contained in:
mdipierro
2012-09-30 14:45:47 -05:00
parent 8ffa5bbbcb
commit 5e12803efa
2 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-30 14:19:41) dev Version 2.0.9 (2012-09-30 14:45:39) dev
gluon/dal.py
+42 -27
View File
@@ -549,10 +549,8 @@ class ConnectionPool(object):
""" """
if getattr(self,'connection',None) != None: if getattr(self,'connection',None) != None:
return return
if not f is None: if f is None:
self._connection_function = f f = self.connector
else:
f = self._connection_function
if not self.pool_size: if not self.pool_size:
self.connection = f() self.connection = f()
@@ -2078,7 +2076,8 @@ class SQLiteAdapter(BaseAdapter):
driver_args['detect_types'] = self.driver.PARSE_DECLTYPES driver_args['detect_types'] = self.driver.PARSE_DECLTYPES
def connector(dbpath=dbpath, driver_args=driver_args): def connector(dbpath=dbpath, driver_args=driver_args):
return self.driver.Connection(dbpath, **driver_args) return self.driver.Connection(dbpath, **driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.connection.create_function('web2py_extract', 2, self.connection.create_function('web2py_extract', 2,
@@ -2141,7 +2140,8 @@ class SpatiaLiteAdapter(SQLiteAdapter):
driver_args['detect_types'] = self.driver.PARSE_DECLTYPES driver_args['detect_types'] = self.driver.PARSE_DECLTYPES
def connector(dbpath=dbpath, driver_args=driver_args): def connector(dbpath=dbpath, driver_args=driver_args):
return self.driver.Connection(dbpath, **driver_args) return self.driver.Connection(dbpath, **driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.connection.enable_load_extension(True) self.connection.enable_load_extension(True)
@@ -2242,7 +2242,8 @@ class JDBCSQLiteAdapter(SQLiteAdapter):
return self.driver.connect( return self.driver.connect(
self.driver.getConnection('jdbc:sqlite:'+dbpath), self.driver.getConnection('jdbc:sqlite:'+dbpath),
**driver_args) **driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
# FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs # FIXME http://www.zentus.com/sqlitejdbc/custom_functions.html for UDFs
@@ -2359,7 +2360,8 @@ class MySQLAdapter(BaseAdapter):
def connector(driver_args=driver_args): def connector(driver_args=driver_args):
return self.driver.connect(**driver_args) return self.driver.connect(**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.execute('SET FOREIGN_KEY_CHECKS=1;') self.execute('SET FOREIGN_KEY_CHECKS=1;')
@@ -2486,7 +2488,8 @@ class PostgreSQLAdapter(BaseAdapter):
self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__) self.__version__ = "%s %s" % (self.driver.__name__, self.driver.__version__)
def connector(msg=msg,driver_args=driver_args): def connector(msg=msg,driver_args=driver_args):
return self.driver.connect(msg,**driver_args) return self.driver.connect(msg,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.connection.set_client_encoding('UTF8') self.connection.set_client_encoding('UTF8')
@@ -2700,7 +2703,8 @@ class JDBCPostgreSQLAdapter(PostgreSQLAdapter):
msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password) msg = ('jdbc:postgresql://%s:%s/%s' % (host, port, db), user, password)
def connector(msg=msg,driver_args=driver_args): def connector(msg=msg,driver_args=driver_args):
return self.driver.connect(*msg,**driver_args) return self.driver.connect(*msg,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.connection.set_client_encoding('UTF8') self.connection.set_client_encoding('UTF8')
@@ -2809,7 +2813,8 @@ class OracleAdapter(BaseAdapter):
driver_args['threaded']=True driver_args['threaded']=True
def connector(uri=ruri,driver_args=driver_args): def connector(uri=ruri,driver_args=driver_args):
return self.driver.connect(uri,**driver_args) return self.driver.connect(uri,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';") self.execute("ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS';")
@@ -3011,7 +3016,8 @@ class MSSQLAdapter(BaseAdapter):
% (host, port, db, user, password, urlargs) % (host, port, db, user, password, urlargs)
def connector(cnxn=cnxn,driver_args=driver_args): def connector(cnxn=cnxn,driver_args=driver_args):
return self.driver.connect(cnxn,**driver_args) return self.driver.connect(cnxn,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def lastrowid(self,table): def lastrowid(self,table):
#self.execute('SELECT @@IDENTITY;') #self.execute('SELECT @@IDENTITY;')
@@ -3201,7 +3207,8 @@ class SybaseAdapter(MSSQLAdapter):
def connector(dsn=dsn,driver_args=driver_args): def connector(dsn=dsn,driver_args=driver_args):
return self.driver.connect(dsn,**driver_args) return self.driver.connect(dsn,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def integrity_error_class(self): def integrity_error_class(self):
return RuntimeError # FIX THIS return RuntimeError # FIX THIS
@@ -3306,7 +3313,8 @@ class FireBirdAdapter(BaseAdapter):
def connector(driver_args=driver_args): def connector(driver_args=driver_args):
return self.driver.connect(**driver_args) return self.driver.connect(**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def create_sequence_and_triggers(self, query, table, **args): def create_sequence_and_triggers(self, query, table, **args):
tablename = table._tablename tablename = table._tablename
@@ -3365,7 +3373,8 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
def connector(driver_args=driver_args): def connector(driver_args=driver_args):
return self.driver.connect(**driver_args) return self.driver.connect(**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
class InformixAdapter(BaseAdapter): class InformixAdapter(BaseAdapter):
drivers = ('informixdb',) drivers = ('informixdb',)
@@ -3468,7 +3477,8 @@ class InformixAdapter(BaseAdapter):
driver_args.update(user=user,password=password,autocommit=True) driver_args.update(user=user,password=password,autocommit=True)
def connector(dsn=dsn,driver_args=driver_args): def connector(dsn=dsn,driver_args=driver_args):
return self.driver.connect(dsn,**driver_args) return self.driver.connect(dsn,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def execute(self,command): def execute(self,command):
if command[-1:]==';': if command[-1:]==';':
@@ -3549,7 +3559,8 @@ class DB2Adapter(BaseAdapter):
ruri = uri.split('://', 1)[1] ruri = uri.split('://', 1)[1]
def connector(cnxn=ruri,driver_args=driver_args): def connector(cnxn=ruri,driver_args=driver_args):
return self.driver.connect(cnxn,**driver_args) return self.driver.connect(cnxn,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def execute(self,command): def execute(self,command):
if command[-1:]==';': if command[-1:]==';':
@@ -3611,7 +3622,8 @@ class TeradataAdapter(BaseAdapter):
ruri = uri.split('://', 1)[1] ruri = uri.split('://', 1)[1]
def connector(cnxn=ruri,driver_args=driver_args): def connector(cnxn=ruri,driver_args=driver_args):
return self.driver.connect(cnxn,**driver_args) return self.driver.connect(cnxn,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def LEFT_JOIN(self): def LEFT_JOIN(self):
return 'LEFT OUTER JOIN' return 'LEFT OUTER JOIN'
@@ -3703,7 +3715,8 @@ class IngresAdapter(BaseAdapter):
trace=trace) trace=trace)
def connector(driver_args=driver_args): def connector(driver_args=driver_args):
return self.driver.connect(**driver_args) return self.driver.connect(**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def create_sequence_and_triggers(self, query, table, **args): def create_sequence_and_triggers(self, query, table, **args):
# post create table auto inc code (if needed) # post create table auto inc code (if needed)
@@ -3843,7 +3856,8 @@ class SAPDBAdapter(BaseAdapter):
host=host, driver_args=driver_args): host=host, driver_args=driver_args):
return self.driver.Connection(user, password, database, return self.driver.Connection(user, password, database,
host, **driver_args) host, **driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def lastrowid(self,table): def lastrowid(self,table):
self.execute("select %s.NEXTVAL from dual" % table._sequence_name) self.execute("select %s.NEXTVAL from dual" % table._sequence_name)
@@ -3889,7 +3903,8 @@ class CubridAdapter(MySQLAdapter):
def connector(host=host,port=port,db=db, def connector(host=host,port=port,db=db,
user=user,passwd=password,driver_args=driver_args): user=user,passwd=password,driver_args=driver_args):
return self.driver.connect(host,port,db,user,passwd,**driver_args) return self.driver.connect(host,port,db,user,passwd,**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
self.execute('SET FOREIGN_KEY_CHECKS=1;') self.execute('SET FOREIGN_KEY_CHECKS=1;')
@@ -4010,7 +4025,8 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter):
driver_args['database'] = db driver_args['database'] = db
def connector(driver_args=driver_args): def connector(driver_args=driver_args):
return rdbms.connect(**driver_args) return rdbms.connect(**driver_args)
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def after_connection(self): def after_connection(self):
if self.createdb: if self.createdb:
@@ -5487,7 +5503,8 @@ class IMAPAdapter(NoSQLAdapter):
return connection return connection
self.db.define_tables = self.define_tables self.db.define_tables = self.define_tables
if do_connect: self.reconnect(connector) self.connector = connector
if do_connect: self.reconnect()
def reconnect(self, f, cursor=True): def reconnect(self, f, cursor=True):
""" """
@@ -5501,10 +5518,8 @@ class IMAPAdapter(NoSQLAdapter):
""" """
if getattr(self,'connection',None) != None: if getattr(self,'connection',None) != None:
return return
if not f is None: if f is None:
self._connection_function = f f = self.connector
else:
f = self._connection_function
if not self.pool_size: if not self.pool_size:
self.connection = f() self.connection = f()