[ 1945266 ] column level updates (version the CsvExtractor)

JumpMind · Nov 6, 2008 · 52d686d · 52d686d
1 parent d3e5f67
commit 52d686d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -104,11 +104,14 @@ private IDataExtractor getDataExtractor(String version) {
         String beanName = Constants.DATA_EXTRACTOR;
         if (version != null) {
             int[] versions = Version.parseVersion(version);
-            // TODO: this should be versions[1] == 0 for 1.2 release
-            if (versions[0] == 1 && versions[1] <= 1) {
-                beanName += "10";
-            } else if (versions[0] == 1 && versions[1] <= 3) {
-                beanName += "13";
+            if (versions[0] == 1) {
+                if (versions[1] <= 2) {
+                    beanName += "10";
+                } else if (versions[1] <= 3) {
+                    beanName += "13";
+                } else if (versions[1] <= 4) {
+                    beanName += "14";
+                }                
             }
         }
         return (IDataExtractor) beanFactory.getBean(beanName);

diff --git a/symmetric/src/main/resources/symmetric-services.xml b/symmetric/src/main/resources/symmetric-services.xml
@@ -225,6 +225,41 @@
         </property>
     </bean>
 
+    <bean id="dataExtractor14" class="org.jumpmind.symmetric.extract.csv.CsvExtractor14">
+        <property name="dbDialect" ref="dbDialect" />
+        <property name="parameterService" ref="parameterService" />
+        <property name="nodeService" ref="nodeService" />
+        <property name="dictionary">
+            <map>
+                <entry key="I">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamInsertDataCommand"></bean>
+                </entry>
+                <entry key="U">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamUpdateDataCommand"></bean>
+                </entry>
+                <entry key="D">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamDeleteDataCommand"></bean>
+                </entry>
+                <entry key="V">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamValidateDataCommand"></bean>
+                </entry>
+                <entry key="R">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamReloadDataCommand">
+                        <property name="dataExtractorService" ref="dataExtractorService" />
+                        <property name="configurationService" ref="configurationService" />
+                        <property name="nodeService" ref="nodeService" />
+                    </bean>
+                </entry>
+                <entry key="S">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamSQLDataCommand"></bean>
+                </entry>
+                <entry key="C">
+                    <bean class="org.jumpmind.symmetric.extract.csv.StreamCreateDataCommand"></bean>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
     <bean id="dataExtractor13" class="org.jumpmind.symmetric.extract.csv.CsvExtractor13">
         <property name="dbDialect" ref="dbDialect" />
         <property name="parameterService" ref="parameterService" />