Fix for Bug#97724 (30570721), Contribution: Allow \'3.\' formatted numbers.

Author: fjssilva

CHANGES

@@ -3,6 +3,9 @@
 
 Version 8.0.20
 
+  - Fix for Bug#97724 (30570721), Contribution: Allow \'3.\' formatted numbers.
+    Thanks to Nick Pollett for his contribution.
+
   - Fix for Bug#98536 (30877755), SIMPLEDATEFORMAT COULD CACHE A WRONG CALENDAR.
 
   - Fix for Bug#91112 (28125069), AGAIN WRONG JAVA.SQL.DATE.

src/main/core-impl/java/com/mysql/cj/result/AbstractNumericValueFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -52,7 +52,7 @@ public T createFromBytes(byte[] bytes, int offset, int length, Field f) {
         String s = StringUtils.toString(bytes, offset, length, f.getEncoding());
         byte[] newBytes = s.getBytes();
 
-        if (s.contains("e") || s.contains("E") || s.matches("-?(\\d+)?\\.\\d+")) {
+        if (s.contains("e") || s.contains("E") || s.matches("-?\\d*\\.\\d*")) {
             // floating point
             return createFromDouble(MysqlTextValueDecoder.getDouble(newBytes, 0, newBytes.length));
         } else if (s.matches("-?\\d+")) {

src/main/core-impl/java/com/mysql/cj/result/BooleanValueFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License, version 2.0, as published by the
@@ -102,7 +102,7 @@ public Boolean createFromBytes(byte[] bytes, int offset, int length, Field f) {
             return createFromLong(1);
         } else if (s.equalsIgnoreCase("N") || s.equalsIgnoreCase("false")) {
             return createFromLong(0);
-        } else if (s.contains("e") || s.contains("E") || s.matches("-?(\\d+)?\\.\\d+")) {
+        } else if (s.contains("e") || s.contains("E") || s.matches("-?\\d*\\.\\d*")) {
             // floating point
             return createFromDouble(MysqlTextValueDecoder.getDouble(newBytes, 0, newBytes.length));
         } else if (s.matches("-?\\d+")) {

src/test/java/testsuite/regression/ResultSetRegressionTest.java

@@ -7319,4 +7319,30 @@ public void testBug30474158() throws Exception {
             assertEquals("testBug30474158", this.rs.getString(1));
         }
     }
+
+    /**
+     * Tests fix for Bug#97724 (30570721), Contribution: Allow \'3.\' formatted numbers.
+     */
+    public void testBug97724() throws Exception {
+        createTable("testBug97724", "(data VARCHAR(100))");
+        assertEquals(4, this.stmt.executeUpdate("INSERT INTO testBug97724 VALUES ('0.0'), ('.1'), ('2.'), ('3.3')"));
+        this.rs = this.stmt.executeQuery("SELECT * FROM testBug97724");
+        assertTrue(this.rs.next());
+        assertFalse(this.rs.getBoolean(1));
+        assertEquals(0, this.rs.getInt(1));
+        assertEquals(0.0d, this.rs.getDouble(1));
+        assertTrue(this.rs.next());
+        assertTrue(this.rs.getBoolean(1));
+        assertEquals(0, this.rs.getInt(1));
+        assertEquals(0.1d, this.rs.getDouble(1));
+        assertTrue(this.rs.next());
+        assertTrue(this.rs.getBoolean(1));
+        assertEquals(2, this.rs.getInt(1));
+        assertEquals(2.0d, this.rs.getDouble(1));
+        assertTrue(this.rs.next());
+        assertTrue(this.rs.getBoolean(1));
+        assertEquals(3, this.rs.getInt(1));
+        assertEquals(3.3d, this.rs.getDouble(1));
+        assertFalse(this.rs.next());
+    }
 }