- Reconize the JDBC type -7 (BIT)

  modified:   storage/connect/jdbconn.cpp

- Add the global variable connect_java_wrapper
  This enables to use different wrappers
  modified:   storage/connect/CMakeLists.txt
  renamed:    storage/connect/java/ap/JdbcInterface.class -> storage/connect/JdbcApacheInterface.class
  renamed:    storage/connect/java/ap/JdbcInterface.java -> storage/connect/JdbcApacheInterface.java
  renamed:    storage/connect/java/ds/JdbcInterface.class -> storage/connect/JdbcDSInterface.class
  renamed:    storage/connect/java/ds/JdbcInterface.java -> storage/connect/JdbcDSInterface.java
  modified:   storage/connect/ha_connect.cc
  deleted:    storage/connect/java/std/JdbcInterface.class
  deleted:    storage/connect/java/std/JdbcInterface.java
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h

- Add JDBC tests (disabled)
  modified:   storage/connect/mysql-test/connect/disabled.def
  new file:   storage/connect/mysql-test/connect/r/jdbc.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_new.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_oracle.result
  new file:   storage/connect/mysql-test/connect/r/jdbc_postgresql.result
  new file:   storage/connect/mysql-test/connect/std_data/girls.txt
  new file:   storage/connect/mysql-test/connect/t/jdbc.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_new.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_oracle.test
  new file:   storage/connect/mysql-test/connect/t/jdbc_postgresql.test
  new file:   storage/connect/mysql-test/connect/t/jdbconn.inc
  new file:   storage/connect/mysql-test/connect/t/jdbconn_cleanup.inc

- Typo
  modified:   storage/connect/jsonudf.cpp

Author: Buggynours

storage/connect/CMakeLists.txt

@@ -240,7 +240,7 @@ OPTION(CONNECT_WITH_JDBC "Compile CONNECT storage engine with JDBC support" ON)
 
 IF(CONNECT_WITH_JDBC)
   # TODO: detect Java SDK and the presence of JDBC connectors
-  # TODO: Find how to compile and install the JdbcInterface.java class
+  # TODO: Find how to compile and install the java wrapper class
   # Find required libraries and include directories
 
   FIND_PACKAGE(Java)
@@ -251,6 +251,8 @@ IF(CONNECT_WITH_JDBC)
     # SET(JDBC_LIBRARY ${JAVA_JVM_LIBRARY})
     SET(CONNECT_SOURCES ${CONNECT_SOURCES} 
 		JdbcInterface.java JdbcInterface.class  
+		JdbcDSInterface.java JdbcDSInterface.class  
+		JdbcApacheInterface.java JdbcApacheInterface.class  
 		jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h)
     add_definitions(-DJDBC_SUPPORT)
   ELSE()

storage/connect/java/ap/JdbcInterface.class renamed to storage/connect/JdbcApacheInterface.class

@@ -6,7 +6,7 @@
 
 import org.apache.commons.dbcp2.BasicDataSource;
 
-public class JdbcInterface {
+public class JdbcApacheInterface {
 	boolean           DEBUG = false;
 	String            Errmsg = "No error";
 	Connection        conn = null;
@@ -18,11 +18,11 @@ public class JdbcInterface {
     static Hashtable<String,BasicDataSource> pool = new Hashtable<String, BasicDataSource>(); 
 
     // === Constructors/finalize  =========================================
-    public JdbcInterface() {
+    public JdbcApacheInterface() {
     	this(true);
     } // end of default constructor
 
-    public JdbcInterface(boolean b) {
+    public JdbcApacheInterface(boolean b) {
     	DEBUG = b;
     } // end of constructor
 
@@ -706,4 +706,4 @@ static public int addLibraryPath(String pathToAdd) {
     } // end of addLibraryPath
     */   
 
-} // end of class JdbcInterface
+} // end of class JdbcApacheInterface

storage/connect/java/ap/JdbcInterface.java renamed to storage/connect/JdbcApacheInterface.java

@@ -11,7 +11,7 @@
 import com.mysql.cj.jdbc.MysqlDataSource;
 import oracle.jdbc.pool.OracleDataSource;
 
-public class JdbcInterface {
+public class JdbcDSInterface {
 	boolean           DEBUG = false;
 	String            Errmsg = "No error";
 	Connection        conn = null;
@@ -23,11 +23,11 @@ public class JdbcInterface {
     Hashtable<String,DataSource> dst = null; 
 
     // === Constructors/finalize  =========================================
-    public JdbcInterface() {
+    public JdbcDSInterface() {
     	this(true);
     } // end of default constructor
 
-    public JdbcInterface(boolean b) {
+    public JdbcDSInterface(boolean b) {
     	DEBUG = b;
         dst = new Hashtable<String, DataSource>(); 
     } // end of constructor
@@ -740,4 +740,4 @@ static public int addLibraryPath(String pathToAdd) {
     } // end of addLibraryPath
     */   
 
-} // end of class JdbcInterface
+} // end of class JdbcDSInterface

storage/connect/java/ds/JdbcInterface.class renamed to storage/connect/JdbcDSInterface.class

@@ -195,6 +195,7 @@ extern "C" {
 #if defined(JDBC_SUPPORT)
 	     char *JvmPath;
 			 char *ClassPath;
+			 char *Wrapper;
 #endif   // JDBC_SUPPORT
 
 #if defined(__WIN__)
@@ -6874,6 +6875,12 @@ static MYSQL_SYSVAR_STR(class_path, ClassPath,
 	"Java class path",
 	//     check_class_path, update_class_path,
 	NULL, NULL, NULL);
+
+static MYSQL_SYSVAR_STR(java_wrapper, Wrapper,
+	PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_MEMALLOC,
+	"Java wrapper class",
+	//     check_class_path, update_class_path,
+	NULL, NULL, "JdbcInterface");
 #endif   // JDBC_SUPPORT
 
 
@@ -6897,6 +6904,7 @@ static struct st_mysql_sys_var* connect_system_variables[]= {
 #if defined(JDBC_SUPPORT)
 	MYSQL_SYSVAR(jvm_path),
 	MYSQL_SYSVAR(class_path),
+	MYSQL_SYSVAR(java_wrapper),
 #endif   // JDBC_SUPPORT
 	NULL
 };