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

auth.signature.is_active is notnull and migration will set default value

Browse Source
This commit is contained in:
mdipierro
2012-12-22 10:54:29 -06:00
parent 96286844fb
commit 7ac570f4e9
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.1-alpha.1+timestamp.2012.12.22.10.19.08 Version 2.4.1-alpha.1+timestamp.2012.12.22.10.53.49
gluon/dal.py
+7 -10
View File
@@ -859,7 +859,7 @@ class BaseAdapter(ConnectionPool):
type=str(field_type), type=str(field_type),
sql=ftype) sql=ftype)
if isinstance(field.default,(str,int,float)): if field.notnull and not field.default is None:
# Caveat: sql_fields and sql_fields_aux # Caveat: sql_fields and sql_fields_aux
# differ for default values. # differ for default values.
# sql_fields is used to trigger migrations and sql_fields_aux # sql_fields is used to trigger migrations and sql_fields_aux
@@ -867,7 +867,7 @@ class BaseAdapter(ConnectionPool):
# The reason is that we do not want to trigger # The reason is that we do not want to trigger
# a migration simply because a default value changes. # a migration simply because a default value changes.
not_null = self.NOT_NULL(field.default, field_type) not_null = self.NOT_NULL(field.default, field_type)
ftype = ftype.replace('NOT NULL', not_null) ftype = ftype.replace('NOT NULL', not_null)
sql_fields_aux[field_name] = dict(sql=ftype) sql_fields_aux[field_name] = dict(sql=ftype)
# Postgres - PostGIS: # Postgres - PostGIS:
# geometry fields are added after the table has been created, not now # geometry fields are added after the table has been created, not now
@@ -995,10 +995,7 @@ class BaseAdapter(ConnectionPool):
for key in sql_fields_old: for key in sql_fields_old:
if not key in keys: if not key in keys:
keys.append(key) keys.append(key)
if self.dbengine == 'mssql': new_add = self.concat_add(tablename)
new_add = '; ALTER TABLE %s ADD ' % tablename
else:
new_add = ', ADD '
metadata_change = False metadata_change = False
sql_fields_current = copy.copy(sql_fields_old) sql_fields_current = copy.copy(sql_fields_old)
@@ -1690,7 +1687,7 @@ class BaseAdapter(ConnectionPool):
def rollback_prepared(self, key): def rollback_prepared(self, key):
if self.connection: self.connection.rollback() if self.connection: self.connection.rollback()
def concat_add(self, table): def concat_add(self, tablename):
return ', ADD ' return ', ADD '
def constraint_name(self, table, fieldname): def constraint_name(self, table, fieldname):
@@ -2359,9 +2356,6 @@ class MySQLAdapter(BaseAdapter):
def rollback_prepared(self,key): def rollback_prepared(self,key):
self.execute("XA ROLLBACK;") self.execute("XA ROLLBACK;")
def concat_add(self,table):
return '; ALTER TABLE %s ADD ' % table
REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$') REGEX_URI = re.compile('^(?P<user>[^:@]+)(\:(?P<password>[^@]*))?@(?P<host>[^\:/]+)(\:(?P<port>[0-9]+))?/(?P<db>[^?]+)(\?set_encoding=(?P<charset>\w+))?$')
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',
@@ -2958,6 +2952,9 @@ class MSSQLAdapter(BaseAdapter):
'reference TFK': ' CONSTRAINT FK_%(foreign_table)s_PK FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_table)s (%(foreign_key)s) ON DELETE %(on_delete_action)s', 'reference TFK': ' CONSTRAINT FK_%(foreign_table)s_PK FOREIGN KEY (%(field_name)s) REFERENCES %(foreign_table)s (%(foreign_key)s) ON DELETE %(on_delete_action)s',
} }
def concat_add(self,tablename):
return '; ALTER TABLE %s ADD ' % tablename
def varquote(self,name): def varquote(self,name):
return varquote_aux(name,'[%s]') return varquote_aux(name,'[%s]')
gluon/tools.py
+1
View File
@@ -1422,6 +1422,7 @@ class Auth(object):
self.signature = db.Table( self.signature = db.Table(
self.db, 'auth_signature', self.db, 'auth_signature',
Field('is_active', 'boolean', Field('is_active', 'boolean',
notnull=True,
default=True, default=True,
readable=False, writable=False, readable=False, writable=False,
label=T('Is Active')), label=T('Is Active')),