Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of ssh://git.icdevgroup.org/var/git/interchange
  • Loading branch information
Mike Heins committed Jan 31, 2017
2 parents 81d1395 + e287246 commit 6340972
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions 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"
Expand Down Expand Up @@ -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"
8 changes: 4 additions & 4 deletions dist/strap/dbconf/pgsql/userdb.pgsql
Expand Up @@ -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"
Expand Down Expand Up @@ -39,7 +39,7 @@ Database userdb COLUMN_DEF "fname=varchar(30)"
Database userdb COLUMN_DEF "inactive=varchar(8)"
Database userdb COLUMN_DEF "lname=varchar(30)"
Database userdb COLUMN_DEF "mail_list=text"
Database userdb COLUMN_DEF "mod_time=varchar(20)"
Database userdb COLUMN_DEF "mod_time=timestamp"
Database userdb COLUMN_DEF "mv_shipmode=varchar(255)"
Database userdb COLUMN_DEF "owner=varchar(20)"
Database userdb COLUMN_DEF "p_nickname=text"
Expand All @@ -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 INDEX "UNIQUE usernick"

# Prevent problems with abstime representation
UserDB default time_field none
UserDB default iso_time 1
4 changes: 2 additions & 2 deletions dist/strap/dbconf/sqlite/userdb.lite
Expand Up @@ -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"
Expand Down Expand Up @@ -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

0 comments on commit 6340972

Please sign in to comment.