diff --git a/driverlist.csv b/driverlist.csv index c53afa7e5..3ce4a6f93 100755 --- a/driverlist.csv +++ b/driverlist.csv @@ -12,8 +12,8 @@ Informix Dynamic Server;jdbc:informix-sqli://:/:INFORMIXSERVER=< InstantDB (v3.13 and earlier);jdbc:idb:;jdbc.idbDriver InstantDB (v3.14 and later);jdbc:idb:;org.enhydra.instantdb.jdbc.idbDriver Interbase (InterClient Driver);jdbc:interbase:///;interbase.interclient.Driver -H2 embedded (Java SQL database);jdbc:h2:;org.h2.Driver;lib/h2-1.3.160.jar -H2 TCP (Java SQL database);jdbc:h2:tcp:///;org.h2.Driver;lib/h2-1.3.160.jar +H2 embedded (Java SQL database);jdbc:h2:;org.h2.Driver;lib/h2-1.3.175.jar +H2 TCP (Java SQL database);jdbc:h2:tcp:///;org.h2.Driver;lib/h2-1.3.175.jar HyperSQL;jdbc:hsqldb::;org.hsqldb.jdbcDriver # Microsoft SQL Server (jTDS);jdbc:jtds:sqlserver://[:][/];net.sourceforge.jtds.jdbc.Driver;lib/jtds-1.3.1.jar # Microsoft SQL Server (JTurbo Driver);jdbc:JTurbo://:/;com.ashna.jturbo.driver.Driver diff --git a/lib/h2-1.3.175.jar b/lib/h2-1.3.175.jar new file mode 100644 index 000000000..0fca7a584 Binary files /dev/null and b/lib/h2-1.3.175.jar differ diff --git a/src/main/engine/net/sf/jailer/api_example/APIExample.java b/src/main/engine/net/sf/jailer/api_example/APIExample.java index 3c938f1b9..3f95ce878 100644 --- a/src/main/engine/net/sf/jailer/api_example/APIExample.java +++ b/src/main/engine/net/sf/jailer/api_example/APIExample.java @@ -42,7 +42,7 @@ public class APIExample { new BasicDataSource( "org.h2.Driver", "jdbc:h2:demo-scott", "sa", "", POOL_SIZE, - new File("lib/h2-1.3.160.jar")), + new File("lib/h2-1.3.175.jar")), null, APIExample.class.getResource("Demo-Scott"), APIExample.class.getResource("Demo-Scott.csv"), @@ -54,7 +54,7 @@ public class APIExample { new BasicDataSource( "org.h2.Driver", "jdbc:h2:demo-scott-subset", "sa", "", 10, - new File("lib/h2-1.3.160.jar"))); + new File("lib/h2-1.3.175.jar"))); /** * Exports data related with employee "SCOTT" diff --git a/src/main/engine/net/sf/jailer/configuration/LocalDatabaseConfiguration.java b/src/main/engine/net/sf/jailer/configuration/LocalDatabaseConfiguration.java index 611df733f..ec15e4380 100644 --- a/src/main/engine/net/sf/jailer/configuration/LocalDatabaseConfiguration.java +++ b/src/main/engine/net/sf/jailer/configuration/LocalDatabaseConfiguration.java @@ -32,7 +32,7 @@ public class LocalDatabaseConfiguration { private String password = ""; private String driver = "org.h2.Driver"; - private String lib = "lib/h2-1.3.160.jar"; + private String lib = "lib/h2-1.3.175.jar"; /** * @return the localPKType diff --git a/src/main/engine/net/sf/jailer/configuration/jailer.xml b/src/main/engine/net/sf/jailer/configuration/jailer.xml index 7e398a043..ae1b02c8b 100644 --- a/src/main/engine/net/sf/jailer/configuration/jailer.xml +++ b/src/main/engine/net/sf/jailer/configuration/jailer.xml @@ -4,7 +4,7 @@ local - lib/h2-1.3.160.jar + lib/h2-1.3.175.jar org.h2.Driver jdbc:h2:%s;LOG=0;UNDO_LOG=0 VARCHAR @@ -1127,6 +1127,7 @@ union all x'%s' false false + select TABLE_NAME, ROW_COUNT_ESTIMATE from INFORMATION_SCHEMA.TABLES where TABLE_SCHEMA = '%s' SELECT TABLE_NAME, COLUMN_NAME from INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA='${SCHEMA}' AND IS_COMPUTED " diff --git a/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java b/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java index 4a8f385fb..505c591c3 100644 --- a/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java +++ b/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java @@ -526,7 +526,7 @@ public class DbConnectionDialog extends javax.swing.JDialog { ConnectionInfo ci = new ConnectionInfo(executionContext); ci.alias = "Demo Scott"; ci.driverClass = "org.h2.Driver"; - ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar"; + ci.jar1 = "lib" + File.separator + "h2-1.3.175.jar"; ci.url = "jdbc:h2:" + Environment.newFile("demo-scott").getPath(); ci.user = "sa"; ci.password = ""; @@ -538,7 +538,7 @@ public class DbConnectionDialog extends javax.swing.JDialog { ConnectionInfo ci = new ConnectionInfo(executionContext); ci.alias = "Demo Sakila"; ci.driverClass = "org.h2.Driver"; - ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar"; + ci.jar1 = "lib" + File.separator + "h2-1.3.175.jar"; ci.url = "jdbc:h2:" + Environment.newFile("demo-sakila").getPath(); ci.user = "sa"; ci.password = "";