[CONJ-243] correction getString on tinyInt false value

mariadb-corporation · Jan 12, 2016 · 01ff2ef · 01ff2ef
1 parent b4262bd
commit 01ff2ef
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -25,6 +25,25 @@ or maven :
 </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.5-SNAPSHOT</version>
+    </dependency>
+</dependencies>
+```
+
 ## Documentation
 
 For a Getting started guide, API docs, recipes,  etc. see the 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>1.3.4</version>
+    <version>1.3.5-SNAPSHOT</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/MariaDbValueObject.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/MariaDbValueObject.java
@@ -131,9 +131,6 @@ public String getString(Calendar cal) throws SQLException {
                 }
                 break;
             case TINYINT:
-                if (options.tinyInt1isBit && columnInfo.getLength() == 1) {
-                    return (rawBytes[0] == 0) ? "0" : "1";
-                }
                 if (this.isBinaryEncoded) {
                     return String.valueOf(getTinyInt());
                 }

diff --git a/src/test/java/org/mariadb/jdbc/BooleanTest.java b/src/test/java/org/mariadb/jdbc/BooleanTest.java
@@ -10,6 +10,8 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
 
 
 public class BooleanTest extends BaseTest {
@@ -20,6 +22,8 @@ public class BooleanTest extends BaseTest {
     @BeforeClass()
     public static void initClass() throws SQLException {
         createTable("booleantest", "id int not null primary key auto_increment, test boolean");
+        createTable("booleanvalue", "test boolean");
+
     }
 
     @Test
@@ -28,10 +32,44 @@ public void testBoolean() throws SQLException {
         stmt.execute("insert into booleantest values(null, true)");
         stmt.execute("insert into booleantest values(null, false)");
         ResultSet rs = stmt.executeQuery("select * from booleantest");
-        assertTrue(rs.next());
-        assertTrue(rs.getBoolean(2));
-        assertTrue(rs.next());
-        assertFalse(rs.getBoolean(2));
+        if (rs.next()) {
+            assertTrue(rs.getBoolean(2));
+            if (rs.next()) {
+                assertFalse(rs.getBoolean(2));
+            } else {
+                fail("must have a result !");
+            }
+        } else {
+            fail("must have a result !");
+        }
+
     }
 
+    @Test
+    public void testBooleanString() throws SQLException {
+        Statement stmt = sharedConnection.createStatement();
+        stmt.execute("insert into booleanvalue values(true)");
+        stmt.execute("insert into booleanvalue values(false)");
+        stmt.execute("insert into booleanvalue values(4)");
+        ResultSet rs = stmt.executeQuery("select * from booleanvalue");
+
+        if (rs.next()) {
+            assertTrue(rs.getBoolean(1));
+            assertEquals("1", rs.getString(1));
+            if (rs.next()) {
+                assertFalse(rs.getBoolean(1));
+                assertEquals("0", rs.getString(1));
+                if (rs.next()) {
+                    assertFalse(rs.getBoolean(1));
+                    assertEquals("4", rs.getString(1));
+                } else {
+                    fail("must have a result !");
+                }
+            } else {
+                fail("must have a result !");
+            }
+        } else {
+            fail("must have a result !");
+        }
+    }
 }