Changeset 7519

Timestamp:

Nov 5, 2018, 3:01:50 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2130: Upgrade 3-rd party libraries

Updates to make sure that the current catalog and schema is used instead of null. The nullCatalogMeansCurrent=true should no longer be needed in the MySQL connection string.

Location:

trunk

Files:

• config/dist/base.config (modified) (1 diff)
• src/core/net/sf/basedb/core/HibernateUtil.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/Migration.java (modified) (7 diffs)
• src/core/net/sf/basedb/core/dbengine/TableInfo.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/hibernate/DbIndexWork.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/SchemaGenerator.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/TableExistsWork.java (modified) (1 diff)
• src/core/net/sf/basedb/core/hibernate/TableInfoWork.java (modified) (1 diff)

trunk/config/dist/base.config

@@ -30 +30 @@
 db.dialect          = org.hibernate.dialect.MySQL5InnoDBDialect
 db.driver           = com.mysql.cj.jdbc.Driver
-db.url              = jdbc:mysql://localhost/base2?characterEncoding=UTF-8&useCursorFetch=true&defaultFetchSize=100&useServerPrepStmts=true&nullCatalogMeansCurrent=true
+db.url              = jdbc:mysql://localhost/base2?characterEncoding=UTF-8&useCursorFetch=true&defaultFetchSize=100&useServerPrepStmts=true
 db.dynamic.catalog  = base2dynamic
 db.queries          = /mysql-queries.xml

trunk/src/core/net/sf/basedb/core/HibernateUtil.java

@@ -804 +804 @@
               boolean isEmpty = true;
               DatabaseMetaData metaData = connection.getMetaData();
+              String catalog = connection.getCatalog();
+              String schema = connection.getSchema();
               Iterator<PersistentClass> classes = metadata.getEntityBindings().iterator();
               while (classes.hasNext() && isEmpty)
@@ -809 +811 @@
                 PersistentClass pClass = classes.next();
                 Table t = pClass.getTable();
-                ResultSet tables = metaData.getTables(t.getCatalog(), t.getSchema(), t.getName(), new String[] { "TABLE" } );
+                ResultSet tables = metaData.getTables(catalog, schema, t.getName(), new String[] { "TABLE" } );
                 if (tables.next())
                 {
@@ -2369 +2371 @@
             DatabaseMetaData metaData = null;
             List<Table> tables = new LinkedList<Table>();
+            String dynamicCatalog = Application.getDynamicCatalog();
+            String dynamicSchema = Application.getDynamicSchema();
             
             metaData = connection.getMetaData();
-            ResultSet result = metaData.getTables(Application.getDynamicCatalog(), 
-                Application.getDynamicSchema(), null, null);
+            ResultSet result = metaData.getTables(dynamicCatalog, dynamicSchema, null, null);
             
             while (result.next())
@@ -2409 +2412 @@
               try
               {
-                tiDb = new TableInfo(table, metaData);
+                tiDb = new TableInfo(table, metaData, dynamicCatalog, dynamicSchema);
               }
               catch (SQLException ex)

trunk/src/core/net/sf/basedb/core/Migration.java

@@ -310 +310 @@
     ResultWriterFactory rwFactory = new PostgresResultWriterFactory();
 
-    String staticCatalog = null;
-    String staticSchema = null;
+    String staticCatalog = connection.getCatalog();
+    String staticSchema = connection.getSchema();
     String dynamicCatalog = Application.getDynamicCatalog();
     String dynamicSchema = Application.getDynamicSchema();
-    
-    if (engine instanceof PostgresDbEngine)
-    {
-      staticSchema = "public";
-    }
 
     // Load information about all tables in the static and dynamic databases
@@ -339 +334 @@
     for (Table table : staticTables)
     {
-      TableInfo info = new TableInfo(table, metaData);
+      TableInfo info = new TableInfo(table, metaData, staticCatalog, staticSchema);
       long approxRows = info.getRowCount(engine, connection, true);
       approxTotalRows += approxRows;
@@ -352 +347 @@
     for (Table table : dynamicTables)
     {
-      TableInfo info = new TableInfo(table, metaData);
+      TableInfo info = new TableInfo(table, metaData, dynamicCatalog, dynamicSchema);
       long approxRows = info.getRowCount(engine, connection, true);
       approxTotalRows += approxRows;
@@ -530 +525 @@
     final int TICK_INTERVAL = 1000;
     long nextTick = System.currentTimeMillis() + TICK_INTERVAL;
-    List<Table> staticTables = TableInfo.listTables(metaData, connection.getCatalog(), "public");
+    
+    String staticCatalog = connection.getCatalog();
+    String staticSchema = connection.getSchema();
+    List<Table> staticTables = TableInfo.listTables(metaData, staticCatalog, staticSchema);
     progress.display(0, staticTables.size() + " tables in static database");
     
@@ -544 +542 @@
         nextTick = System.currentTimeMillis()+TICK_INTERVAL;
       }
-      TableInfo info = new TableInfo(table, metaData);
+      TableInfo info = new TableInfo(table, metaData, staticCatalog, staticSchema);
       // Check that data files exists
       File importFile = getDataFile(info);
@@ -692 +690 @@
 
     // Import data for each table in the dynamic database
-    String dynamicCatalog = HibernateUtil.quote(Application.getDynamicCatalog());
-    String dynamicSchema = HibernateUtil.quote(Application.getDynamicSchema());
+    String dynamicCatalog = Application.getDynamicCatalog();
+    String dynamicSchema = Application.getDynamicSchema();
     for (File dynamicDataFile : dynamicDataFiles)
     {
@@ -735 +733 @@
       
       Table dynamicTable = new Table(tableName);
-      dynamicTable.setCatalog(Application.getDynamicCatalog());
-      dynamicTable.setSchema(Application.getDynamicSchema());
-      TableInfo table = new TableInfo(dynamicTable, metaData);
+      TableInfo table = new TableInfo(dynamicTable, metaData, dynamicCatalog, dynamicSchema);
 
       File columnsFile = new File(directory, dynamicDataFile.getName().replaceFirst("\\.data(\\.gz)?", ".columns"));

trunk/src/core/net/sf/basedb/core/dbengine/TableInfo.java

@@ -79 +79 @@
   {
     List<Table> tables = new LinkedList<Table>();
+    if (catalog == null) catalog = metaData.getConnection().getCatalog();
+    if (schema == null) schema = metaData.getConnection().getSchema();
     ResultSet result = metaData.getTables(catalog, schema, null, new String[] { "TABLE" });
     while (result.next())
@@ -122 +124 @@
     @param metaData The JDBC metadata connected to the current database
     @throws SQLException If there is an error
-  */
+    @deprecated In 3.14, use {@link #TableInfo(Table, DatabaseMetaData, String, String)} instead
+  */
+  @Deprecated
   public TableInfo(Table table, DatabaseMetaData metaData)
       throws SQLException
@@ -146 +150 @@
     String catalog = table.getCatalog();
     if (catalog == null) catalog = defaultCatalog;
+    if (catalog == null) catalog = metaData.getConnection().getCatalog();
     String schema = table.getSchema();
     if (schema == null) schema = defaultSchema;
+    if (schema == null) schema = metaData.getConnection().getSchema();
     
     ResultSet tables = metaData.getTables(catalog, schema, table.getName(), null);

trunk/src/core/net/sf/basedb/core/hibernate/DbIndexWork.java

@@ -102 +102 @@
     Iterator<Table> tables = metadata.collectTableMappings().iterator();
     
-    String defaultCatalog = null;
-    String defaultSchema = null;
+    String defaultCatalog = connection.getCatalog();
+    String defaultSchema = connection.getSchema();
     Namespace defaultNs = metadata.getDatabase().getDefaultNamespace();
     if (defaultNs != null)

trunk/src/core/net/sf/basedb/core/hibernate/SchemaGenerator.java

@@ -164 +164 @@
         {
           Table table = tables.next();
-          TableInfo jdbcTableInfo = new TableInfo(table, jdbcMetaData);
+          TableInfo jdbcTableInfo = new TableInfo(table, jdbcMetaData, connection.getCatalog(), connection.getSchema());
           
           log.debug("Table: " + table + (jdbcTableInfo.existsInDb() ? " EXISTS" : "NOT FOUND"));

trunk/src/core/net/sf/basedb/core/hibernate/TableExistsWork.java

@@ -72 +72 @@
     {
       DatabaseMetaData metaData = connection.getMetaData();
-      tables = metaData.getTables(catalog, schema, table, null);
+      String cat = catalog == null ? connection.getCatalog() : catalog;
+      String sch = schema == null ? connection.getSchema() : schema;
+      tables = metaData.getTables(cat, sch, table, null);
       hasTable = tables.next();
     }

trunk/src/core/net/sf/basedb/core/hibernate/TableInfoWork.java

@@ -63 +63 @@
   {
     DatabaseMetaData metaData = connection.getMetaData();
-    return new TableInfo(table, metaData);
+    return new TableInfo(table, metaData, connection.getCatalog(), connection.getSchema());
   }
   // --------------------------