Revert "Allow usernick to be NULL"

This reverts commit 997abee. - We need to maintain the integrity of userdb.usernick. Instead, the proper solution is to fix the Admin customer-creation page.
interchange · Feb 2, 2017 · d043439 · d043439
1 parent f7e2d72
commit d043439
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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) DEFAULT NULL"
+Database  userdb  COLUMN_DEF   "usernick=varchar(255) NOT 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   usernick mod_time
+Database  userdb  PREFER_NULL   mod_time
 Database  userdb  INDEX        "UNIQUE usernick"
diff --git 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) DEFAULT NULL"
+Database  userdb  COLUMN_DEF   "usernick=varchar(255) NOT NULL"
 Database  userdb  COLUMN_DEF   "password=varchar(64)"
 Database  userdb  COLUMN_DEF   "expiration=varchar(32)"
 Database  userdb  COLUMN_DEF   "accounts=text"
@@ -52,7 +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 mod_time
+Database  userdb  PREFER_NULL   mod_time
 Database  userdb  INDEX        "UNIQUE usernick"
 
 UserDB    default    iso_time  1
diff --git 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) DEFAULT NULL"
+Database  userdb  COLUMN_DEF   "usernick=varchar(255) NOT NULL"
 Database  userdb  COLUMN_DEF   "password=varchar(64)"
 Database  userdb  COLUMN_DEF   "expiration=varchar(32)"
 Database  userdb  COLUMN_DEF   "accounts=text"
@@ -52,4 +52,3 @@ 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