You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/07/22 05:16:38 UTC
svn commit: r1612451 - in /roller/trunk/app/src/main/resources:
org/apache/roller/weblogger/pojos/Weblog.orm.xml
org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
sql/500-to-510-migration.vm sql/createdb.vm sql/macros.vm
Author: gmazza
Date: Tue Jul 22 03:16:38 2014
New Revision: 1612451
URL: http://svn.apache.org/r1612451
Log:
Rename website table to weblog, folder table to bookmark_folder.
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/resources/sql/macros.vm
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1612451&r1=1612450&r2=1612451&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Tue Jul 22 03:16:38 2014
@@ -5,7 +5,7 @@
<package>org.apache.roller.weblogger.pojos</package>
<entity metadata-complete="true" name="Weblog" class="org.apache.roller.weblogger.pojos.Weblog"
access="PROPERTY">
- <table name="website"/>
+ <table name="weblog"/>
<named-query name="Weblog.getByHandle">
<query>SELECT w FROM Weblog w WHERE w.handle = ?1</query>
</named-query>
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml?rev=1612451&r1=1612450&r2=1612451&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogBookmarkFolder.orm.xml Tue Jul 22 03:16:38 2014
@@ -5,7 +5,7 @@
<package>org.apache.roller.weblogger.pojos</package>
<entity metadata-complete="true" name="WeblogBookmarkFolder" class="org.apache.roller.weblogger.pojos.WeblogBookmarkFolder"
access="PROPERTY">
- <table name="folder"/>
+ <table name="bookmark_folder"/>
<named-query name="WeblogBookmarkFolder.getByWebsite">
<query>SELECT f FROM WeblogBookmarkFolder f WHERE f.weblog = ?1</query>
</named-query>
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1612451&r1=1612450&r2=1612451&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Tue Jul 22 03:16:38 2014
@@ -4,6 +4,9 @@
DON'T RUN THIS, IT'S NOT A DATABASE CREATION SCRIPT!!!
**#
+#renameTable('website' 'weblog')
+#renameTable('folder' 'bookmark_folder')
+
create table custom_template_rendition (
id varchar(48) not null primary key,
templateid varchar(48) not null,
@@ -41,18 +44,18 @@ delete from pingtarget where websiteid i
#dropColumn("pingtarget" "websiteid")
-- NOTE: you might need to drop this index on some Roller databases
--- drop index folder_namefolderid_uq on folder;
+-- drop index folder_namefolderid_uq on bookmark_folder;
-- Removal of bookmark subfolders and renaming of former root folder to 'default'
--- If a folder with name 'default' already exists, rename it by adding its id to it.
-update folder set name = #concat("name" "id") where name = 'default';
-update folder set name = 'default' where name = 'root' and parentid is null;
-#dropColumn("folder" 'parentid')
-#dropColumn("folder" 'path')
-#dropColumn("folder" "description")
+-- If a bookmark folder with name 'default' already exists, rename it by adding its id to it.
+update bookmark_folder set name = #concat("name" "id") where name = 'default';
+update bookmark_folder set name = 'default' where name = 'root' and parentid is null;
+#dropColumn("bookmark_folder" 'parentid')
+#dropColumn("bookmark_folder" 'path')
+#dropColumn("bookmark_folder" "description")
#dropColumn("bookmark" "weight")
--- Removal of bookmark subfolders and renaming of former root folder to 'default'
+-- Removal of media file subfolders and renaming of former root folder to 'default'
-- If a folder with name 'default' already exists, rename it by adding its id to it.
update roller_mediafiledir set name = #concat("name" "id") where name = 'default';
update roller_mediafiledir set name = 'default' where name = 'root' and parentid is null;
@@ -61,7 +64,7 @@ update roller_mediafiledir set name = 'd
#dropColumn("roller_mediafiledir" "parentid")
-- Adding blog-specific web analytics (e.g. Google Analytics) tracking code
-#addColumnNull("website" "analyticscode" $db.TEXT_SQL_TYPE)
+#addColumnNull("weblog" "analyticscode" $db.TEXT_SQL_TYPE)
-- Referer table no longer populated, retaining for older DB's in case legacy data
-- is desired to keep; but removing its FK relationships to other tables
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1612451&r1=1612450&r2=1612451&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Tue Jul 22 03:16:38 2014
@@ -78,7 +78,7 @@ create table usercookie (
create index uc_username_idx on usercookie( username$!db.INDEXSIZE );
create index uc_cookieid_idx on usercookie( cookieid$!db.INDEXSIZE );
-create table website (
+create table weblog (
id varchar(48) not null primary key,
name varchar(255) not null,
handle varchar(255) not null,
@@ -116,8 +116,8 @@ create table website (
icon varchar(255),
analyticscode $db.TEXT_SQL_TYPE
);
-create index ws_isenabled_idx on website(isenabled);
-alter table website add constraint ws_handle_uq unique (handle$!db.INDEXSIZE);
+create index ws_isenabled_idx on weblog(isenabled);
+alter table weblog add constraint ws_handle_uq unique (handle$!db.INDEXSIZE);
create table weblog_custom_template (
id varchar(48) not null primary key,
@@ -143,12 +143,12 @@ create table custom_template_rendition (
#columnNotNullWithDefault('type' 'varchar(16)' 'STANDARD')
);
-create table folder (
+create table bookmark_folder (
id varchar(48) not null primary key,
name varchar(255) not null,
websiteid varchar(48) not null
);
-create index fo_websiteid_idx on folder( websiteid );
+create index fo_weblogid_idx on bookmark_folder( websiteid );
create table bookmark (
id varchar(48) not null primary key,
@@ -170,7 +170,7 @@ create table weblogcategory (
image varchar(255),
position integer default 0 not null
);
-create index wc_websiteid_idx on weblogcategory( websiteid );
+create index wc_weblogid_idx on weblogcategory( websiteid );
create table weblogentry (
id varchar(48) not null primary key,
@@ -196,7 +196,7 @@ create table weblogentry (
content_src varchar(255) default null,
search_description varchar(255) default null
);
-create index we_websiteid_idx on weblogentry( websiteid );
+create index we_weblogid_idx on weblogentry( websiteid );
create index we_categoryid_idx on weblogentry( categoryid );
create index we_pinnedtom_idx on weblogentry(pinnedtomain);
create index we_creator_idx on weblogentry(creator);
@@ -215,7 +215,7 @@ create table roller_weblogentrytag (
);
create index wet_entryid_idx on roller_weblogentrytag( entryid );
-create index wet_websiteid_idx on roller_weblogentrytag( websiteid );
+create index wet_weblogid_idx on roller_weblogentrytag( websiteid );
create index wet_creator_idx on roller_weblogentrytag( creator );
create index wet_name_idx on roller_weblogentrytag( name );
@@ -227,7 +227,7 @@ create table roller_weblogentrytagagg (
lastused $db.TIMESTAMP_SQL_TYPE not null
);
-create index weta_websiteid_idx on roller_weblogentrytagagg( websiteid );
+create index weta_weblogid_idx on roller_weblogentrytagagg( websiteid );
create index weta_name_idx on roller_weblogentrytagagg( name );
create index weta_lastused_idx on roller_weblogentrytagagg( lastused );
@@ -238,7 +238,7 @@ create table newsfeed (
link varchar(255) not null,
websiteid varchar(48) not null
);
-create index nf_websiteid_idx on newsfeed( websiteid );
+create index nf_weblogid_idx on newsfeed( websiteid );
create table roller_comment (
@@ -275,8 +275,8 @@ create table pingtarget (
);
-- auto ping configurations
--- websiteid: fk reference to website for which this auto ping configuration applies
--- pingtargetid: fk reference to the ping target to be pinged when the website changes
+-- websiteid: fk reference to weblog for which this auto ping configuration applies
+-- pingtargetid: fk reference to the ping target to be pinged when the weblog changes
create table autoping (
id varchar(48) not null primary key,
websiteid varchar(48) not null,
@@ -287,7 +287,7 @@ create index ap_pingtid_idx on autoping(
-- entrytime: timestamp of original entry onto the ping queue
-- pingtargetid: weak fk reference to ping target (not constrained)
--- websiteid: weak fk reference to website originating the ping (not constrained)
+-- websiteid: weak fk reference to weblog originating the ping (not constrained)
-- attempts: number of ping attempts that have been made for this entry
create table pingqueueentry (
id varchar(48) not null primary key,
@@ -469,21 +469,21 @@ create table roller_mediafiledir (
-- *****************************************************
-- Now add the foreign key relationships
--- user, role, website, and permissions
+-- user, role, weblog, and permissions
-- page, entry, category, comment
-alter table weblog_custom_template add constraint wp_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table weblog_custom_template add constraint wct_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
-alter table weblogentry add constraint we_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table weblogentry add constraint we_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
alter table weblogentry add constraint wc_categoryid_fk
foreign key ( categoryid ) references weblogcategory( id ) $!db.ADDL_FK_PARAMS ;
-alter table weblogcategory add constraint wc_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table weblogcategory add constraint wc_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
alter table roller_comment add constraint co_entryid_fk
foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
@@ -491,13 +491,13 @@ alter table roller_comment add constrain
alter table entryattribute add constraint att_entryid_fk
foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
--- folder and bookmark
+-- bookmark_folder and bookmark
-alter table folder add constraint fo_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table bookmark_folder add constraint fo_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
alter table bookmark add constraint bm_folderid_fk
- foreign key ( folderid ) references folder( id ) $!db.ADDL_FK_PARAMS ;
+ foreign key ( folderid ) references bookmark_folder( id ) $!db.ADDL_FK_PARAMS ;
-- media file foreign key constraints
@@ -507,18 +507,18 @@ alter table roller_mediafile add constra
alter table roller_mediafiletag add constraint roller_mediafile_id_tag_fk
foreign key (mediafile_id) references roller_mediafile(id) $!db.ADDL_FK_PARAMS ;
-alter table roller_mediafiledir add constraint mf_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table roller_mediafiledir add constraint mf_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
-- newsfeed
-alter table newsfeed add constraint nf_websiteid_fk
- foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
+alter table newsfeed add constraint nf_weblogid_fk
+ foreign key ( websiteid ) references weblog( id ) $!db.ADDL_FK_PARAMS ;
-- autoping
-alter table autoping add constraint ap_websiteid_fk
- foreign key (websiteid) references website(id) $!db.ADDL_FK_PARAMS ;
+alter table autoping add constraint ap_weblogid_fk
+ foreign key (websiteid) references weblog(id) $!db.ADDL_FK_PARAMS ;
alter table autoping add constraint ap_pingtargetid_fk
foreign key (pingtargetid) references pingtarget(id) $!db.ADDL_FK_PARAMS ;
Modified: roller/trunk/app/src/main/resources/sql/macros.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/macros.vm?rev=1612451&r1=1612450&r2=1612451&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/macros.vm (original)
+++ roller/trunk/app/src/main/resources/sql/macros.vm Tue Jul 22 03:16:38 2014
@@ -84,7 +84,7 @@ Define non-null column with default valu
#**
Rename a table.
-For Derby, will not work if there is a view or foreign key that references the table.
+For Derby, will not work if there is a view or foreign key that references the table. (DERBY-6672)
**#
#macro(renameTable $oldTableName $newTableName)
#if ($db.DBTYPE == 'POSTGRESQL' || $db.DBTYPE == 'HSQLDB')