[CONJ-192] Correct driver metadata version

mariadb-corporation · Sep 4, 2015 · 40a1c83 · 40a1c83
1 parent b348bec
commit 40a1c83
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,26 @@ or maven :
 	<version>1.2.2</version>
 </dependency>
 ```
+
+Development snapshot are available on sonatype nexus repository  
+```script
+    <repositories>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>1.3.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+```
+
 ## Documentation
 
 For a Getting started guide, API docs, recipes,  etc. see the [documentation page](https://mariadb.com/kb/en/mariadb/about-the-mariadb-java-client/)!
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>1.2.2</version>
+    <version>1.3.0-SNAPSHOT</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
     <properties>
@@ -262,7 +262,6 @@
                             <token>@qualifier</token>
                             <value>${parsedVersion.qualifier}</value>
                         </replacement>
-                        parsedVersion.qualifier
                     </replacements>
                 </configuration>
             </plugin>

diff --git a/src/main/java/org/mariadb/jdbc/MySQLDatabaseMetaData.java b/src/main/java/org/mariadb/jdbc/MySQLDatabaseMetaData.java
@@ -61,6 +61,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 import java.util.List;
 
 public class MySQLDatabaseMetaData implements DatabaseMetaData {
+    private final static String DRIVER_NAME = "MariaDB connector/J";
     private String url;
     private MySQLConnection connection;
     private String databaseProductName = "MySQL";
@@ -488,20 +489,20 @@ public String getDatabaseProductVersion() throws SQLException {
 
 
     public String getDriverName() throws SQLException {
-        return "mariadb-jdbc"; // TODO: get from constants file
+        return DRIVER_NAME;
     }
 
     public String getDriverVersion() throws SQLException {
-        return String.format("%d.%d",getDriverMajorVersion(),getDriverMinorVersion());
+        return Version.version;
     }
 
 
     public int getDriverMajorVersion() {
-        return 1;
+        return Version.majorVersion;
     }
 
     public int getDriverMinorVersion() {
-        return 1;
+        return Version.minorVersion;
     }
 
 

diff --git a/src/main/java/org/mariadb/jdbc/Version.java b/src/main/java/org/mariadb/jdbc/Version.java
@@ -1,10 +1,10 @@
 package org.mariadb.jdbc;
 
 public final class Version {
-    public static final String version = "1.2.2";
+    public static final String version = "1.3.0-SNAPSHOT";
     public static final int majorVersion = 1;
-    public static final int minorVersion = 2;
-    public static final int patchVersion = 2;
-    public static final String qualifier = "";
+    public static final int minorVersion = 3;
+    public static final int patchVersion = 0;
+    public static final String qualifier = "SNAPSHOT";
 
 }
diff --git a/src/test/java/org/mariadb/jdbc/DateTest.java b/src/test/java/org/mariadb/jdbc/DateTest.java
@@ -233,13 +233,15 @@ public void javaUtilDateInPreparedStatementAsTime() throws Exception {
           ps.executeUpdate();
           ResultSet rs = connection.createStatement().executeQuery("select * from dtest");
           rs.next();
+          assertEquals(d.getHours(), rs.getTime(1).getHours());
+
           /* Check that time is correct, up to seconds precision */
-          assertEquals(d.getHours(),rs.getTime(1).getHours());
-          assertEquals(d.getMinutes(),rs.getTime(1).getMinutes());
           if (isMariadbServer()) {
+              assertEquals(d.getMinutes(),rs.getTime(1).getMinutes());
               assertEquals(d.getSeconds(), rs.getTime(1).getSeconds());
           } else {
               //mysql 1 seconde precision
+              Assert.assertTrue(Math.abs(d.getMinutes() - rs.getTime(1).getMinutes()) <= 1);
               Assert.assertTrue(Math.abs(d.getSeconds() - rs.getTime(1).getSeconds())<=1);
           }
     }