mirror of
https://github.com/MariaDB/server.git
synced 2025-10-26 16:38:11 +01:00
commit c545d544378483bf68c4fb713cd4ec872d0df2c4
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Mar 27 23:13:14 2018 +0200
- Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATE
Fixed in TDBJDBC::OpenDB because query can be null for updates
modified: storage/connect/tabjdbc.cpp
commit c4f1fe2e8e74566e9c3296f435448d9f5c718b23
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Mar 14 12:21:17 2018 +0100
- Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID type
Also handle Postgresql sending type VARCHAR for TEXT column and
setting length to b x7FFFFFF when the length is unknown.
modified: storage/connect/Client.java
modified: storage/connect/JavaWrappers.jar
modified: storage/connect/JdbcInterface.java
modified: storage/connect/PostgresqlInterface.java
modified: storage/connect/global.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result
modified: storage/connect/mysql-test/connect/t/jdbc_postgresql.test
modified: storage/connect/mysql-test/connect/t/jdbconn.inc
modified: storage/connect/plgdbsem.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
added: storage/connect/mysql-test/connect/std_data/JavaWrappers.jar
commit 3068bb4882a316c6c32c624609db2bf24ae3ad40
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Feb 26 19:40:27 2018 +0100
Revert to old cmake file to avoid compile error
commit da8c1c0bd6a327fd03bd321be3170f468122ef67
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Feb 26 16:13:39 2018 +0100
- Remove warning on not used tabtyp variable in connect_assisted_discovery
modified: storage/connect/ha_connect.cc
- Fix a bug causing CONNECT to loop when expanding a JSON column
when the expanded column value is null or void array.
- Adding the FullArray option to JSON tables.
- Skipping expanded JSON lines when the expanded column value is null.
modified: storage/connect/connect.cc
modified: storage/connect/tabdos.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
- Fix MDEV-13353 No file privilege for ODBC, JDBC, MONGO, MAC, WMI file types.
modified: storage/connect/ha_connect.cc
- Make some Json UDFs to accept a non JSON item as 1st parameter.
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
- Update Json UDF tests to cope with above changes.
modified: storage/connect/mysql-test/connect/r/json_udf.result
modified: storage/connect/mysql-test/connect/r/json_udf_bin.result
modified: storage/connect/mysql-test/connect/r/vcol.result
modified: storage/connect/mysql-test/connect/t/json_udf.test
modified: storage/connect/mysql-test/connect/t/vcol.test
- Fix some compiler warning treated as error
PlugSubAlloc no more exported because it does throw.
modified: storage/connect/global.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
- Other files modified (?) when going back to wrong merge
modified: storage/connect/CMakeLists.txt
modified: storage/connect/array.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/csort.cpp
modified: storage/connect/domdoc.cpp
modified: storage/connect/filamap.cpp
modified: storage/connect/filamgz.cpp
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamzip.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/fmdlex.c
modified: storage/connect/jdbconn.cpp
modified: storage/connect/macutil.cpp
modified: storage/connect/myconn.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/preparse.h
modified: storage/connect/rcmsg.c
modified: storage/connect/rcmsg.h
modified: storage/connect/reldef.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabmac.cpp
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xobject.cpp
commit 5095628b31ed8c94bd7c794c6b0162894a9040b1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Feb 13 14:29:00 2018 +0100
- Fix a bug causing CONNECT to loop when expanding a JSON column
when the expanded column value is null or void array.
- Adding the FullArray option to JSON tables.
- Skipping expanded JSON lines when the expanded column value is null.
modified: storage/connect/connect.cc
modified: storage/connect/tabdos.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
commit 9896174328da42016735630c893fd09eb128b48e
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Feb 2 15:48:57 2018 +0100
- Remove warning on not used tabtyp variable in connect_assisted_discovery
modified: storage/connect/ha_connect.cc
commit d7e254c05f88173eb04d8dafc813013eb42ccdbe
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Jan 31 14:42:45 2018 +0100
- Use delayed load for the MongoDB C Drive on Windows
modified: storage/connect/CMakeLists.txt
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/ha_connect.cc
- Add FORCE to the connect_type_conv enum values
This will translate binary values to TYPE_STRING
modified: storage/connect/checklvl.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/odbconn.cpp
- Change the connect_xtrace variable to from int to set
modified: storage/connect/array.cpp
modified: storage/connect/blkfil.cpp
modified: storage/connect/block.h
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamap.cpp
modified: storage/connect/filamdbf.cpp
modified: storage/connect/filamfix.cpp
modified: storage/connect/filamgz.cpp
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamzip.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/global.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/inihandl.cpp
modified: storage/connect/javaconn.cpp
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jmgfam.cpp
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/libdoc.cpp
modified: storage/connect/mongo.cpp
modified: storage/connect/mycat.cc
modified: storage/connect/myconn.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/reldef.cpp
modified: storage/connect/tabcol.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabext.cpp
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabutil.cpp
modified: storage/connect/tabvct.cpp
modified: storage/connect/tabwmi.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/user_connect.cc
modified: storage/connect/valblk.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xindex.cpp
- Restore connect_enable_mongo variable (but undocumented)
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
modified: storage/connect/mysql-test/connect/r/json_java_2.result
modified: storage/connect/mysql-test/connect/r/json_java_3.result
modified: storage/connect/mysql-test/connect/r/json_mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_c.result
modified: storage/connect/mysql-test/connect/r/mongo_java_2.result
modified: storage/connect/mysql-test/connect/r/mongo_java_3.result
modified: storage/connect/mysql-test/connect/r/tbl_thread.result
modified: storage/connect/mysql-test/connect/t/mongo.inc
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
modified: storage/connect/mysql-test/connect/t/tbl_thread.test
200 lines
5.3 KiB
Java
200 lines
5.3 KiB
Java
|
|
package wrappers;
|
|
|
|
import java.io.BufferedReader;
|
|
import java.io.Console;
|
|
import java.io.IOException;
|
|
import java.io.InputStreamReader;
|
|
import java.sql.Date;
|
|
import java.sql.Time;
|
|
import java.sql.Timestamp;
|
|
|
|
public class Client {
|
|
static boolean DEBUG = true;
|
|
static final Console c = System.console();
|
|
static JdbcInterface jdi = null;
|
|
|
|
public static void main(String[] args) {
|
|
int rc, n, ncol, i = 0, fsize = 0;
|
|
boolean scrollable = false;
|
|
String s;
|
|
String[] parms = new String[4];
|
|
|
|
if (args.length > 0)
|
|
try {
|
|
i = Integer.parseInt(args[i]);
|
|
} catch (NumberFormatException e) {
|
|
i = 0;
|
|
} // end try/catch
|
|
|
|
switch (i) {
|
|
case 1:
|
|
jdi = new ApacheInterface(DEBUG);
|
|
break;
|
|
case 2:
|
|
jdi = new MysqlInterface(DEBUG);
|
|
break;
|
|
case 3:
|
|
jdi = new MariadbInterface(DEBUG);
|
|
break;
|
|
case 4:
|
|
jdi = new OracleInterface(DEBUG);
|
|
break;
|
|
case 5:
|
|
jdi = new PostgresqlInterface(DEBUG);
|
|
break;
|
|
default:
|
|
jdi = new JdbcInterface(DEBUG);
|
|
} // endswitch i
|
|
|
|
parms[0] = getLine("Driver: ", false);
|
|
parms[1] = getLine("URL: ", false);
|
|
parms[2] = getLine("User: ", false);
|
|
parms[3] = getLine("Password: ", true);
|
|
s = getLine("Fsize: ", false);
|
|
fsize = (s != null) ? Integer.parseInt(s) : 0;
|
|
s = getLine("Scrollable: ", false);
|
|
scrollable = (s != null) ? s.toLowerCase().charAt(0) != 'n' : false;
|
|
|
|
rc = jdi.JdbcConnect(parms, fsize, scrollable);
|
|
|
|
if (rc == 0) {
|
|
String query;
|
|
System.out.println("Successfully connected to " + parms[1]);
|
|
|
|
s = jdi.GetQuoteString();
|
|
System.out.println("Qstr = '" + s + "'");
|
|
|
|
while ((query = getLine("Query: ", false)) != null) {
|
|
n = jdi.Execute(query);
|
|
System.out.println("Returned n = " + n);
|
|
|
|
if ((ncol = jdi.GetResult()) > 0)
|
|
PrintResult(ncol);
|
|
else
|
|
System.out.println("Affected rows = " + n);
|
|
|
|
} // endwhile
|
|
|
|
rc = jdi.JdbcDisconnect();
|
|
System.out.println("Disconnect returned " + rc);
|
|
} else
|
|
System.out.println(jdi.GetErrmsg() + " rc=" + rc);
|
|
|
|
} // end of main
|
|
|
|
private static void PrintResult(int ncol) {
|
|
// Get result set meta data
|
|
int i;
|
|
Date date = new Date(0);
|
|
Time time = new Time(0);
|
|
Timestamp tsp = new Timestamp(0);
|
|
String columnName;
|
|
Object job;
|
|
|
|
// Get the column names; column indices start from 1
|
|
for (i = 1; i <= ncol; i++) {
|
|
columnName = jdi.ColumnName(i);
|
|
|
|
if (columnName == null)
|
|
return;
|
|
|
|
// Get the name of the column's table name
|
|
//String tableName = rsmd.getTableName(i);
|
|
|
|
if (i > 1)
|
|
System.out.print("\t");
|
|
|
|
System.out.print(columnName);
|
|
} // endfor i
|
|
|
|
System.out.println();
|
|
|
|
// Loop through the result set
|
|
while (jdi.ReadNext() > 0) {
|
|
for (i = 1; i <= ncol; i++) {
|
|
if (i > 1)
|
|
System.out.print("\t");
|
|
|
|
if (DEBUG)
|
|
System.out.print("(" + jdi.ColumnType(i, null) + ")");
|
|
|
|
switch (jdi.ColumnType(i, null)) {
|
|
case java.sql.Types.VARCHAR:
|
|
case java.sql.Types.LONGVARCHAR:
|
|
case java.sql.Types.CHAR:
|
|
case 1111:
|
|
System.out.print(jdi.StringField(i, null));
|
|
break;
|
|
case java.sql.Types.INTEGER:
|
|
System.out.print(jdi.IntField(i, null));
|
|
break;
|
|
case java.sql.Types.BIGINT:
|
|
System.out.print(jdi.BigintField(i, null));
|
|
break;
|
|
case java.sql.Types.TIME:
|
|
time.setTime((long)jdi.TimeField(i, null) * 1000);
|
|
System.out.print(time);
|
|
break;
|
|
case java.sql.Types.DATE:
|
|
date.setTime((long)jdi.DateField(i, null) * 1000);
|
|
System.out.print(date);
|
|
break;
|
|
case java.sql.Types.TIMESTAMP:
|
|
tsp.setTime((long)jdi.TimestampField(i, null) * 1000);
|
|
System.out.print(tsp);
|
|
break;
|
|
case java.sql.Types.SMALLINT:
|
|
System.out.print(jdi.IntField(i, null));
|
|
break;
|
|
case java.sql.Types.DOUBLE:
|
|
case java.sql.Types.REAL:
|
|
case java.sql.Types.FLOAT:
|
|
case java.sql.Types.DECIMAL:
|
|
System.out.print(jdi.DoubleField(i, null));
|
|
break;
|
|
case java.sql.Types.BOOLEAN:
|
|
System.out.print(jdi.BooleanField(i, null));
|
|
default:
|
|
job = jdi.ObjectField(i, null);
|
|
System.out.print(job.toString());
|
|
break;
|
|
} // endswitch Type
|
|
|
|
} // endfor i
|
|
|
|
System.out.println();
|
|
} // end while rs
|
|
|
|
} // end of PrintResult
|
|
|
|
// ==================================================================
|
|
private static String getLine(String p, boolean b) {
|
|
String response;
|
|
|
|
if (c != null) {
|
|
// Standard console mode
|
|
if (b) {
|
|
response = new String(c.readPassword(p));
|
|
} else
|
|
response = c.readLine(p);
|
|
|
|
} else {
|
|
// For instance when testing from Eclipse
|
|
BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
|
|
|
|
System.out.print(p);
|
|
|
|
try {
|
|
// Cannot suppress echo for password entry
|
|
response = in.readLine();
|
|
} catch (IOException e) {
|
|
response = "";
|
|
} // end of try/catch
|
|
|
|
} // endif c
|
|
|
|
return (response.isEmpty()) ? null : response;
|
|
} // end of getLine
|
|
|
|
} // end of class Client
|