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/29 04:13:05 UTC
svn commit: r349601 - in /incubator/roller/trunk/metadata/database: 200-to-210-migration-raw.sql db_db2.properties db_derby.properties db_hsql.properties db_mysql.properties db_oracle.properties db_postgresql.properties

Author: snoopdave
Date: Mon Nov 28 19:12:56 2005
New Revision: 349601

URL: http://svn.apache.org/viewcvs?rev=349601&view=rev
Log:
Database script fixes

Modified:
    incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql
    incubator/roller/trunk/metadata/database/db_db2.properties
    incubator/roller/trunk/metadata/database/db_derby.properties
    incubator/roller/trunk/metadata/database/db_hsql.properties
    incubator/roller/trunk/metadata/database/db_mysql.properties
    incubator/roller/trunk/metadata/database/db_oracle.properties
    incubator/roller/trunk/metadata/database/db_postgresql.properties

Modified: incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql (original)
+++ incubator/roller/trunk/metadata/database/200-to-210-migration-raw.sql Mon Nov 28 19:12:56 2005
@@ -1,16 +1,16 @@
 
-alter table roller_comment add column approved %BOOLEAN_SQL_TYPE_FALSE%;
-%ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL%
-alter table roller_comment add column pending %BOOLEAN_SQL_TYPE_TRUE%;
-%ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL%
-update roller_comment set approved=1, pending=0 posttime=posttime;
+alter table roller_comment add column approved @BOOLEAN_SQL_TYPE_FALSE@;
+@ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL@;
+alter table roller_comment add column pending @BOOLEAN_SQL_TYPE_TRUE@;
+@ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL@;
+update roller_comment set approved=1, pending=0, posttime=posttime;
 
-alter table website add column commentmod %BOOLEAN_SQL_TYPE_FALSE%;
-%ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL%
-alter table website add column defaultallowcomments %BOOLEAN_SQL_TYPE_TRUE%;
-%ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL%
+alter table website add column commentmod @BOOLEAN_SQL_TYPE_FALSE@;
+@ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL@;
+alter table website add column defaultallowcomments @BOOLEAN_SQL_TYPE_TRUE@;
+@ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL@;
 alter table website add column defaultcommentdays integer;
-%ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL%
+@ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL@;
 update website set commentmod=0, defaultallowcomments=1, defaultcommentdays=0, datecreated=datecreated;
 
 

Modified: incubator/roller/trunk/metadata/database/db_db2.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_db2.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_db2.properties (original)
+++ incubator/roller/trunk/metadata/database/db_db2.properties Mon Nov 28 19:12:56 2005
@@ -1 +1 @@
-TEXT_SQL_TYPE=clob(102400)
BOOLEAN_SQL_TYPE_FALSE=smallint default 0
BOOLEAN_SQL_TYPE_TRUE=smallint default 1
BOOLEAN_SQL_TYPE=smallint
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=on delete no action on update no action enforced enable query optimization
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file
+TEXT_SQL_TYPE=clob(102400)
BOOLEAN_SQL_TYPE_FALSE=smallint default 0
BOOLEAN_SQL_TYPE_TRUE=smallint default 1
BOOLEAN_SQL_TYPE=smallint
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=on delete no action on update no action enforced enable query optimization
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment alter approved add NOT NULL
ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment alter pending add NOT NULL
ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website alter commentmod add NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website alter defaultallowcomments add NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website alter defaultcommentdays add NOT NULL
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/db_derby.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_derby.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_derby.properties (original)
+++ incubator/roller/trunk/metadata/database/db_derby.properties Mon Nov 28 19:12:56 2005
@@ -1 +1 @@
-TEXT_SQL_TYPE=clob(102400)
BOOLEAN_SQL_TYPE_FALSE=smallint default 0
BOOLEAN_SQL_TYPE_TRUE=smallint default 1
BOOLEAN_SQL_TYPE=smallint
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file
+TEXT_SQL_TYPE=clob(102400)
BOOLEAN_SQL_TYPE_FALSE=smallint default 0
BOOLEAN_SQL_TYPE_TRUE=smallint default 1
BOOLEAN_SQL_TYPE=smallint
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment alter approved add NOT NULL
ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment alter pending add NOT NULL
ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website alter commentmod add NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website alter defaultallowcomments add NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website alter defaultcommentdays add NOT NULL
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/db_hsql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_hsql.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_hsql.properties (original)
+++ incubator/roller/trunk/metadata/database/db_hsql.properties Mon Nov 28 19:12:56 2005
@@ -10,4 +10,9 @@
 ADDL_FK_PARAMS=
 TIMESTAMP_SQL_TYPE_NULL=timestamp null
 ALTER_PUBTIME_ALLOW_NULL=
-ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file
+ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
+ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment alter approved add NOT NULL
+ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment alter pending add NOT NULL
+ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website alter commentmod add NOT NULL
+ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website alter defaultallowcomments add NOT NULL
+ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website alter defaultcommentdays add NOT NULL
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/db_mysql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_mysql.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_mysql.properties (original)
+++ incubator/roller/trunk/metadata/database/db_mysql.properties Mon Nov 28 19:12:56 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)
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=datetime NULL
ALTER_PUBTIME_ALLOW_NULL=alter table weblogentry modify pubtime DATETIME NULL
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website modify defaultpageid varchar(48) DEFAULT ''

\ 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_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=datetime NULL
ALTER_PUBTIME_ALLOW_NULL=alter table weblogentry modify pubtime DATETIME NULL
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website modify defaultpageid varchar(48) DEFAULT ''
ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment modify approved bit NOT NULL
ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment modify pending bit NOT NULL
ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website modify commentmod bit NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website modify defaultallowcomments bit NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website modify defaultcommentdays bit NOT NULL
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/db_oracle.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_oracle.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_oracle.properties (original)
+++ incubator/roller/trunk/metadata/database/db_oracle.properties Mon Nov 28 19:12:56 2005
@@ -1 +1 @@
-TEXT_SQL_TYPE=clob
BOOLEAN_SQL_TYPE_FALSE=number(1) default 0
BOOLEAN_SQL_TYPE_TRUE=number(1) default 1
BOOLEAN_SQL_TYPE=number(1)
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website modify defaultpageid varchar(48) DEFAULT ''
\ No newline at end of file
+TEXT_SQL_TYPE=clob
BOOLEAN_SQL_TYPE_FALSE=number(1) default 0
BOOLEAN_SQL_TYPE_TRUE=number(1) default 1
BOOLEAN_SQL_TYPE=number(1)
BOOLEAN_FALSE=0
BOOLEAN_TRUE=1
INDEXSIZE=
INDEXSIZE_LARGE=
ALTER_TABLE_NOT_NULL= not null
ADDL_FK_PARAMS=
TIMESTAMP_SQL_TYPE_NULL=timestamp null
ALTER_PUBTIME_ALLOW_NULL=
ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website modify defaultpageid varchar(48) DEFAULT ''
ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment modify approved number(1) NOT NULL
ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment modify pending number(1) NOT NULL
ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website modify commentmod number(1) NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website modify defaultallowcomments number(1) NOT NULL
ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website modify defaultcommentdays  number(1) NOT NULL
\ No newline at end of file

Modified: incubator/roller/trunk/metadata/database/db_postgresql.properties
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/db_postgresql.properties?rev=349601&r1=349600&r2=349601&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/db_postgresql.properties (original)
+++ incubator/roller/trunk/metadata/database/db_postgresql.properties Mon Nov 28 19:12:56 2005
@@ -10,4 +10,9 @@
 ADDL_FK_PARAMS=
 TIMESTAMP_SQL_TYPE_NULL=timestamp null
 ALTER_PUBTIME_ALLOW_NULL=alter table weblogentry alter pubtime drop not null
-ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
\ No newline at end of file
+ALTER_DEFAULTPAGEID_ALLOW_NULL=alter table website alter column defaultpageid drop not null
+ALTER_TABLE_ROLLER_COMMENT_APPROVED_NOT_NULL=alter table roller_comment alter approved add NOT NULL
+ALTER_TABLE_ROLLER_COMMENT_PENDING_NOT_NULL=alter table roller_comment alter pending add NOT NULL
+ALTER_TABLE_WEBSITE_COMMENTMOD_NOT_NULL=alter table website alter commentmod add NOT NULL
+ALTER_TABLE_WEBSITE_DEFAULTALLOWCOMMENTS_NOT_NULL=alter table website alter defaultallowcomments add NOT NULL
+ALTER_TABLE_WEBSITE_DEFAULTCOMMENTDAYS_NOT_NULL=alter table website alter defaultcommentdays add NOT NULL
\ No newline at end of file