test Coverage addition

Author: rusher

src/main/java/org/mariadb/jdbc/client/ConnectionHelper.java

@@ -104,7 +104,7 @@ public static Socket standardSocket(Configuration conf, HostAddress hostAddress)
  (Class<? extends SocketFactory>) Class.forName(socketFactoryName);
  Constructor<? extends SocketFactory> constructor = socketFactoryClass.getConstructor();
  socketFactory = constructor.newInstance();
- if (socketFactoryClass.isInstance(ConfigurableSocketFactory.class)) {
+ if (socketFactory instanceof ConfigurableSocketFactory) {
  ((ConfigurableSocketFactory) socketFactory).setConfiguration(conf, hostAddress.host);
  }
  return socketFactory.createSocket();

src/main/java/org/mariadb/jdbc/util/ClientParser.java

@@ -228,18 +228,6 @@ public List<byte[]> getQueryParts() {
  return queryParts;
  }
 
- public boolean isQueryMultiValuesRewritable() {
- return isQueryMultiValuesRewritable;
- }
-
- public boolean isQueryMultipleRewritable() {
- return isQueryMultipleRewritable;
- }
-
- public boolean isRewriteType() {
- return rewriteType;
- }
-
  public int getParamCount() {
  return paramCount;
  }

src/main/java/org/mariadb/jdbc/util/NativeSql.java

@@ -26,7 +26,7 @@
 import org.mariadb.jdbc.client.context.Context;
 import org.mariadb.jdbc.util.constants.ServerStatus;
 
-public class NativeSql {
+public final class NativeSql {
 
  public static String parse(String sql, Context context) throws SQLException {
  if (!sql.contains("{")) {

src/main/java/org/mariadb/jdbc/util/ParameterList.java

@@ -36,11 +36,6 @@ public void set(int index, Parameter<?> element) {
  if (index + 1 > length) length = index + 1;
  }
 
- public void clear() {
- length = 0;
- Arrays.fill(elementData, null);
- }
-
  public int size() {
  return length;
  }

src/main/java/org/mariadb/jdbc/util/Security.java

@@ -21,7 +21,7 @@
 
 package org.mariadb.jdbc.util;
 
-public class Security {
+public final class Security {
 
  /**
  * Parse the option "sessionVariable" to ensure having no injection. semi-column not in string

src/main/java/org/mariadb/jdbc/util/Version.java

@@ -33,28 +33,19 @@ public final class Version {
  public static final String qualifier;
 
  static {
- InputStream inputStream = null;
  String tmpVersion = "5.5.0";
- try {
- Properties prop = new Properties();
- inputStream = Version.class.getClassLoader().getResourceAsStream("mariadb.properties");
- if (inputStream != null) {
- prop.load(inputStream);
- } else {
+ try (InputStream inputStream =
+ Version.class.getClassLoader().getResourceAsStream("mariadb.properties")) {
+ if (inputStream == null) {
  System.out.println("property file 'mariadb.properties' not found in the classpath");
  }
-
- // get the property value and print it out
+ Properties prop = new Properties();
+ prop.load(inputStream);
  tmpVersion = prop.getProperty("version");
- } catch (Exception e) {
- // eat
- } finally {
- try {
- inputStream.close();
- } catch (IOException ioe) {
- // eat
- }
+ } catch (IOException e) {
+ e.printStackTrace();
  }
+
  version = tmpVersion;
  int major = 0;
  int minor = 0;

src/main/java/org/mariadb/jdbc/util/options/OptionAliases.java

@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class OptionAliases {
+public final class OptionAliases {
 
  public static final Map<String, String> OPTIONS_ALIASES;
 

src/test/java/org/mariadb/jdbc/integration/ClientPreparedStatementParsingTest.java

@@ -310,4 +310,14 @@ public void testValuesForPartition() throws Exception {
  + "(PARTITION test_p201605 VALUES LESS THAN ('2016-06-01'))"
  });
  }
+
+ @Test
+ public void testParse() throws Exception {
+ checkParsing(
+ "INSERT INTO `myTable` VALUES ('\\n\"\\'', \"'\\\n\\\"\") \n // comment\n , ('a', 'b') # EOL comment",
+ 0,
+ new String[] {
+ "INSERT INTO `myTable` VALUES ('\\n\"\\'', \"'\\\n\\\"\") \n // comment\n , ('a', 'b') # EOL comment"
+ });
+ }
 }

src/test/java/org/mariadb/jdbc/integration/ConfigurationTest.java

@@ -68,7 +68,13 @@ public void testSessionVariable() throws SQLException {
  }
 
  try (Connection connection =
- createCon("sessionVariables=session_track_system_variables='some\\';f,ff'")) {
+ createCon("sessionVariables=session_track_system_variables='some\\';f,\"ff'")) {
+ Statement stmt = connection.createStatement();
+ ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
+ assertTrue(rs.next());
+ }
+ try (Connection connection =
+ createCon("sessionVariables=session_track_system_variables=\"some\\\";f,'ff'\"")) {
  Statement stmt = connection.createStatement();
  ResultSet rs = stmt.executeQuery("SELECT @@session_track_system_variables");
  assertTrue(rs.next());

src/test/java/org/mariadb/jdbc/integration/ConnectionTest.java

@@ -36,6 +36,7 @@
 import org.mariadb.jdbc.Configuration;
 import org.mariadb.jdbc.Connection;
 import org.mariadb.jdbc.Statement;
+import org.mariadb.jdbc.integration.util.SocketFactoryTest;
 
 @DisplayName("Connection Test")
 public class ConnectionTest extends Common {
@@ -106,17 +107,19 @@ public void autoCommit() throws SQLException {
  public void nativeSQL() throws SQLException {
  String[] inputs =
  new String[] {
- "select {fn timestampdiff(SQL_TSI_HOUR, {fn convert('SQL_', SQL_INTEGER)})}",
+ "select {fn TIMESTAMPDIFF ( SQL_TSI_HOUR, {fn convert('SQL_', SQL_INTEGER)})}, {fn TIMESTAMPDIFF (HOUR, {fn convert ('sQL_' , SQL_INTEGER)})}",
  "{call foo({fn now()})}",
- "{ call foo({fn now()})}",
- "{\r\n call foo({fn now()})}",
+ "{ call foo({fn now()})}",
+ "{\r\ncall foo({fn now()})}",
+ "{\r\n call foo({fn now()})}",
  "{call foo(/*{fn now()}*/)}",
- "{call foo({fn now() /* -- * */ -- test \n })}",
+ "{CALL foo({fn now() /* -- * */ -- test \n })}",
  "{?=call foo({fn now()})}",
  "SELECT 'David_' LIKE 'David|_' {escape '|'}",
  "select {fn dayname ({fn abs({fn now()})})}",
  "{d '1997-05-24'}",
  "{d'1997-05-24'}",
+ "{\nt'10:30:29'}",
  "{t '10:30:29'}",
  "{t'10:30:29'}",
  "{ts '1997-05-24 10:30:29.123'}",
@@ -128,19 +131,21 @@ public void nativeSQL() throws SQLException {
  };
  String[] outputs =
  new String[] {
- "select timestampdiff(HOUR, convert('SQL_', INTEGER))",
+ "select TIMESTAMPDIFF ( HOUR, convert('SQL_', INTEGER)), TIMESTAMPDIFF (HOUR, convert ('sQL_' , INTEGER))",
+ "call foo(now())",
  "call foo(now())",
  "call foo(now())",
  "call foo(now())",
  "call foo(/*{fn now()}*/)",
- "call foo(now() /* -- * */ -- test \n )",
+ "CALL foo(now() /* -- * */ -- test \n )",
  "?=call foo(now())",
  "SELECT 'David_' LIKE 'David|_' escape '|'",
  "select dayname (abs(now()))",
  "'1997-05-24'",
  "'1997-05-24'",
  "'10:30:29'",
  "'10:30:29'",
+ "'10:30:29'",
  "'1997-05-24 10:30:29.123'",
  "'1997-05-24 10:30:29.123'",
  "'{string data with { or } will not be altered'",
@@ -921,4 +926,11 @@ public boolean isLocalConnection(String testName) {
 
  return isLocal;
  }
+
+ @Test
+ public void socketFactoryTest() throws SQLException {
+ try (Connection conn = createCon("socketFactory=" + SocketFactoryTest.class.getName())) {
+ conn.isValid(1);
+ }
+ }
 }