Menu
▾
▴
mailmanager/sql addTextSearch.zsql,1.4.2.2,1.4.2.3 createCategoryAndTemplateTables.zsql,1.1.4.6,1.1.4.7 createTables.zsql,1.5.2.1,1.5.2.2
|
From: Graeme M. <ma...@us...> - 2005-11-03 16:25:55
|
Update of /cvsroot/mailmanager/mailmanager/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2045/sql Modified Files: Tag: RELENG_2_0_1 addTextSearch.zsql createCategoryAndTemplateTables.zsql createTables.zsql Log Message: Some initial work on the migration directly from 1.1 to MySQL 2.0.3: - Support migration to MySQL. - Explicitly set the MySQL tables to UTF-8. - If we're on MySQL, the textSearch tables need to be created at the same time as the rest of the tables. Note: It still doesn't work! I'm getting UnicodeEncodeErrors when pushing non-ASCII data into the database (somewhere in ZMySQLDA). Index: createTables.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/createTables.zsql,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- createTables.zsql 10 Aug 2005 13:13:12 -0000 1.5.2.1 +++ createTables.zsql 3 Nov 2005 16:25:36 -0000 1.5.2.2 @@ -13,7 +13,7 @@ reports <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>, settings <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>, password VARCHAR(42) -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_customer ( username VARCHAR(12) PRIMARY KEY, @@ -21,19 +21,19 @@ email TEXT, signature TEXT, password VARCHAR(42) -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_group ( group_name VARCHAR(128) PRIMARY KEY, group_turn INT DEFAULT 0 -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_group_members ( group_name VARCHAR(128), FOREIGN KEY (group_name) REFERENCES <dtml-var schema>mm_group(group_name) ON DELETE CASCADE <dtml-var sql_deferrable>, username VARCHAR(12), FOREIGN KEY (username) REFERENCES <dtml-var schema>mm_user(username) <dtml-var sql_deferrable> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_account ( email VARCHAR(255) PRIMARY KEY, @@ -67,7 +67,7 @@ signature <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>, signature_text TEXT, html_signature <dtml-var sql_boolean> DEFAULT <dtml-var sql_false> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_ticket ( id <dtml-var sql_serialpkey>, @@ -104,7 +104,7 @@ date_opened <dtml-var sql_datetimestamp>, date_responded <dtml-var sql_datetimestamp>, date_closed <dtml-var sql_datetimestamp> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_message ( id <dtml-var sql_serialpkey>, @@ -123,7 +123,7 @@ raw_headers TEXT, body TEXT, html_body TEXT -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_attachment ( id <dtml-var sql_serialpkey>, @@ -137,7 +137,7 @@ is_file <dtml-var sql_boolean> DEFAULT <dtml-var sql_false>, body <dtml-var sql_binary>, dangerous <dtml-var sql_boolean> DEFAULT <dtml-var sql_false> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_history ( id <dtml-var sql_serialpkey>, @@ -154,7 +154,7 @@ category2 TEXT, changed_by VARCHAR(12), change_date <dtml-var sql_datetimestamp> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_filter ( id <dtml-var sql_serialpkey>, @@ -179,11 +179,11 @@ category1 TEXT, category2 TEXT, response_target <dtml-var sql_interval> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_customer_email ( username VARCHAR(12), FOREIGN KEY (username) REFERENCES <dtml-var schema>mm_customer(username) ON DELETE CASCADE <dtml-var sql_deferrable>, access_email TEXT -) <dtml-var sql_tabletype> +) <dtml-var sql_tabletype> <dtml-var sql_charset> Index: addTextSearch.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/addTextSearch.zsql,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -d -r1.4.2.2 -r1.4.2.3 --- addTextSearch.zsql 10 Oct 2005 16:37:56 -0000 1.4.2.2 +++ addTextSearch.zsql 3 Nov 2005 16:25:36 -0000 1.4.2.3 @@ -155,7 +155,7 @@ body TEXT, html_body TEXT, FULLTEXT (body, html_body) - ) <dtml-var sql_delimiter> + ) <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE mm_ticket_index ( id INT, @@ -163,6 +163,6 @@ body TEXT, html_body TEXT, FULLTEXT (body, html_body) - ) <dtml-var sql_delimiter> + ) <dtml-var sql_charset> <dtml-var sql_delimiter> </dtml-if> Index: createCategoryAndTemplateTables.zsql =================================================================== RCS file: /cvsroot/mailmanager/mailmanager/sql/createCategoryAndTemplateTables.zsql,v retrieving revision 1.1.4.6 retrieving revision 1.1.4.7 diff -u -d -r1.1.4.6 -r1.1.4.7 --- createCategoryAndTemplateTables.zsql 12 Sep 2005 15:19:37 -0000 1.1.4.6 +++ createCategoryAndTemplateTables.zsql 3 Nov 2005 16:25:36 -0000 1.1.4.7 @@ -27,7 +27,7 @@ CHECK (id IN (0,1,2)), label TEXT, enabled BOOL -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> CREATE TABLE <dtml-var schema>mm_category_choices ( category_id INT, @@ -38,7 +38,7 @@ <dtml-elif expr="sql_database == 'mysql'"> PRIMARY KEY(category_id, choice(255)) </dtml-if> -) <dtml-var sql_tabletype> <dtml-var sql_delimiter> +) <dtml-var sql_tabletype> <dtml-var sql_charset> <dtml-var sql_delimiter> <dtml-comment> @@ -62,5 +62,5 @@ <dtml-elif expr="sql_database == 'mysql'"> PRIMARY KEY(name(255)) </dtml-if> -) <dtml-var sql_tabletype> +) <dtml-var sql_tabletype> <dtml-var sql_charset> |