Author: snoopdave
Date: Thu Mar 9 12:09:21 2006
New Revision: 384595
URL: http://svn.apache.org/viewcvs?rev=384595&view=rev
Log:
Don't quote default values in macro, fixes ROL-1076
Modified:
incubator/roller/trunk/metadata/database/200-to-210-migration.vm
incubator/roller/trunk/metadata/database/control.vm
Modified: incubator/roller/trunk/metadata/database/200-to-210-migration.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/200-to-210-migration.vm?rev=384595&r1=384594&r2=384595&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/200-to-210-migration.vm (original)
+++ incubator/roller/trunk/metadata/database/200-to-210-migration.vm Thu Mar 9
12:09:21 2006
@@ -12,7 +12,7 @@
-- Add to website table: commentmod, blacklist, defaultallowcomments and
defaultcommentdays
#addColumnNotNull("website" "commentmod" $BOOLEAN_SQL_TYPE $BOOLEAN_FALSE)
#addColumnNotNull("website" "defaultallowcomments" $BOOLEAN_SQL_TYPE
$BOOLEAN_TRUE)
-#addColumnNotNull("website" "defaultcommentdays" "integer" "7")
+#addColumnNotNull("website" "defaultcommentdays" "integer" 7)
alter table website add column blacklist $TEXT_SQL_TYPE;
update website set commentmod=$BOOLEAN_FALSE,
defaultallowcomments=$BOOLEAN_TRUE, defaultcommentdays=7, blacklist='',
datecreated=datecreated;
@@ -21,4 +21,4 @@
-- Add weblog displaydays column
-#addColumnNotNull("website" "displaycnt" "integer" "15")
\ No newline at end of file
+#addColumnNotNull("website" "displaycnt" "integer" 15)
\ No newline at end of file
Modified: incubator/roller/trunk/metadata/database/control.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/metadata/database/control.vm?rev=384595&r1=384594&r2=384595&view=diff
==============================================================================
--- incubator/roller/trunk/metadata/database/control.vm (original)
+++ incubator/roller/trunk/metadata/database/control.vm Thu Mar 9 12:09:21 2006
@@ -5,22 +5,21 @@
Follow the installation guide for instructions on setting up your database.
#** Define templates to be generated **#
-#set( $templates = ["createdb", "200-to-210-migration"])
-#set( $templates = ["createdb", "210-to-220-migration"])
+#set( $templates = ["createdb", "200-to-210-migration",
"210-to-220-migration"])
#** Define special macro needed for alter table with not-null restriction **#
#macro(addColumnNotNull $table $column $type $default)
#if($DBTYPE == "MYSQL" || $DBTYPE=="HSQDB")
-alter table $table add column $column $type default '$default' not null;
+alter table $table add column $column $type default $default not null;
#elseif ($DBTYPE == "POSTGRESQL")
alter table $table add column $column $type;
alter table $table alter $column set default $default;
-update $table set $column='$default';
+update $table set $column=$default;
alter table $table alter $column set not null;
#elseif ($DBTYPE == "HSQLDB")
-alter table $table add column $column $type default '$default' not null;
+alter table $table add column $column $type default $default not null;
#elseif ($DBTYPE == "DERBY" || $DBTYPE == "DB2")
-alter table $table add column $column $type with default '$default' not null;
+alter table $table add column $column $type with default $default not null;
#elseif ($DBTYPE == "ORACLE")
alter table $table add column $column $type default $default not null;
#end
