[geeklog-hg] geeklog: Modified zipcode field to allow up to 16 characters
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Aug 8 09:02:39 EDT 2012
changeset 8786:e04cbdc55a4b
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e04cbdc55a4b
user: kenji at grebe.flets-west.jp
date: Sun Jul 22 14:59:40 2012 +0900
description:
Modified zipcode field to allow up to 16 characters
diffstat:
plugins/calendar/functions.inc | 3 +-
plugins/calendar/sql/mssql_install.php | 6 +-
plugins/calendar/sql/mssql_updates.php | 16 +++++++++-
plugins/calendar/sql/mysql_install.php | 6 +-
plugins/calendar/sql/mysql_updates.php | 16 +++++++++-
plugins/calendar/sql/pgsql_install.php | 6 +-
plugins/calendar/sql/pgsql_updates.php | 35 ++++++++++++++++++++-
plugins/calendar/templates/admin/eventeditor.thtml | 2 +-
plugins/calendar/templates/editpersonalevent.thtml | 2 +-
plugins/calendar/templates/submitevent.thtml | 2 +-
10 files changed, 77 insertions(+), 17 deletions(-)
diffs (253 lines):
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/functions.inc Sun Jul 22 14:59:40 2012 +0900
@@ -1611,7 +1611,8 @@
}
calendar_update_ConfigSecurity_1_1_2();
-
+ calendar_update_Zipcode_1_1_2();
+
$current_version = '1.1.3';
break;
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/mssql_install.php
--- a/plugins/calendar/sql/mssql_install.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/mssql_install.php Sun Jul 22 14:59:40 2012 +0900
@@ -51,7 +51,7 @@
[address2] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[city] [varchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[state] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
- [zipcode] [varchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+ [zipcode] [varchar] (16) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[allday] [smallint] NULL ,
[event_type] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[location] [varchar] (128) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
@@ -70,7 +70,7 @@
[dateend] [smalldatetime] NULL ,
[url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[allday] [smallint] NOT NULL ,
- [zipcode] [varchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+ [zipcode] [varchar] (16) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[state] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[city] [varchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[address2] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
@@ -93,7 +93,7 @@
[address2] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[city] [varchar] (60) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[state] [varchar] (40) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
- [zipcode] [varchar] (5) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
+ [zipcode] [varchar] (16) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[allday] [smallint] NOT NULL ,
[url] [varchar] (255) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
[description] [varchar] (5000) COLLATE SQL_Latin1_General_CP1_CI_AS NULL ,
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/mssql_updates.php
--- a/plugins/calendar/sql/mssql_updates.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/mssql_updates.php Sun Jul 22 14:59:40 2012 +0900
@@ -54,8 +54,13 @@
// Delete Events block since moved to dynamic
"DELETE FROM {$_TABLES['blocks']} WHERE phpblockfn = 'phpblock_calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_events_block', 'Access to configure events block', 0)"
- )
+ ),
+ '1.1.3' => array(
+ "ALTER TABLE {$_TABLES['events']} ALTER COLUMN [zipcode] varchar(16)",
+ "ALTER TABLE {$_TABLES['eventsubmission']} ALTER COLUMN [zipcode] varchar(16)",
+ "ALTER TABLE {$_TABLES['personal_events']} ALTER COLUMN [zipcode] varchar(16)"
+ ),
);
/**
@@ -127,4 +132,13 @@
}
+/**
+ * Modify zipcode field
+ *
+ */
+function calendar_update_Zipcode_1_1_2()
+{
+ // Nothing to do
+}
+
?>
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/mysql_install.php
--- a/plugins/calendar/sql/mysql_install.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/mysql_install.php Sun Jul 22 14:59:40 2012 +0900
@@ -50,7 +50,7 @@
address2 varchar(40) default NULL,
city varchar(60) default NULL,
state varchar(40) default NULL,
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
allday tinyint(1) NOT NULL default '0',
event_type varchar(40) NOT NULL default '',
location varchar(128) default NULL,
@@ -74,7 +74,7 @@
dateend date default NULL,
url varchar(255) default NULL,
allday tinyint(1) NOT NULL default '0',
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
state varchar(40) default NULL,
city varchar(60) default NULL,
address2 varchar(40) default NULL,
@@ -98,7 +98,7 @@
address2 varchar(40) default NULL,
city varchar(60) default NULL,
state varchar(40) default NULL,
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
allday tinyint(1) NOT NULL default '0',
url varchar(255) default NULL,
description text,
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/mysql_updates.php
--- a/plugins/calendar/sql/mysql_updates.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/mysql_updates.php Sun Jul 22 14:59:40 2012 +0900
@@ -54,8 +54,13 @@
// Delete Events block since moved to dynamic
"DELETE FROM {$_TABLES['blocks']} WHERE phpblockfn = 'phpblock_calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_events_block', 'Access to configure events block', 0)"
- )
+ ),
+ '1.1.3' => array(
+ "ALTER TABLE {$_TABLES['events']} CHANGE zipcode zipcode varchar(16) default NULL",
+ "ALTER TABLE {$_TABLES['eventsubmission']} CHANGE zipcode zipcode varchar(16) default NULL",
+ "ALTER TABLE {$_TABLES['personal_events']} CHANGE zipcode zipcode varchar(16) default NULL",
+ ),
);
/**
@@ -127,4 +132,13 @@
}
+/**
+ * Modify zipcode field
+ *
+ */
+function calendar_update_Zipcode_1_1_2()
+{
+ // Nothing to do
+}
+
?>
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/pgsql_install.php
--- a/plugins/calendar/sql/pgsql_install.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/pgsql_install.php Sun Jul 22 14:59:40 2012 +0900
@@ -51,7 +51,7 @@
address2 varchar(40) default NULL,
city varchar(60) default NULL,
state varchar(40) default NULL,
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
allday int NOT NULL default '0',
event_type varchar(40) NOT NULL default '',
location varchar(128) default NULL,
@@ -74,7 +74,7 @@
dateend date default NULL,
url varchar(255) default NULL,
allday int NOT NULL default '0',
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
state varchar(40) default NULL,
city varchar(60) default NULL,
address2 varchar(40) default NULL,
@@ -98,7 +98,7 @@
address2 varchar(40) default NULL,
city varchar(60) default NULL,
state varchar(40) default NULL,
- zipcode varchar(5) default NULL,
+ zipcode varchar(16) default NULL,
allday int NOT NULL default '0',
url varchar(255) default NULL,
description text,
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/sql/pgsql_updates.php
--- a/plugins/calendar/sql/pgsql_updates.php Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/sql/pgsql_updates.php Sun Jul 22 14:59:40 2012 +0900
@@ -44,8 +44,15 @@
// Delete Events block since moved to dynamic
"DELETE FROM {$_TABLES['blocks']} WHERE phpblockfn = 'phpblock_calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_events_block', 'Access to configure events block', 0)"
- )
-
+ ),
+
+ // Pgsql doesn't support the change of a column definition, so the update task
+ // will be done calendar_update_Zipcode_1_1_2().
+// '1.1.3' => array(
+// "ALTER TABLE {$_TABLES['events']} CHANGE zipcode zipcode varchar(16) default NULL",
+// "ALTER TABLE {$_TABLES['eventsubmission']} CHANGE zipcode zipcode varchar(16) default NULL",
+// "ALTER TABLE {$_TABLES['personal_events']} CHANGE zipcode zipcode varchar(16) default NULL",
+// ),
);
/**
@@ -96,4 +103,28 @@
}
+/**
+ * Modify zipcode field
+ *
+ */
+function calendar_update_Zipcode_1_1_2()
+{
+ global $_TABLES;
+
+ $tables = array(
+ $_TABLES['events'], $_TABLES['eventsubmission'], $_TABLES['personal_events'],
+ );
+
+ foreach ($tables as $t) {
+ $sql = "ALTER TABLE {$t} RENAME zipcode TO zipcode2 ";
+ DB_query($sql);
+ $sql = "ALTER TABLE {$t} ADD COLUMN zipcode varchar(16) default NULL ";
+ DB_query($sql);
+ $sql = "UPDATE {$t} SET zipcode = zipcode2 ";
+ DB_query($sql);
+ $sql = "ALTER TABLE {$t} DROP COLUMN zipcode2 ";
+ DB_query($sql);
+ }
+}
+
?>
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/templates/admin/eventeditor.thtml
--- a/plugins/calendar/templates/admin/eventeditor.thtml Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/templates/admin/eventeditor.thtml Sun Jul 22 14:59:40 2012 +0900
@@ -80,7 +80,7 @@
<dd><input type="text" name="state" value="{event_state}" id="calendar-eventeditor-state" class="size6"{xhtml}></dd>
<dt><label for="calendar-eventeditor-zipcode">{lang_zipcode}</label></dt>
- <dd><input type="text" name="zipcode" maxlength="5" value="{event_zipcode}" id="calendar-eventeditor-zipcode" class="size1"{xhtml}></dd>
+ <dd><input type="text" name="zipcode" maxlength="16" value="{event_zipcode}" id="calendar-eventeditor-zipcode" class="size1"{xhtml}></dd>
<dt><label for="calendar-eventeditor-url">{lang_eventurl}</label></dt>
<dd><input type="text" dir="ltr" name="url" maxlength="{max_url_length}" value="{event_url}" id="calendar-eventeditor-url" class="size6"{xhtml}> {lang_includehttp}</dd>
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/templates/editpersonalevent.thtml
--- a/plugins/calendar/templates/editpersonalevent.thtml Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/templates/editpersonalevent.thtml Sun Jul 22 14:59:40 2012 +0900
@@ -99,7 +99,7 @@
</tr>
<tr>
<td align="right"><b>{lang_zipcode}:</b></td>
- <td><input type="text" name="zipcode" size="5" maxlength="5" value="{event_zipcode}"{xhtml}></td>
+ <td><input type="text" name="zipcode" size="16" maxlength="16" value="{event_zipcode}"{xhtml}></td>
</tr>
<tr>
<td align="right"><b>{lang_link}:</b></td>
diff -r 3b0b7cc0e3b0 -r e04cbdc55a4b plugins/calendar/templates/submitevent.thtml
--- a/plugins/calendar/templates/submitevent.thtml Sun Jul 22 00:51:52 2012 +0900
+++ b/plugins/calendar/templates/submitevent.thtml Sun Jul 22 14:59:40 2012 +0900
@@ -82,7 +82,7 @@
<div class="form-field"><input type="text" name="state" size="40"{xhtml}></div>
<div class="clear-left"></div>
<div class="form-description">{lang_zipcode}:</div>
- <div class="form-field"><input type="text" name="zipcode" size="5" maxlength="5"{xhtml}></div>
+ <div class="form-field"><input type="text" name="zipcode" size="16" maxlength="16"{xhtml}></div>
<div class="clear-left"></div>
<div class="form-description">{lang_link}:</div>
<div class="form-field"><input type="text" dir="ltr" size="48" maxlength="{max_url_length}" name="url" value="http://"{xhtml}></div>
More information about the geeklog-cvs
mailing list