Author: snoopdave
Date: Tue Sep 11 06:51:39 2007
New Revision: 574598
URL: http://svn.apache.org/viewvc?rev=574598&view=rev
Log:
Fixes for http://opensource.atlassian.com/projects/roller/browse/ROL-1559
Fixing createdb.sql so that it works with Oracle
Changes suggested by Boris Miliki?
Modified:
roller/trunk/apps/weblogger/src/sql/createdb.vm
roller/trunk/metadata/database/macros.vm
Modified: roller/trunk/apps/weblogger/src/sql/createdb.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/sql/createdb.vm?rev=574598&r1=574597&r2=574598&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/sql/createdb.vm (original)
+++ roller/trunk/apps/weblogger/src/sql/createdb.vm Tue Sep 11 06:51:39 2007
@@ -81,7 +81,7 @@
templatelang varchar(20) not null,
decorator varchar(255) default null,
outputtype varchar(48) default null,
- action varchar(16) not null default 'custom'
+ #columnNotNullWithDefault('action' 'varchar(16)' 'custom')
);
create index wp_name_idx on webpage( name$!db.INDEXSIZE );
create index wp_link_idx on webpage( link$!db.INDEXSIZE );
@@ -123,7 +123,6 @@
customstylesheet varchar(128),
about varchar(255),
icon varchar(255)
-
);
create index ws_userid_idx on website(userid);
create index ws_isenabled_idx on website(isenabled);
@@ -405,7 +404,9 @@
client varchar(255)
);
alter table roller_tasklock add constraint rtl_name_uq unique (
name$!db.INDEXSIZE );
+#if($db.DBTYPE != "ORACLE")
create index rtl_taskname_idx on roller_tasklock( name );
+#end
create table roller_hitcounts (
id varchar(48) not null primary key,
Modified: roller/trunk/metadata/database/macros.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/metadata/database/macros.vm?rev=574598&r1=574597&r2=574598&view=diff
==============================================================================
Binary files /tmp/tmp5NCH4A and /tmp/tmpUARHCW differ
