From 38cb5c1495c12fe6502216b8aaaf1609e7d6c08e Mon Sep 17 00:00:00 2001 From: kolzeq Date: Tue, 29 Sep 2015 20:44:23 +0200 Subject: [PATCH] [misc] version 1.3.0-beta-1 --- build_release.bat | 1 + pom.xml | 2 +- .../common/query/parameters/DateParameter.java | 11 ++++++----- .../mariadb/jdbc/internal/mysql/MySQLValueObject.java | 1 - 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build_release.bat b/build_release.bat index 051119e55..7f76c2ff1 100644 --- a/build_release.bat +++ b/build_release.bat @@ -10,5 +10,6 @@ call mvn exec:exec package -Dpackage-source call %BINDIR%\mysqladmin -uroot shutdown #deploy package +#generate javadoc : mvn javadoc:javadoc #mvn clean deploy -Dmaven.test.skip=true -Dpackage-source diff --git a/pom.xml b/pom.xml index f5e8953d8..826f13abc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ mariadb-java-client jar mariadb-java-client - 1.3.0-SNAPSHOT + 1.3.0-beta-1 JDBC driver for MariaDB and MySQL https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ diff --git a/src/main/java/org/mariadb/jdbc/internal/common/query/parameters/DateParameter.java b/src/main/java/org/mariadb/jdbc/internal/common/query/parameters/DateParameter.java index ab6fddae7..ffd2308a2 100644 --- a/src/main/java/org/mariadb/jdbc/internal/common/query/parameters/DateParameter.java +++ b/src/main/java/org/mariadb/jdbc/internal/common/query/parameters/DateParameter.java @@ -80,6 +80,10 @@ public DateParameter(Date date, Calendar cal, Options options) { } + /** + * write to server OutputStream in text protocol + * @param os output buffer + */ public void writeTo(OutputStream os) throws IOException { if (options.useLegacyDatetimeCode || options.maximizeMysqlCompatibility) { calendar = Calendar.getInstance(); @@ -89,7 +93,8 @@ public void writeTo(OutputStream os) throws IOException { } /** - * @param writeBuffer + * write to server OutputStream in binary protocol + * @param writeBuffer output buffer */ public void writeBinary(PacketOutputStream writeBuffer) { if (options.useLegacyDatetimeCode || options.maximizeMysqlCompatibility) { @@ -100,10 +105,6 @@ public void writeBinary(PacketOutputStream writeBuffer) { writeBuffer.writeDateLength(calendar); } - public void writeToLittleEndian(final OutputStream os) throws IOException { - - } - public MySQLType getMySQLType() { return MySQLType.DATE; } diff --git a/src/main/java/org/mariadb/jdbc/internal/mysql/MySQLValueObject.java b/src/main/java/org/mariadb/jdbc/internal/mysql/MySQLValueObject.java index da6c9d7d3..609f5e4a0 100644 --- a/src/main/java/org/mariadb/jdbc/internal/mysql/MySQLValueObject.java +++ b/src/main/java/org/mariadb/jdbc/internal/mysql/MySQLValueObject.java @@ -728,7 +728,6 @@ private Timestamp binaryTimestamp(Calendar cal) throws ParseException { c.set(Calendar.MINUTE, minutes); c.set(Calendar.SECOND, seconds); c.set(Calendar.MILLISECOND, microseconds / 1000); - System.out.println("TEST : c"+c.getTime().toString()); Timestamp tt = new Timestamp(c.getTimeInMillis()); tt.setNanos(microseconds * 1000); return tt;