svn commit: r479648 - in /incubator/roller/trunk/metadata/database: 310-to-320-migration.vm control.vm createdb.vm

[sn...@apache.org]

Author: snoopdave
Date: Mon Nov 27 07:10:02 2006
New Revision: 479648

URL: http://svn.apache.org/viewvc?view=rev&rev=479648
Log:
For paths: use INDEXSIZE for index sizes, use #longtext() for type

Modified:
    incubator/roller/trunk/metadata/database/310-to-320-migration.vm
    incubator/roller/trunk/metadata/database/control.vm
    incubator/roller/trunk/metadata/database/createdb.vm

Modified: incubator/roller/trunk/metadata/database/310-to-320-migration.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/310-to-320-migration.vm?view=diff&rev=479648&r1=479647&r2=479648
==============================================================================
--- incubator/roller/trunk/metadata/database/310-to-320-migration.vm (original)
+++ incubator/roller/trunk/metadata/database/310-to-320-migration.vm Mon Nov 27 07:10:02 2006
@@ -9,12 +9,20 @@
 create index ws_parentid_idx on weblogcategory( parentid );
 
 -- add new path column to weblogcategory table
-#addColumnNull("weblogcategory" "path" $TEXT_SQL_TYPE)
-create index ws_path_idx on weblogcategory( path(255) );
+#if($DBTYPE == "MYSQL")
+    #addColumnNull("weblogcategory" "path" $TEXT_SQL_TYPE)
+#else
+    #addColumnNull("weblogcategory" "path" "varchar(1000)")
+#end
+create index ws_path_idx on weblogcategory( path!INDEXSIZE );
 
 -- need to add this index for existing folder.parentid
 create index fo_parentid_idx on folder( parentid );
 
 -- add new path column to folder table
-#addColumnNull("folder" "path" $TEXT_SQL_TYPE)
-create index fo_path_idx on folder( path(255) );
+#if($DBTYPE == "MYSQL")
+    #addColumnNull("folder" "path" $TEXT_SQL_TYPE)
+#else
+    #addColumnNull("folder" "path" "varchar(1000)")
+#end
+create index fo_path_idx on folder( path!INDEXSIZE );

Modified: incubator/roller/trunk/metadata/database/control.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/control.vm?view=diff&rev=479648&r1=479647&r2=479648
==============================================================================
--- incubator/roller/trunk/metadata/database/control.vm (original)
+++ incubator/roller/trunk/metadata/database/control.vm Mon Nov 27 07:10:02 2006
@@ -60,6 +60,10 @@
 #end
 #end
 
+#**
+Macro to account for lack of comparable long varchar in MySQL
+**#
+#macro(longtext $size) #if($DBTYPE == "MYSQL") text #else varchar($size) #end #end
 
 #** Loop through templates, generate database scripts **#
 #foreach ($template in $templates) 
@@ -67,7 +71,3 @@
     #set($out = "${template}.sql")
     $generator.parse($in, $out) 
 #end
-
-
-
-

Modified: incubator/roller/trunk/metadata/database/createdb.vm
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/database/createdb.vm?view=diff&rev=479648&r1=479647&r2=479648
==============================================================================
--- incubator/roller/trunk/metadata/database/createdb.vm (original)
+++ incubator/roller/trunk/metadata/database/createdb.vm Mon Nov 27 07:10:02 2006
@@ -130,11 +130,11 @@
     description      varchar(255),
     websiteid        varchar(48) not null,
     parentid         varchar(48),
-    path             $TEXT_SQL_TYPE
+    path             #longtext(1000) 
 );
 create index fo_websiteid_idx on folder( websiteid );
 create index fo_parentid_idx on folder( parentid );
-create index fo_path_idx on folder( path(255) );
+-- Can't index a CLOB create index fo_path_idx on folder( path$!INDEXSIZE );
 
 create table folderassoc (
     id               varchar(48) not null primary key,
@@ -166,11 +166,11 @@
     websiteid        varchar(48)  not null,
     image            varchar(255),
     parentid         varchar(48),
-    path             $TEXT_SQL_TYPE
+    path             #longtext(1000)
 );
 create index wc_websiteid_idx on weblogcategory( websiteid );
 create index ws_parentid_idx on weblogcategory( parentid );
-create index ws_path_idx on weblogcategory( path(255) );
+-- Can't index a CLOB create index ws_path_idx on weblogcategory( path$!INDEXSIZE );
 
 create table weblogcategoryassoc (
     id               varchar(48) not null primary key,