Changeset 1706

Timestamp:

12/31/11 15:38:13 (5 months ago)

Author:

icare4

Message:

Ticket 198

Location:

trunk/src/org/rapla/storage/dbsql

Files:

• DBOperator.java (modified) (4 diffs)
• RaplaSQL.java (modified) (1 diff)

trunk/src/org/rapla/storage/dbsql/DBOperator.java

@@ -299 +299 @@
         try 
         {
-            ResultSet oldResourceTable = connection.getMetaData().getTables(null, null,"RESOURCE" , null);
+            ResultSet oldResourceTable = connection.getMetaData().getTables(null, null,"resource" , null);
             while ( oldResourceTable.next())
             {
@@ -305 +305 @@
             }
             // If there is also a new Table use the new Table
-            ResultSet newResourceTable = connection.getMetaData().getTables(null, null,"RAPLA_RESOURCE" , null);
+            ResultSet newResourceTable = connection.getMetaData().getTables(null, null,"rapla_resource" , null);
             while ( newResourceTable.next())
             {
@@ -318 +318 @@
         if ( oldResourceTableName )
         {
-            getLogger().warn("Using old resource table name RESOURCE. Please rename to RAPLA_RESOURCE");
+            getLogger().warn("Using old resource table name: resource. Please rename to: rapla_resource");
         }
         newResourceSchema = false;
@@ -325 +325 @@
             try 
             {
-                ResultSet lastChangedColumn = connection.getMetaData().getColumns(null, null,"RAPLA_RESOURCE" , "CREATION_TIME");
+                ResultSet lastChangedColumn = connection.getMetaData().getColumns(null, null,"rapla_resource" , "creation_time");
                 while ( true)
                 {

trunk/src/org/rapla/storage/dbsql/RaplaSQL.java

@@ -754 +754 @@
                             stmt.setTimestamp( 8, new java.sql.Timestamp( end.getTime() ));
                         } else {
-                                stmt.setObject(8, null, Types.INTEGER);
+                                stmt.setObject(8, null, Types.TIMESTAMP);
                         }
                         stmt.executeUpdate();