From debdda011717e63945a0f6a9db6ab77b30a47079 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Tue, 25 Nov 2008 05:17:57 -0500 Subject: [PATCH] #1485420: remove default (and not null) for users.language column in DDL --- SQL/mysql5.initial.sql | 2 +- SQL/postgres.update.sql | 3 +++ SQL/mysql.update.sql | 3 +++ SQL/postgres.initial.sql | 2 +- SQL/mysql.initial.sql | 2 +- SQL/sqlite.initial.sql | 2 +- SQL/mssql.initial.sql | 3 +-- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql index 98412de..1814701 100644 --- a/SQL/mssql.initial.sql +++ b/SQL/mssql.initial.sql @@ -69,7 +69,7 @@ [alias] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL , [created] [datetime] NOT NULL , [last_login] [datetime] NULL , - [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL , + [language] [varchar] (5) COLLATE Latin1_General_CI_AI NULL , [preferences] [text] COLLATE Latin1_General_CI_AI NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO @@ -202,7 +202,6 @@ CONSTRAINT [DF_users_mail_host] DEFAULT ('') FOR [mail_host], CONSTRAINT [DF_users_alias] DEFAULT ('') FOR [alias], CONSTRAINT [DF_users_created] DEFAULT (getdate()) FOR [created], - CONSTRAINT [DF_users_language] DEFAULT ('en') FOR [language] GO CREATE INDEX [IX_users_username] ON [dbo].[users]([username]) ON [PRIMARY] diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index 4fa6a00..5b2bb8a 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -90,7 +90,7 @@ `alias` varchar(128) NOT NULL default '', `created` datetime NOT NULL default '0000-00-00 00:00:00', `last_login` datetime NOT NULL default '0000-00-00 00:00:00', - `language` varchar(5) NOT NULL default 'en', + `language` varchar(5), `preferences` text, PRIMARY KEY (`user_id`), INDEX `username_index` (`username`), diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql index 74ff533..5590099 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -41,3 +41,6 @@ ALTER TABLE `cache` ADD INDEX `created_index` (`created`); + +ALTER TABLE `users` + CHANGE `language` `language` varchar(5); diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql index 54dee1d..8c6b1e0 100644 --- a/SQL/mysql5.initial.sql +++ b/SQL/mysql5.initial.sql @@ -28,7 +28,7 @@ `alias` varchar(128) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `last_login` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `language` varchar(5) NOT NULL DEFAULT 'en', + `language` varchar(5), `preferences` text, PRIMARY KEY(`user_id`), INDEX `username_index` (`username`), diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql index b5f7779..d2e5698 100644 --- a/SQL/postgres.initial.sql +++ b/SQL/postgres.initial.sql @@ -21,7 +21,7 @@ alias character varying(128) DEFAULT ''::character varying NOT NULL, created timestamp with time zone DEFAULT now() NOT NULL, last_login timestamp with time zone DEFAULT now() NOT NULL, - "language" character varying(5) DEFAULT 'en'::character varying NOT NULL, + "language" character varying(5), preferences text DEFAULT ''::text NOT NULL ); diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql index 14fdc97..5dae5a2 100644 --- a/SQL/postgres.update.sql +++ b/SQL/postgres.update.sql @@ -28,3 +28,6 @@ CREATE INDEX session_changed_idx ON session (changed); CREATE INDEX cache_created_idx ON "cache" (created); + +ALTER TABLE users ALTER "language" DROP NOT NULL; +ALTER TABLE users ALTER "language" DROP DEFAULT; diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index e89f0d1..5120ea0 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -76,7 +76,7 @@ alias varchar(128) NOT NULL default '', created datetime NOT NULL default '0000-00-00 00:00:00', last_login datetime NOT NULL default '0000-00-00 00:00:00', - language varchar(5) NOT NULL default 'en', + language varchar(5), preferences text NOT NULL default '' ); -- Gitblit v1.9.1