Skip to content

Commit

Permalink
Changed dbconf files for userdb, transactions, and orderline to reflect
Browse files Browse the repository at this point in the history 
a varchar(255) definition for username, usernick, and email.
Previously were a mis-matched variations of lengths, that do not provide
adequate length for modern email addresses. In many cases, people are
using email as usernick, and in some cases username, so all 3 fields
should be consistent.
Changed on all 3 dbs, mysql, postgres, and sqllite.
  • Loading branch information
Greg Hanson committed Apr 25, 2016
1 parent c15c57c commit 3f2ab88
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion dist/strap/dbconf/mysql/orderline.mysql
View file
Expand Up @@ -4,7 +4,7 @@ Database orderline COLUMN_DEF "code=varchar(32) NOT NULL PRIMARY KEY"
Database orderline COLUMN_DEF "store_id=varchar(9) DEFAULT '' NOT NULL"
Database orderline COLUMN_DEF "order_number=varchar(24) NOT NULL"
Database orderline COLUMN_DEF "session=varchar(32) NOT NULL"
Database orderline COLUMN_DEF "username=varchar(32) default '' NOT NULL"
Database orderline COLUMN_DEF "username=varchar(255) default '' NOT NULL"
Database orderline COLUMN_DEF "shipmode=varchar(255) default '' NOT NULL"
Database orderline COLUMN_DEF "sku=varchar(64) NOT NULL"
Database orderline COLUMN_DEF "quantity=int NOT NULL"
Expand Down
4 changes: 2 additions & 2 deletions dist/strap/dbconf/mysql/transactions.mysql
View file
Expand Up @@ -6,7 +6,7 @@ Database transactions INDEX store_id
Database transactions COLUMN_DEF "order_number=varchar(24) NOT NULL"
Database transactions INDEX order_number
Database transactions COLUMN_DEF "session=varchar(32) NOT NULL"
Database transactions COLUMN_DEF "username=varchar(32) default '' NOT NULL"
Database transactions COLUMN_DEF "username=varchar(255) default '' NOT NULL"
Database transactions COLUMN_DEF "shipmode=varchar(255) NOT NULL"
Database transactions COLUMN_DEF "nitems=varchar(9) NOT NULL"
Database transactions COLUMN_DEF "subtotal=varchar(12) NOT NULL"
Expand All @@ -26,7 +26,7 @@ Database transactions COLUMN_DEF "country=varchar(10) DEFAULT '' NOT NULL"
Database transactions COLUMN_DEF "phone_day=varchar(20)"
Database transactions COLUMN_DEF "phone_night=varchar(20)"
Database transactions COLUMN_DEF "fax=varchar(20)"
Database transactions COLUMN_DEF "email=varchar(42)"
Database transactions COLUMN_DEF "email=varchar(255)"
Database transactions COLUMN_DEF "b_fname=varchar(30)"
Database transactions COLUMN_DEF "b_lname=varchar(30)"
Database transactions COLUMN_DEF "b_company=varchar(30)"
Expand Down
6 changes: 3 additions & 3 deletions dist/strap/dbconf/mysql/userdb.mysql
View file
@@ -1,7 +1,7 @@
Database userdb userdb.txt __SQLDSN__
Database userdb DEFAULT_TYPE varchar(255)
Database userdb COLUMN_DEF "username=varchar(64) NOT NULL PRIMARY KEY"
Database userdb COLUMN_DEF "usernick=varchar(64) NOT NULL"
Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY"
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"
Expand Down Expand Up @@ -30,7 +30,7 @@ Database userdb COLUMN_DEF "created=varchar(32)"
Database userdb COLUMN_DEF "credit_limit=varchar(16)"
Database userdb COLUMN_DEF "db_acl=BLOB"
Database userdb COLUMN_DEF "dealer=varchar(32)"
Database userdb COLUMN_DEF "email=varchar(42)"
Database userdb COLUMN_DEF "email=varchar(255)"
Database userdb COLUMN_DEF "fax=varchar(30)"
Database userdb COLUMN_DEF "file_acl=BLOB"
Database userdb COLUMN_DEF "fname=varchar(30)"
Expand Down
2 changes: 1 addition & 1 deletion dist/strap/dbconf/pgsql/orderline.pgsql
View file
Expand Up @@ -4,7 +4,7 @@ Database orderline COLUMN_DEF "code=varchar(32) NOT NULL PRIMARY KEY"
Database orderline COLUMN_DEF "store_id=varchar(9)"
Database orderline COLUMN_DEF "order_number=varchar(24) NOT NULL"
Database orderline COLUMN_DEF "session=varchar(32) NOT NULL"
Database orderline COLUMN_DEF "username=varchar(32)"
Database orderline COLUMN_DEF "username=varchar(255)"
Database orderline COLUMN_DEF "shipmode=varchar(255)"
Database orderline COLUMN_DEF "sku=varchar(64) NOT NULL"
Database orderline COLUMN_DEF "quantity=int NOT NULL"
Expand Down
4 changes: 2 additions & 2 deletions dist/strap/dbconf/pgsql/transactions.pgsql
View file
Expand Up @@ -4,7 +4,7 @@ Database transactions COLUMN_DEF "code=varchar(24) NOT NULL PRIMARY KEY"
Database transactions COLUMN_DEF "store_id=varchar(9)"
Database transactions COLUMN_DEF "order_number=varchar(24) NOT NULL"
Database transactions COLUMN_DEF "session=varchar(64) NOT NULL"
Database transactions COLUMN_DEF "username=varchar(32) DEFAULT '' NOT NULL"
Database transactions COLUMN_DEF "username=varchar(255) DEFAULT '' NOT NULL"
Database transactions COLUMN_DEF "shipmode=varchar(255)"
Database transactions COLUMN_DEF "nitems=int NOT NULL"
Database transactions COLUMN_DEF "subtotal=decimal(12,2) NOT NULL"
Expand All @@ -24,7 +24,7 @@ Database transactions COLUMN_DEF "country=varchar(32)"
Database transactions COLUMN_DEF "phone_day=varchar(32)"
Database transactions COLUMN_DEF "phone_night=varchar(32)"
Database transactions COLUMN_DEF "fax=varchar(32)"
Database transactions COLUMN_DEF "email=varchar(128)"
Database transactions COLUMN_DEF "email=varchar(255)"
Database transactions COLUMN_DEF "b_fname=varchar(128)"
Database transactions COLUMN_DEF "b_lname=varchar(128)"
Database transactions COLUMN_DEF "b_company=varchar(128)"
Expand Down
6 changes: 3 additions & 3 deletions dist/strap/dbconf/pgsql/userdb.pgsql
View file
Expand Up @@ -2,8 +2,8 @@ Database userdb userdb.txt __SQLDSN__
Database userdb LENGTH_EXCEPTION_DEFAULT truncate_log
Database userdb DEFAULT_TYPE varchar(255)

Database userdb COLUMN_DEF "username=varchar(64) NOT NULL PRIMARY KEY"
Database userdb COLUMN_DEF "usernick=varchar(64) NOT NULL"
Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY"
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"
Expand Down Expand Up @@ -32,7 +32,7 @@ Database userdb COLUMN_DEF "country=varchar(10)"
Database userdb COLUMN_DEF "credit_limit=varchar(16)"
Database userdb COLUMN_DEF "db_acl=text"
Database userdb COLUMN_DEF "dealer=varchar(32)"
Database userdb COLUMN_DEF "email=varchar(42)"
Database userdb COLUMN_DEF "email=varchar(255)"
Database userdb COLUMN_DEF "fax=varchar(30)"
Database userdb COLUMN_DEF "file_acl=text"
Database userdb COLUMN_DEF "fname=varchar(30)"
Expand Down
2 changes: 1 addition & 1 deletion dist/strap/dbconf/sqlite/orderline.lite
View file
Expand Up @@ -4,7 +4,7 @@ Database orderline COLUMN_DEF "code=char(14) NOT NULL PRIMARY KEY"
Database orderline COLUMN_DEF "store_id=varchar(9) DEFAULT '' NOT NULL"
Database orderline COLUMN_DEF "order_number=varchar(14) NOT NULL"
Database orderline COLUMN_DEF "session=varchar(32) NOT NULL"
Database orderline COLUMN_DEF "username=varchar(20) default '' NOT NULL"
Database orderline COLUMN_DEF "username=varchar(255) default '' NOT NULL"
Database orderline COLUMN_DEF "shipmode=varchar(255) default '' NOT NULL"
Database orderline COLUMN_DEF "sku=varchar(64) NOT NULL"
Database orderline COLUMN_DEF "quantity=varchar(9) NOT NULL"
Expand Down
4 changes: 2 additions & 2 deletions dist/strap/dbconf/sqlite/transactions.lite
View file
Expand Up @@ -6,7 +6,7 @@ Database transactions INDEX store_id
Database transactions COLUMN_DEF "order_number=varchar(14) NOT NULL"
Database transactions INDEX order_number
Database transactions COLUMN_DEF "session=varchar(32) NOT NULL"
Database transactions COLUMN_DEF "username=varchar(20) default '' NOT NULL"
Database transactions COLUMN_DEF "username=varchar(255) default '' NOT NULL"
Database transactions COLUMN_DEF "shipmode=varchar(255) NOT NULL"
Database transactions COLUMN_DEF "nitems=varchar(9) NOT NULL"
Database transactions COLUMN_DEF "subtotal=varchar(12) NOT NULL"
Expand All @@ -26,7 +26,7 @@ Database transactions COLUMN_DEF "country=varchar(10) DEFAULT '' NOT NULL"
Database transactions COLUMN_DEF "phone_day=varchar(20)"
Database transactions COLUMN_DEF "phone_night=varchar(20)"
Database transactions COLUMN_DEF "fax=varchar(20)"
Database transactions COLUMN_DEF "email=varchar(42)"
Database transactions COLUMN_DEF "email=varchar(255)"
Database transactions COLUMN_DEF "b_fname=varchar(30)"
Database transactions COLUMN_DEF "b_lname=varchar(30)"
Database transactions COLUMN_DEF "b_company=varchar(30)"
Expand Down
6 changes: 3 additions & 3 deletions dist/strap/dbconf/sqlite/userdb.lite
View file
@@ -1,8 +1,8 @@
Database userdb userdb.txt __SQLDSN__
Database userdb DEFAULT_TYPE varchar(255)

Database userdb COLUMN_DEF "username=varchar(64) NOT NULL PRIMARY KEY"
Database userdb COLUMN_DEF "usernick=varchar(64) NOT NULL"
Database userdb COLUMN_DEF "username=varchar(255) NOT NULL PRIMARY KEY"
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"
Expand Down Expand Up @@ -30,7 +30,7 @@ Database userdb COLUMN_DEF "company=varchar(64)"
Database userdb COLUMN_DEF "country=varchar(10)"
Database userdb COLUMN_DEF "credit_limit=varchar(16)"
Database userdb COLUMN_DEF "db_acl=text"
Database userdb COLUMN_DEF "dealer=varchar(32)"
Database userdb COLUMN_DEF "dealer=varchar(255)"
Database userdb COLUMN_DEF "email=varchar(42)"
Database userdb COLUMN_DEF "fax=varchar(30)"
Database userdb COLUMN_DEF "file_acl=text"
Expand Down

0 comments on commit 3f2ab88

Please sign in to comment.