0000779: Add a symmetric parameter that tells the data loader that it…

… is NOT ok to ignore a table if it is missing in the database
JumpMind · Dec 1, 2012 · 55d51ad · 55d51ad
1 parent 3bdf79c
commit 55d51ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataEventType.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/DataEventType.java
@@ -57,11 +57,6 @@ public enum DataEventType {
      */
     CREATE("C"),
 
-    /**
-     * An event that indicates that all SymmetricDS configuration table data should be streamed to the client.
-     */
-    CONFIG("X"),
-
     /**
      * An event the indicates that the data payload is going to be a Java bean shell script that is to be run at the
      * client.
@@ -111,8 +106,6 @@ public static DataEventType getEventType(String s) {
             return SQL;
         } else if (s.equals(CREATE.getCode())) {
             return CREATE;
-        } else if (s.equals(CONFIG.getCode())) {
-            return CONFIG;
         } else if (s.equals(RELOAD.getCode())) {
             return RELOAD;
         } else if (s.equals(BSH.getCode())) {

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/DatabaseWriter.java
@@ -146,7 +146,9 @@ public boolean start(Table table) {
     }
 
     public void write(CsvData data) {
-        if (targetTable != null) {
+        if (targetTable != null || 
+                data.getDataEventType() == DataEventType.CREATE ||
+                data.getDataEventType() == DataEventType.SQL) {
             try {
                 statistics.get(batch).increment(DataWriterStatisticConstants.STATEMENTCOUNT);
                 statistics.get(batch).increment(DataWriterStatisticConstants.LINENUMBER);
@@ -206,8 +208,12 @@ public void write(CsvData data) {
                 }
             }
         } else {
-            throw new SqlException(String.format("Could not find the target table %s",
-                    sourceTable.getFullyQualifiedTableName()));
+            if (sourceTable != null) {
+                throw new SqlException(String.format("Could not find the target table %s",
+                        sourceTable.getFullyQualifiedTableName()));
+            } else {
+                throw new SqlException("The target table was not specified");
+            }
         }
     }