Added a sym_node_channel_ctl table.

JumpMind · Oct 2, 2007 · afa3baa · afa3baa
1 parent 400822b
commit afa3baa
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -350,7 +350,7 @@ protected void addPrefixAndCreateTableIfNecessary(Database targetTables,
 
             boolean createTables = false;
             for (Table table : tables) {
-                table.setName(tablePrefix + table.getName().toUpperCase());
+                table.setName(tablePrefix.toUpperCase() + table.getName().toUpperCase());
                 fixForeignKeys(table, tablePrefix, false);
 
                 if (getMetaDataFor(getDefaultSchema(), table.getName()

diff --git a/symmetric/src/main/resources/ddl-config.xml b/symmetric/src/main/resources/ddl-config.xml
@@ -104,6 +104,19 @@
             <reference local="node_group_id" foreign="node_group_id" />
         </foreign-key>
     </table>
+
+    <table name="node_channel_ctl">
+        <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true" />
+        <column name="channel_id" type="VARCHAR" size="50" primaryKey="true" />
+        <column name="outgoing_enabled" type="BOOLEANINT" size="1" default="0" />
+        <column name="incoming_enabled" type="BOOLEANINT" size="1" default="0" />
+        <foreign-key name="fk_ncc_node_id" foreignTable="node">
+            <reference local="node_id" foreign="node_id" />
+        </foreign-key>
+        <foreign-key name="fk_ncc_channel_id" foreignTable="channel">
+            <reference local="channel_id" foreign="channel_id" />
+        </foreign-key>        
+    </table>    
 
     <table name="node_security">
         <column name="node_id" type="VARCHAR" size="50" required="true" primaryKey="true" />

diff --git a/symmetric/src/test/resources/test-data-drop-all.sql b/symmetric/src/test/resources/test-data-drop-all.sql
@@ -1,3 +1,4 @@
+drop table sym_node_channel_ctl;
 drop table sym_data_event;
 drop table sym_data;
 drop table sym_trigger_hist;