schema updater for polytomouskeynode parent-child bidirectional (see r11787) ->update...

diff --git a/.gitattributes b/.gitattributes
index 076cf716f0be0568c0d20da6ce1d91bec31a4ea3..92e1f49d51aa190f20878bbf3245398f278a3f30 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -995,7 +995,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SchemaU
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SequenceTableCreator.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/TermUpdater_25_30.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/LanguageLabelUpdater.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_31.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_301_31.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_301.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_30_31.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_311_312.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_312_313.java -text

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java
index f398e4aafe9c24e0359fb7056e4aef3bd26df3c0..de388075e59083081683aaedd40ae26c382c4e9f 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java
@@ -48,7 +48,7 @@ public class CdmMetaData extends CdmBase{
         * The last number represents the date of change.\r
         */\r
 //     private static final String dbSchemaVersion = "3.0.0.1.201101050000";\r
-       private static final String dbSchemaVersion = "3.0.0.0.201011090000";   \r
+       private static final String dbSchemaVersion = "3.0.1.0.201104190000";   \r
 \r
        /**\r
         * @return a list of default metadata objects \r
@@ -79,7 +79,7 @@ public class CdmMetaData extends CdmBase{
         * \r
         * The last number represents the date of change.\r
         */\r
-       private static final String termsVersion = "3.0.1.2.201102090000";\r
+       private static final String termsVersion = "3.0.1.3.201103210000";\r
        \r
        \r
        public enum MetaDataPropertyName{\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
index 79060a55673391e5a44ec58239abdf898c606456..f60436a8c9c9de54c1b7b2b4c8367b85c99699c8 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
@@ -15,8 +15,8 @@ import eu.etaxonomy.cdm.common.DefaultProgressMonitor;
 import eu.etaxonomy.cdm.common.IProgressMonitor;\r
 import eu.etaxonomy.cdm.database.CdmDataSource;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.database.update.v25_30.SchemaUpdater_25_30;\r
-import eu.etaxonomy.cdm.database.update.v30_31.TermUpdater_311_312;\r
+import eu.etaxonomy.cdm.database.update.v30_31.SchemaUpdater_30_301;\r
+import eu.etaxonomy.cdm.database.update.v30_31.TermUpdater_312_313;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -70,7 +70,7 @@ public class CdmUpdater {
        }\r
        \r
        private ITermUpdater getCurrentTermUpdater() {\r
-               return TermUpdater_311_312.NewInstance();\r
+               return TermUpdater_312_313.NewInstance();\r
        }\r
 \r
        /**\r
@@ -78,7 +78,7 @@ public class CdmUpdater {
         * @return\r
         */\r
        private ISchemaUpdater getCurrentSchemaUpdater() {\r
-               return SchemaUpdater_25_30.NewInstance();\r
+               return SchemaUpdater_30_301.NewInstance();\r
        }\r
 \r
        /**\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SchemaUpdater_25_30.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SchemaUpdater_25_30.java
index 427de508bf8ed7fed7867b00a9ff543c15c1ebb8..78ffad1bbf94b3fb9ee8ebbf9b91e46118a2e15b 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SchemaUpdater_25_30.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v25_30/SchemaUpdater_25_30.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.database.update.TableCreator;
 import eu.etaxonomy.cdm.database.update.TableDroper;
 import eu.etaxonomy.cdm.database.update.TableNameChanger;
 import eu.etaxonomy.cdm.database.update.v24_25.SchemaUpdater_24_25;
-import eu.etaxonomy.cdm.database.update.v30_31.SchemaUpdater_30_31;
+import eu.etaxonomy.cdm.database.update.v30_31.SchemaUpdater_301_31;
 
 
 /**
@@ -315,7 +315,7 @@ public class SchemaUpdater_25_30 extends SchemaUpdaterBase {
         */
        @Override
        public ISchemaUpdater getNextUpdater() {
-               return SchemaUpdater_30_31.NewInstance();
+               return SchemaUpdater_301_31.NewInstance();
        }
 
        /* (non-Javadoc)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_301_31.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_301_31.java
new file mode 100644 (file)
index 0000000..9ca32b0
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_301_31.java
@@ -0,0 +1,78 @@
+// $Id$
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.cdm.database.update.v30_31;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
+import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
+import eu.etaxonomy.cdm.database.update.SchemaUpdaterBase;
+
+
+/**
+ * @author a.mueller
+ * @created Nov 08, 2010
+ */
+public class SchemaUpdater_301_31 extends SchemaUpdaterBase {
+
+
+       @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(SchemaUpdater_301_31.class);
+       private static final String startSchemaVersion = "3.0.1.0.201104190000";
+       private static final String endSchemaVersion = "0";
+       
+// ********************** FACTORY METHOD *******************************************
+       
+       public static SchemaUpdater_301_31 NewInstance(){
+               return new SchemaUpdater_301_31();
+       }
+       
+       /**
+        * @param startSchemaVersion
+        * @param endSchemaVersion
+        */
+       protected SchemaUpdater_301_31() {
+               super(startSchemaVersion, endSchemaVersion);
+       }
+       
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.database.update.SchemaUpdaterBase#getUpdaterList()
+        */
+       @Override
+       protected List<ISchemaUpdaterStep> getUpdaterList() {
+               
+               List<ISchemaUpdaterStep> stepList = new ArrayList<ISchemaUpdaterStep>();
+               String stepName;
+               
+               
+               return stepList;
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.database.update.SchemaUpdaterBase#getNextUpdater()
+        */
+       @Override
+       public ISchemaUpdater getNextUpdater() {
+               return null;
+       }
+
+       /* (non-Javadoc)
+        * @see eu.etaxonomy.cdm.database.update.SchemaUpdaterBase#getPreviousUpdater()
+        */
+       @Override
+       public ISchemaUpdater getPreviousUpdater() {
+               return SchemaUpdater_30_301.NewInstance();
+       }
+
+}

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_31.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_301.java
similarity index 72%
rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_31.java
rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_301.java
index 2bbd610c7341fbcffa2b2af39b082da7f960f903..3730188922d33a2e040d3f5aa4a04c50581ad0f9 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_31.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/SchemaUpdater_30_301.java
@@ -15,36 +15,39 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 
+import eu.etaxonomy.cdm.database.update.ColumnAdder;
 import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
 import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
 import eu.etaxonomy.cdm.database.update.SchemaUpdaterBase;
+import eu.etaxonomy.cdm.database.update.TableDroper;
 import eu.etaxonomy.cdm.database.update.UniqueIndexDropper;
 import eu.etaxonomy.cdm.database.update.v25_30.SchemaUpdater_25_30;
 
 
 /**
+ * This updater adds the parent_id column to PolytomousKeyNode_AUD
  * @author a.mueller
- * @created Nov 08, 2010
+ * @created 19.04.2011
  */
-public class SchemaUpdater_30_31 extends SchemaUpdaterBase {
+public class SchemaUpdater_30_301 extends SchemaUpdaterBase {
 
 
        @SuppressWarnings("unused")
-       private static final Logger logger = Logger.getLogger(SchemaUpdater_30_31.class);
+       private static final Logger logger = Logger.getLogger(SchemaUpdater_30_301.class);
        private static final String startSchemaVersion = "3.0.0.0.201011090000";
-       private static final String endSchemaVersion = "3.0.0.1.201101050000";
+       private static final String endSchemaVersion = "3.0.1.0.201104190000";
        
 // ********************** FACTORY METHOD *******************************************
        
-       public static SchemaUpdater_30_31 NewInstance(){
-               return new SchemaUpdater_30_31();
+       public static SchemaUpdater_30_301 NewInstance(){
+               return new SchemaUpdater_30_301();
        }
        
        /**
         * @param startSchemaVersion
         * @param endSchemaVersion
         */
-       protected SchemaUpdater_30_31() {
+       protected SchemaUpdater_30_301() {
                super(startSchemaVersion, endSchemaVersion);
        }
        
@@ -71,6 +74,13 @@ public class SchemaUpdater_30_31 extends SchemaUpdaterBase {
                step = UniqueIndexDropper.NewInstance("StatisticalMeasurementValue_definedtermbase", "modifiers_id", ! INCLUDE_AUDIT);
                stepList.add(step);
                
+               //Makes PolytomousKeyNode parent-child bidirectional
+               step = ColumnAdder.NewIntegerInstance("Add parent_id to PolytomousKeyNode_AUD", "PolytomousKeyNode_AUD", "parent_id", ! INCLUDE_AUDIT, false, "PolytomousKeyNode");
+               stepList.add(step);
+               step = TableDroper.NewInstance("Drop PolytomousKeyNode_PolytomousKeyNode_AUD table", "PolytomousKeyNode_PolytomousKeyNode_AUD", ! INCLUDE_AUDIT);
+               stepList.add(step);
+               
+               
                return stepList;
        }
 
@@ -79,7 +89,7 @@ public class SchemaUpdater_30_31 extends SchemaUpdaterBase {
         */
        @Override
        public ISchemaUpdater getNextUpdater() {
-               return null;
+               return SchemaUpdater_301_31.NewInstance();
        }
 
        /* (non-Javadoc)