[interchange] Allow usernick to be NULL
Josh Lavin <[email protected]> Wed, 25 Jan 2017 22:06:13 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 997abee40cefd483caaa6805196657874572e5c7 Author: Josh Lavin <[email protected]> Date: Wed Jan 25 14:04:53 2017 -0800 Allow usernick to be NULL - will resolve issues with customer create from IC Admin - however, usernick will then be NULL - consider adding a usernick field to the customer creation form, or else use of UserDB fallback_login dist/strap/dbconf/mysql/userdb.mysql | 4 ++-- dist/strap/dbconf/pgsql/userdb.pgsql | 3 ++- dist/strap/dbconf/sqlite/userdb.lite | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) --- diff --git a/dist/strap/dbconf/mysql/userdb.mysql b/dist/strap/dbconf/mysql/userdb.mysql index b38e3a8..f987ac5 100644 --- a/dist/strap/dbconf/mysql/userdb.mysql +++ b/dist/strap/dbconf/mysql/userdb.mysql @@ -1,7 +1,7 @@ Database userdb userdb.txt __SQLDSN__ Database userdb DEFAULT_TYPE varchar(255) Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY" -Database userdb COLUMN_DEF "usernick=varchar(255) NOT NULL" +Database userdb COLUMN_DEF "usernick=varchar(255) DEFAULT NULL" Database userdb COLUMN_DEF "password=varchar(64) NOT NULL" Database userdb COLUMN_DEF "expiration=varchar(32)" Database userdb COLUMN_DEF "accounts=BLOB" @@ -49,5 +49,5 @@ Database userdb COLUMN_DEF "s_nickname=text" Database userdb COLUMN_DEF "state=varchar(20)" Database userdb COLUMN_DEF "updated=varchar(32)" Database userdb COLUMN_DEF "zip=varchar(10)" -Database userdb PREFER_NULL mod_time +Database userdb PREFER_NULL usernick mod_time Database userdb INDEX "UNIQUE usernick" diff --git a/dist/strap/dbconf/pgsql/userdb.pgsql b/dist/strap/dbconf/pgsql/userdb.pgsql index 737b3de..dd492c8 100644 --- a/dist/strap/dbconf/pgsql/userdb.pgsql +++ b/dist/strap/dbconf/pgsql/userdb.pgsql @@ -3,7 +3,7 @@ Database userdb LENGTH_EXCEPTION_DEFAULT truncate_log Database userdb DEFAULT_TYPE varchar(255) Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY" -Database userdb COLUMN_DEF "usernick=varchar(255) NOT NULL" +Database userdb COLUMN_DEF "usernick=varchar(255) DEFAULT NULL" Database userdb COLUMN_DEF "password=varchar(64)" Database userdb COLUMN_DEF "expiration=varchar(32)" Database userdb COLUMN_DEF "accounts=text" @@ -52,6 +52,7 @@ Database userdb COLUMN_DEF "state=varchar(20)" Database userdb COLUMN_DEF "updated=varchar(32)" Database userdb COLUMN_DEF "zip=varchar(10)" Database userdb DEFAULT "inactive=''" +Database userdb PREFER_NULL usernick Database userdb INDEX "UNIQUE usernick" # Prevent problems with abstime representation diff --git a/dist/strap/dbconf/sqlite/userdb.lite b/dist/strap/dbconf/sqlite/userdb.lite index e1a13bc..a37397a 100644 --- a/dist/strap/dbconf/sqlite/userdb.lite +++ b/dist/strap/dbconf/sqlite/userdb.lite @@ -2,7 +2,7 @@ Database userdb userdb.txt __SQLDSN__ Database userdb DEFAULT_TYPE varchar(255) Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY" -Database userdb COLUMN_DEF "usernick=varchar(255) NOT NULL" +Database userdb COLUMN_DEF "usernick=varchar(255) DEFAULT NULL" Database userdb COLUMN_DEF "password=varchar(64)" Database userdb COLUMN_DEF "expiration=varchar(32)" Database userdb COLUMN_DEF "accounts=text" @@ -52,4 +52,4 @@ Database userdb COLUMN_DEF "updated=varchar(32)" Database userdb COLUMN_DEF "zip=varchar(10)" Database userdb DEFAULT "inactive=''" Database userdb INDEX "UNIQUE usernick" - +Database userdb PREFER_NULL usernick mod_time