You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/11/04 19:14:03 UTC
svn commit: r330857 - in
/incubator/roller/branches/roller_1.x/metadata/database:
120-to-130-migration-raw.sql db_hsql.properties db_mysql.properties
db_postgresql.properties
Author: snoopdave
Date: Fri Nov 4 10:14:00 2005
New Revision: 330857
URL: http://svn.apache.org/viewcvs?rev=330857&view=rev
Log:
Better way to handle removal of not null constraint
Modified:
incubator/roller/branches/roller_1.x/metadata/database/120-to-130-migration-raw.sql
incubator/roller/branches/roller_1.x/metadata/database/db_hsql.properties
incubator/roller/branches/roller_1.x/metadata/database/db_mysql.properties
incubator/roller/branches/roller_1.x/metadata/database/db_postgresql.properties
Modified: incubator/roller/branches/roller_1.x/metadata/database/120-to-130-migration-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/metadata/database/120-to-130-migration-raw.sql?rev=330857&r1=330856&r2=330857&view=diff
==============================================================================
--- incubator/roller/branches/roller_1.x/metadata/database/120-to-130-migration-raw.sql (original)
+++ incubator/roller/branches/roller_1.x/metadata/database/120-to-130-migration-raw.sql Fri Nov 4 10:14:00 2005
@@ -1,10 +1,2 @@
--- Upgrading from 1.2 to 1.3 requires one small change. The website table
--- column defaultpageid is now allowed to be null. Unfortunately, MySQL
--- requires non-standard alter table syntax for this.
-
--- So if you're on MySQL do this:
-alter table website modify defaultpageid varchar(48);
-
--- And for all other databases do this:
-alter table website alter column defaultpageid drop not null;
\ No newline at end of file
+@ALTER_DEFAULTPAGEID_ALLOW_NULL@;
Modified: incubator/roller/branches/roller_1.x/metadata/database/db_hsql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/metadata/database/db_hsql.properties?rev=330857&r1=330856&r2=330857&view=diff
==============================================================================
--- incubator/roller/branches/roller_1.x/metadata/database/db_hsql.properties (original)
+++ incubator/roller/branches/roller_1.x/metadata/database/db_hsql.properties Fri Nov 4 10:14:00 2005
@@ -6,3 +6,5 @@
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
+ALTER_PUBTIME_ALLOW_NULL=
+ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file
Modified: incubator/roller/branches/roller_1.x/metadata/database/db_mysql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/metadata/database/db_mysql.properties?rev=330857&r1=330856&r2=330857&view=diff
==============================================================================
--- incubator/roller/branches/roller_1.x/metadata/database/db_mysql.properties (original)
+++ incubator/roller/branches/roller_1.x/metadata/database/db_mysql.properties Fri Nov 4 10:14:00 2005
@@ -1 +1 @@
-TEXT_SQL_TYPE=text
BOOLEAN_SQL_TYPE_FALSE=bit default 0
BOOLEAN_SQL_TYPE_TRUE=bit default 1
BOOLEAN_SQL_TYPE=bit
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=(40)
INDEXSIZE_LARGE=(100)
\ No newline at end of file
+TEXT_SQL_TYPE=text
BOOLEAN_SQL_TYPE_FALSE=bit default 0
BOOLEAN_SQL_TYPE_TRUE=bit default 1
BOOLEAN_SQL_TYPE=bit
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=(40)
INDEXSIZE_LARGE=(100)
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website modify defaultpageid varchar(48)
\ No newline at end of file
Modified: incubator/roller/branches/roller_1.x/metadata/database/db_postgresql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_1.x/metadata/database/db_postgresql.properties?rev=330857&r1=330856&r2=330857&view=diff
==============================================================================
--- incubator/roller/branches/roller_1.x/metadata/database/db_postgresql.properties (original)
+++ incubator/roller/branches/roller_1.x/metadata/database/db_postgresql.properties Fri Nov 4 10:14:00 2005
@@ -5,4 +5,5 @@
BOOLEAN_FALSE=false
BOOLEAN_TRUE=true
INDEXSIZE=
-INDEXSIZE_LARGE=
\ No newline at end of file
+INDEXSIZE_LARGE=
+ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file