print out the database type being used at startup.

also fixed some of the integration test sql to work w/ the mo' strict derby database
JumpMind · Dec 21, 2007 · d010f86 · d010f86
1 parent 07e130f
commit d010f86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricEngine.java b/symmetric/src/main/java/org/jumpmind/symmetric/SymmetricEngine.java
@@ -29,6 +29,7 @@
 import org.jumpmind.symmetric.common.Constants;
 import org.jumpmind.symmetric.common.PropertiesConstants;
 import org.jumpmind.symmetric.config.IRuntimeConfig;
+import org.jumpmind.symmetric.db.IDbDialect;
 import org.jumpmind.symmetric.job.PurgeJob;
 import org.jumpmind.symmetric.job.PushJob;
 import org.jumpmind.symmetric.model.Node;
@@ -126,8 +127,9 @@ private void init(ApplicationContext applicationContext) {
                 .getBean(Constants.REGISTRATION_SERVICE);
         purgeService = (IPurgeService) applicationContext
                 .getBean(Constants.PURGE_SERVICE);
+        IDbDialect dbDialect = (IDbDialect)applicationContext.getBean(Constants.DB_DIALECT);
         registerEngine();
-        logger.info("Initialized SymmetricDS externalId=" + runtimeConfig.getExternalId() + " version=" + Version.VERSION);
+        logger.info("Initialized SymmetricDS externalId=" + runtimeConfig.getExternalId() + " version=" + Version.VERSION + " database="+dbDialect.getName());
     }
 
     /**

diff --git a/symmetric/src/test/resources/test-integration-root-setup.sql b/symmetric/src/test/resources/test-integration-root-setup.sql
@@ -5,7 +5,7 @@ insert into sym_node_group values ('test-node-group','a test config');
 insert into sym_node_group_link values ('test-node-group','test-root-group', 'P');
 insert into sym_node_group_link values ('test-root-group','test-node-group', 'W');
 
-insert into sym_node values ('00000', 'test-root-group', '00000', '1', null, null, '1.2.0', null, null, current_timestamp);
+insert into sym_node values ('00000', 'test-root-group', '00000', 1, null, null, '1.2.0', null, null, current_timestamp);
 insert into sym_node_identity values ('00000');
 
 insert into sym_trigger 
@@ -38,8 +38,8 @@ values(100, 'John Smith', '1', '300 Main Street', 'Columbus', 'OH', 43230, {ts '
 
 insert into test_order_header
 (order_id, customer_id, status, deliver_date)
-values(1, 100, null, {d '2007-01-02'});
+values('1', 100, null, {d '2007-01-02'});
 
 insert into test_order_detail
 (order_id, line_number, item_type, item_id, quantity, price)
-values(1, 1, 'STCK', '110000055', 5, 1.29);
+values('1', 1, 'STCK', '110000055', 5, 1.29);