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/06/07 04:56:17 UTC
svn commit: r1601056 - in /roller/trunk/app/src/main:
java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
resources/sql/310-to-400-migration.vm resources/sql/500-to-510-migration.vm
resources/sql/macros.vm
Author: gmazza
Date: Sat Jun 7 02:56:17 2014
New Revision: 1601056
URL: http://svn.apache.org/r1601056
Log:
Fixed bugs in 5.0.x->5.1 migration script.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/resources/sql/310-to-400-migration.vm
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/macros.vm
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1601056&r1=1601055&r2=1601056&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Sat Jun 7 02:56:17 2014
@@ -185,7 +185,7 @@ public class JPAWeblogManagerImpl implem
// remove folders (including bookmarks)
Query folderQuery = strategy.getNamedQuery("WeblogBookmarkFolder.getByWebsite");
folderQuery.setParameter(1, website);
- List<WeblogBookmarkFolder> folders = pageQuery.getResultList();
+ List<WeblogBookmarkFolder> folders = folderQuery.getResultList();
for (WeblogBookmarkFolder wbf : folders) {
this.strategy.remove(wbf);
}
Modified: roller/trunk/app/src/main/resources/sql/310-to-400-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/310-to-400-migration.vm?rev=1601056&r1=1601055&r2=1601056&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/310-to-400-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/310-to-400-migration.vm Sat Jun 7 02:56:17 2014
@@ -137,17 +137,17 @@ create index co_combo1_idx on roller_com
-- remove old indexes that are no longer of value
-#dropIndex('we_pubentry_idx' 'weblogentry')
+#dropIndex('weblogentry' 'we_pubentry_idx')
-- fix wacky indexs which ended up with a size constraint
-#dropIndex('rage_sid_idx' 'rag_entry')
+#dropIndex('rag_entry' 'rage_sid_idx')
create index rage_sid_idx on rag_entry(subscription_id);
-#dropIndex('raggs_gid_idx' 'rag_group_subscription')
+#dropIndex('rag_group_subscription' 'raggs_gid_idx')
create index raggs_gid_idx on rag_group_subscription(group_id);
-#dropIndex('raggs_sid_idx' 'rag_group_subscription')
+#dropIndex('rag_group_subscription' 'raggs_sid_idx')
create index raggs_sid_idx on rag_group_subscription(subscription_id);
@@ -165,9 +165,9 @@ create index raggs_sid_idx on rag_group_
#dropColumn('roller_comment' 'pending')
-- remove bastard columns and indexes (optional)
--- #dropIndex('index_we_pubtime_idx' 'weblogentry')
--- #dropIndex('co_pending_idx' 'roller_comment')
--- #dropIndex('co_approved_idx' 'roller_comment')
+-- #dropIndex('weblogentry' 'index_we_pubtime_idx')
+-- #dropIndex('roller_comment' 'co_pending_idx')
+-- #dropIndex('roller_comment' 'co_approved_idx')
-- #dropColumn('website' 'userid')
-- #dropColumn('website' 'weblogdayid')
-- #dropColumn('weblogentry' 'publishentry')
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=1601056&r1=1601055&r2=1601056&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 Sat Jun 7 02:56:17 2014
@@ -34,7 +34,7 @@ delete from weblogcategory where name =
-- Removal of custom ping targets
delete from pingtarget where websiteid is not null;
-#dropIndex("pt_websiteid_fk" "pingtarget")
+#dropIndex("pingtarget" "pt_websiteid_fk")
#dropColumn("pingtarget", "websiteid")
-- Removal of bookmark subfolders and renaming of former root folder to 'default'
@@ -51,8 +51,13 @@ update folder set name = 'default' where
update roller_mediafiledir set name = #concat("name" "id") where name = 'default';
update roller_mediafiledir set name = 'default' where name = 'root' and parentid is null;
#dropColumn("roller_mediafiledir" "path")
-#dropIndex("mf_parentid_fk" "roller_mediafiledir")
+#dropIndex("roller_mediafiledir" "mf_parentid_fk")
#dropColumn("roller_mediafiledir" "parentid")
-- Adding blog-specific web analytics (e.g. Google Analytics) tracking code
#addColumnNull("website" "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
+#dropIndex("referer" "ref_entryid_fk")
+#dropIndex("referer" "ref_websiteid_fk")
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=1601056&r1=1601055&r2=1601056&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/macros.vm (original)
+++ roller/trunk/app/src/main/resources/sql/macros.vm Sat Jun 7 02:56:17 2014
@@ -89,7 +89,7 @@ Macro to account for lack of comparable
#macro(longtext $size) #if($db.DBTYPE == "MYSQL") text #else varchar($size) #end #end
-#macro(dropIndex $indexName $tableName)
+#macro(dropIndex $tableName $indexName)
#if ($db.DBTYPE == "DERBY" || $db.DBTYPE == 'POSTGRESQL')
drop index $indexName;
#elseif ($db.DBTYPE == "MYSQL")