diff --git a/VERSION b/VERSION index 409a0231..b7d379e1 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/dal.py b/gluon/dal.py index 5abee708..537a7d76 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -2840,6 +2840,8 @@ class PostgreSQLAdapter(BaseAdapter): self._after_connection = after_connection self.srid = srid self.find_or_make_work_folder() + self._last_insert = None # for INSERT ... RETURNING ID + ruri = uri.split('://', 1)[1] m = self.REGEX_URI.match(ruri) if not m: @@ -2897,6 +2899,7 @@ class PostgreSQLAdapter(BaseAdapter): self._last_insert = None return 'INSERT INTO %s(%s) VALUES (%s);' % (table_rname, keys, values) else: + self._last_insert return self._insert_empty(table) def lastrowid(self, table=None): diff --git a/gluon/tools.py b/gluon/tools.py index 4eecfcdd..b4670ad9 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2177,15 +2177,14 @@ class Auth(object): elif not fields.get(settings.userfield): raise ValueError("register_bare: " + "userfield not provided or invalid") - fields[settings.passfield - ] = settings.table_user[settings.passfield].validate( - fields[settings.passfield])[0] - user = self.get_or_create_user(fields, login=False, - get=False, - update_fields=self.settings.update_fields) + fields[settings.passfield] = \ + settings.table_user[settings.passfield].validate( + fields[settings.passfield])[0] + user = self.get_or_create_user( + fields, login=False, get=False, + update_fields=self.settings.update_fields) if not user: - # get or create did not create a user (it ignores - # duplicate records) + # get or create did not create a user (it ignores duplicate records) return False return user