[interchange] Revert "Allow usernick to be NULL"

Josh Lavin interchange-cvs at icdevgroup.org
Thu Feb 2 18:01:41 UTC 2017


commit d04343959d5cc940955f4f178a9568ad1b4b9b4c
Author: Josh Lavin <digory at cpan.org>
Date:   Thu Feb 2 09:14:05 2017 -0800

    Revert "Allow usernick to be NULL"
    
    This reverts commit 997abee40cefd483caaa6805196657874572e5c7.
    
    - We need to maintain the integrity of userdb.usernick. Instead, the
      proper solution is to fix the Admin customer-creation page.

 dist/strap/dbconf/mysql/userdb.mysql |    4 ++--
 dist/strap/dbconf/pgsql/userdb.pgsql |    4 ++--
 dist/strap/dbconf/sqlite/userdb.lite |    3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/dist/strap/dbconf/mysql/userdb.mysql b/dist/strap/dbconf/mysql/userdb.mysql
index f987ac5..b38e3a8 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) 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
index 1f69051..f4b1330 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) 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
index a37397a..8366542 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) 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



More information about the interchange-cvs mailing list