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

simplified logic

Browse Source
This commit is contained in:
mdipierro
2013-10-20 16:58:08 -05:00
parent 2738d12e0f
commit 8e1a68d461
2 changed files with 5 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.7.4-stable+timestamp.2013.10.20.16.50.33 Version 2.7.4-stable+timestamp.2013.10.20.16.57.08
gluon/dal.py
+4 -2
View File
@@ -2274,8 +2274,7 @@ class SQLiteAdapter(BaseAdapter):
self.db = db self.db = db
self.dbengine = "sqlite" self.dbengine = "sqlite"
self.uri = uri self.uri = uri
if adapter_args.get('foreign_keys',True) and not after_connection: self.adapter_args = adapter_args
after_connection = lambda db: db.execute('PRAGMA foreign_keys=ON;')
if do_connect: self.find_driver(adapter_args) if do_connect: self.find_driver(adapter_args)
self.pool_size = 0 self.pool_size = 0
self.folder = folder self.folder = folder
@@ -2309,6 +2308,9 @@ class SQLiteAdapter(BaseAdapter):
self.connection.create_function("REGEXP", 2, self.connection.create_function("REGEXP", 2,
SQLiteAdapter.web2py_regexp) SQLiteAdapter.web2py_regexp)
if self.adapter_args.get('foreign_keys',True):
self.execute('PRAGMA foreign_keys=ON;')
def _truncate(self, table, mode=''): def _truncate(self, table, mode=''):
tablename = table._tablename tablename = table._tablename
return ['DELETE FROM %s;' % tablename, return ['DELETE FROM %s;' % tablename,