[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 8767:f41c7a1e2965
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f41c7a1e2965
user: Tom <websitemaster at cogeco.net>
date: Tue Jul 03 09:59:35 2012 -0400
description:
Merged with upstream

diffstat:

 sql/pgsql_tableanddata.php           |  12 ++++++------
 sql/updates/pgsql_1.8.1_to_2.0.0.php |   8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r be2659650a6d -r f41c7a1e2965 sql/pgsql_tableanddata.php
--- a/sql/pgsql_tableanddata.php	Tue Jul 03 09:55:04 2012 -0400
+++ b/sql/pgsql_tableanddata.php	Tue Jul 03 09:59:35 2012 -0400
@@ -211,7 +211,7 @@
 $_SQL[] = "
 CREATE TABLE {$_TABLES['maillist']} (
   code SERIAL, 
-  name char(32) default NULL,
+  name varchar(32) default NULL,
   PRIMARY KEY (code)
 )
 ";
@@ -244,8 +244,8 @@
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['postmodes']} (
-  code char(10) NOT NULL default '',
-  name char(32) default NULL,
+  code varchar(10) NOT NULL default '',
+  name varchar(32) default NULL,
   PRIMARY KEY (code)
 )
 ";
@@ -267,8 +267,8 @@
 
 $_SQL[] = "
 CREATE TABLE {$_TABLES['sortcodes']} (
-  code char(4) NOT NULL default '0',
-  name char(32) default NULL,
+  code varchar(4) NOT NULL default '0',
+  name varchar(32) default NULL,
   PRIMARY KEY (code)
 )
 ";
@@ -288,7 +288,7 @@
 $_SQL[] = "
 CREATE TABLE {$_TABLES['statuscodes']} (
   code int NOT NULL default '0',
-  name char(32) default NULL,
+  name varchar(32) default NULL,
   PRIMARY KEY (code)
 )
 ";
diff -r be2659650a6d -r f41c7a1e2965 sql/updates/pgsql_1.8.1_to_2.0.0.php
--- a/sql/updates/pgsql_1.8.1_to_2.0.0.php	Tue Jul 03 09:55:04 2012 -0400
+++ b/sql/updates/pgsql_1.8.1_to_2.0.0.php	Tue Jul 03 09:59:35 2012 -0400
@@ -27,6 +27,14 @@
 $_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD algorithm varchar(12) NOT NULL default 0";
 $_SQL[] = "ALTER TABLE {$_TABLES['users']} ADD stretch int NOT NULL default 1";
 
+// use varchars, not fixed-size char fields
+$_SQL[] = "ALTER TABLE {$_TABLES['maillist']} ALTER COLUMN name TYPE varchar(32)";
+$_SQL[] = "ALTER TABLE {$_TABLES['postmodes']} ALTER COLUMN code TYPE varchar(10)";
+$_SQL[] = "ALTER TABLE {$_TABLES['postmodes']} ALTER COLUMN name TYPE varchar(32)";
+$_SQL[] = "ALTER TABLE {$_TABLES['sortcodes']} ALTER COLUMN code TYPE varchar(4)";
+$_SQL[] = "ALTER TABLE {$_TABLES['sortcodes']} ALTER COLUMN name TYPE varchar(32)";
+$_SQL[] = "ALTER TABLE {$_TABLES['statuscodes']} ALTER COLUMN name TYPE varchar(32)";
+
 /**
  * Create Story and Submission Topic assignments
  *