Index: branches/5.1.x/core/install/install_schema.sql =================================================================== diff -u -N -r13962 -r14029 --- branches/5.1.x/core/install/install_schema.sql (.../install_schema.sql) (revision 13962) +++ branches/5.1.x/core/install/install_schema.sql (.../install_schema.sql) (revision 14029) @@ -244,20 +244,20 @@ Company varchar(255) NOT NULL DEFAULT '', Email varchar(255) NOT NULL DEFAULT '', CreatedOn int(11) DEFAULT NULL, - Phone varchar(20) DEFAULT NULL, + Phone varchar(255) NOT NULL DEFAULT '', Fax varchar(255) NOT NULL DEFAULT '', - Street varchar(255) DEFAULT NULL, + Street varchar(255) NOT NULL DEFAULT '', Street2 varchar(255) NOT NULL DEFAULT '', - City varchar(20) DEFAULT NULL, + City varchar(255) NOT NULL DEFAULT '', State varchar(20) NOT NULL DEFAULT '', - Zip varchar(20) DEFAULT NULL, + Zip varchar(20) NOT NULL DEFAULT '', Country varchar(20) NOT NULL DEFAULT '', ResourceId int(11) NOT NULL DEFAULT '0', `Status` tinyint(4) NOT NULL DEFAULT '1', Modified int(11) DEFAULT NULL, dob int(11) DEFAULT NULL, tz int(11) DEFAULT NULL, - ip varchar(20) DEFAULT NULL, + ip varchar(20) NOT NULL DEFAULT '', IsBanned tinyint(1) NOT NULL DEFAULT '0', PassResetTime int(11) unsigned DEFAULT NULL, PwResetConfirm varchar(255) DEFAULT NULL, Index: branches/5.1.x/core/units/users/users_config.php =================================================================== diff -u -N -r13962 -r14029 --- branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 13962) +++ branches/5.1.x/core/units/users/users_config.php (.../users_config.php) (revision 14029) @@ -1,6 +1,6 @@ Array ('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')), 'FirstName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), 'LastName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), - 'Company' => Array ('type' => 'string','not_null' => '1','default' => ''), + 'Company' => Array ('type' => 'string','not_null' => 1,'default' => ''), 'Email' => Array ( 'type' => 'string', 'formatter' => 'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', @@ -353,18 +353,18 @@ ), ), 'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'Phone' => Array('type' => 'string','default' => null), + 'Phone' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'Fax' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), - 'Street' => Array('type' => 'string', 'default' => null), - 'Street2' => Array('type' => 'string', 'not_null' => '1', 'default' => ''), - 'City' => Array('type' => 'string','default' => null), + 'Street' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Street2' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), + 'City' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'State' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array(), 'not_null' => 1, - 'default' => '' + 'default' => '', ), - 'Zip' => Array('type' => 'string','default' => null), + 'Zip' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'Country' => Array( 'type' => 'string', 'formatter' => 'kOptionsFormatter', @@ -373,18 +373,18 @@ WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' ORDER BY Name', 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => '' + 'not_null' => 1, 'default' => '', ), 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => '1','default' => 1), + 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(1=>'la_Enabled', 0=>'la_Disabled', 2=>'la_Pending'), 'use_phrases'=>1, 'not_null' => 1, 'default' => 1), 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => null), + 'dob' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => NULL), 'tz' => Array('type' => 'int', 'default' => NULL), - 'ip' => Array('type' => 'string','default' => null), + 'ip' => Array('type' => 'string', 'not_null' => 1, 'default' => ''), 'IsBanned' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'PassResetTime' => Array('type' => 'int','default' => null), - 'PwResetConfirm' => Array('type' => 'string','default' => null), - 'PwRequestTime' => Array('type' => 'int','default' => null), + 'PassResetTime' => Array('type' => 'int','default' => NULL), + 'PwResetConfirm' => Array('type' => 'string','default' => NULL), + 'PwRequestTime' => Array('type' => 'int','default' => NULL), 'MinPwResetDelay' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(300 => '5', 600 => '10', 900 => '15', 1800 => '30', 3600 => '60'), 'use_phrases' => 0, 'not_null' => '1', 'default' => 1800), 'AdminLanguage' => Array ( 'type' => 'int', Index: branches/5.1.x/core/install/upgrades.sql =================================================================== diff -u -N -r13996 -r14029 --- branches/5.1.x/core/install/upgrades.sql (.../upgrades.sql) (revision 13996) +++ branches/5.1.x/core/install/upgrades.sql (.../upgrades.sql) (revision 14029) @@ -1979,4 +1979,12 @@ ALTER TABLE ItemReview CHANGE CreatedById CreatedById INT(11) NULL DEFAULT NULL; # ===== v 5.1.1-B2 ===== -UPDATE Phrase SET `Module` = 'Core' WHERE PhraseKey = 'LU_SECTION_FILES'; \ No newline at end of file +UPDATE Phrase SET `Module` = 'Core' WHERE PhraseKey = 'LU_SECTION_FILES'; + +# ===== v 5.1.1-RC1 ===== +ALTER TABLE PortalUser + CHANGE Phone Phone VARCHAR(255) NOT NULL DEFAULT '', + CHANGE City City VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Street Street VARCHAR(255) NOT NULL DEFAULT '', + CHANGE Zip Zip VARCHAR(20) NOT NULL DEFAULT '', + CHANGE ip ip VARCHAR(20) NOT NULL DEFAULT ''; \ No newline at end of file