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

fixed postgresql bug introduced in recent commit?

Browse Source
This commit is contained in:
mdipierro
2014-08-08 00:13:31 -05:00
parent 6fc97775dc
commit 5cbbcd3685
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.9.5-trunk+timestamp.2014.08.08.00.05.49 Version 2.9.5-trunk+timestamp.2014.08.08.00.12.19
gluon/dal.py
+3
View File
@@ -2840,6 +2840,8 @@ class PostgreSQLAdapter(BaseAdapter):
self._after_connection = after_connection self._after_connection = after_connection
self.srid = srid self.srid = srid
self.find_or_make_work_folder() self.find_or_make_work_folder()
self._last_insert = None # for INSERT ... RETURNING ID
ruri = uri.split('://', 1)[1] ruri = uri.split('://', 1)[1]
m = self.REGEX_URI.match(ruri) m = self.REGEX_URI.match(ruri)
if not m: if not m:
@@ -2897,6 +2899,7 @@ class PostgreSQLAdapter(BaseAdapter):
self._last_insert = None self._last_insert = None
return 'INSERT INTO %s(%s) VALUES (%s);' % (table_rname, keys, values) return 'INSERT INTO %s(%s) VALUES (%s);' % (table_rname, keys, values)
else: else:
self._last_insert
return self._insert_empty(table) return self._insert_empty(table)
def lastrowid(self, table=None): def lastrowid(self, table=None):
gluon/tools.py
+7 -8
View File
@@ -2177,15 +2177,14 @@ class Auth(object):
elif not fields.get(settings.userfield): elif not fields.get(settings.userfield):
raise ValueError("register_bare: " + raise ValueError("register_bare: " +
"userfield not provided or invalid") "userfield not provided or invalid")
fields[settings.passfield fields[settings.passfield] = \
] = settings.table_user[settings.passfield].validate( settings.table_user[settings.passfield].validate(
fields[settings.passfield])[0] fields[settings.passfield])[0]
user = self.get_or_create_user(fields, login=False, user = self.get_or_create_user(
get=False, fields, login=False, get=False,
update_fields=self.settings.update_fields) update_fields=self.settings.update_fields)
if not user: if not user:
# get or create did not create a user (it ignores # get or create did not create a user (it ignores duplicate records)
# duplicate records)
return False return False
return user return user