[misc] code style correction + ensuring setLocalInfileInputStream test

Author: rusher

CHANGELOG.md

@@ -14,8 +14,8 @@ them on your own before continuing.
 
 * At least one GPG Key see https://help.github.com/en/articles/generating-a-new-gpg-key
 * [Oracle JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) (
-  with [JCE policies](http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) if using
-  TLS/SSL)
+	with [JCE policies](http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) if using
+	TLS/SSL)
 * IDE (eclipse / netbean / intelliJ) with maven and GIT plugins
 
 # Fork source
@@ -69,7 +69,7 @@ parameters :
 jdk:
 
 * oraclejdk8
-  and if your work is on develop-jre6 branch
+	and if your work is on develop-jre6 branch
 * openjdk6
 * openjdk7
 

CONTRIBUTING.md

@@ -729,10 +729,10 @@ public ResultSet getTables(
     StringBuilder sb =
         new StringBuilder(
             "SELECT TABLE_SCHEMA TABLE_CAT, NULL  TABLE_SCHEM,  TABLE_NAME, IF(TABLE_TYPE='BASE"
-                + " TABLE' or TABLE_TYPE='SYSTEM VERSIONED', 'TABLE', IF(TABLE_TYPE='TEMPORARY', 'LOCAL TEMPORARY', TABLE_TYPE)) as TABLE_TYPE,"
-                + " TABLE_COMMENT REMARKS, NULL TYPE_CAT, NULL TYPE_SCHEM, NULL TYPE_NAME, NULL"
-                + " SELF_REFERENCING_COL_NAME,  NULL REF_GENERATION FROM"
-                + " INFORMATION_SCHEMA.TABLES");
+                + " TABLE' or TABLE_TYPE='SYSTEM VERSIONED', 'TABLE', IF(TABLE_TYPE='TEMPORARY',"
+                + " 'LOCAL TEMPORARY', TABLE_TYPE)) as TABLE_TYPE, TABLE_COMMENT REMARKS, NULL"
+                + " TYPE_CAT, NULL TYPE_SCHEM, NULL TYPE_NAME, NULL SELF_REFERENCING_COL_NAME, "
+                + " NULL REF_GENERATION FROM INFORMATION_SCHEMA.TABLES");
     String database = conf.useCatalogTerm() == CatalogTerm.UseCatalog ? catalog : schemaPattern;
     boolean firstCondition =
         databaseCond(
@@ -1405,17 +1405,17 @@ public String getIdentifierQuoteString() {
   @Override
   public String getSQLKeywords() {
     return "ACCESSIBLE,ANALYZE,ASENSITIVE,BEFORE,BIGINT,BINARY,BLOB,CALL,CHANGE,CONDITION,DATABASE,DATABASES,"
-        + "DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DELAYED,DETERMINISTIC,DISTINCTROW,DIV,DUAL,EACH,"
-        + "ELSEIF,ENCLOSED,ESCAPED,EXIT,EXPLAIN,FLOAT4,FLOAT8,FORCE,FULLTEXT,GENERAL,HIGH_PRIORITY,"
-        + "HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IF,IGNORE,IGNORE_SERVER_IDS,INDEX,INFILE,INOUT,INT1,INT2,"
-        + "INT3,INT4,INT8,ITERATE,KEY,KEYS,KILL,LEAVE,LIMIT,LINEAR,LINES,LOAD,LOCALTIME,LOCALTIMESTAMP,LOCK,"
-        + "LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER_HEARTBEAT_PERIOD,MASTER_SSL_VERIFY_SERVER_CERT,"
-        + "MAXVALUE,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MIDDLEINT,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODIFIES,"
-        + "NO_WRITE_TO_BINLOG,OPTIMIZE,OPTIONALLY,OUT,OUTFILE,PURGE,RANGE,READ_WRITE,READS,REGEXP,RELEASE,"
-        + "RENAME,REPEAT,REPLACE,REQUIRE,RESIGNAL,RESTRICT,RETURN,RLIKE,SCHEMAS,SECOND_MICROSECOND,SENSITIVE,"
-        + "SEPARATOR,SHOW,SIGNAL,SLOW,SPATIAL,SPECIFIC,SQL_BIG_RESULT,SQL_CALC_FOUND_ROWS,SQL_SMALL_RESULT,"
-        + "SQLEXCEPTION,SSL,STARTING,STRAIGHT_JOIN,TERMINATED,TINYBLOB,TINYINT,TINYTEXT,TRIGGER,UNDO,UNLOCK,"
-        + "UNSIGNED,USE,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VARBINARY,VARCHARACTER,WHILE,XOR,YEAR_MONTH,ZEROFILL";
+               + "DAY_HOUR,DAY_MICROSECOND,DAY_MINUTE,DAY_SECOND,DELAYED,DETERMINISTIC,DISTINCTROW,DIV,DUAL,EACH,"
+               + "ELSEIF,ENCLOSED,ESCAPED,EXIT,EXPLAIN,FLOAT4,FLOAT8,FORCE,FULLTEXT,GENERAL,HIGH_PRIORITY,"
+               + "HOUR_MICROSECOND,HOUR_MINUTE,HOUR_SECOND,IF,IGNORE,IGNORE_SERVER_IDS,INDEX,INFILE,INOUT,INT1,INT2,"
+               + "INT3,INT4,INT8,ITERATE,KEY,KEYS,KILL,LEAVE,LIMIT,LINEAR,LINES,LOAD,LOCALTIME,LOCALTIMESTAMP,LOCK,"
+               + "LONG,LONGBLOB,LONGTEXT,LOOP,LOW_PRIORITY,MASTER_HEARTBEAT_PERIOD,MASTER_SSL_VERIFY_SERVER_CERT,"
+               + "MAXVALUE,MEDIUMBLOB,MEDIUMINT,MEDIUMTEXT,MIDDLEINT,MINUTE_MICROSECOND,MINUTE_SECOND,MOD,MODIFIES,"
+               + "NO_WRITE_TO_BINLOG,OPTIMIZE,OPTIONALLY,OUT,OUTFILE,PURGE,RANGE,READ_WRITE,READS,REGEXP,RELEASE,"
+               + "RENAME,REPEAT,REPLACE,REQUIRE,RESIGNAL,RESTRICT,RETURN,RLIKE,SCHEMAS,SECOND_MICROSECOND,SENSITIVE,"
+               + "SEPARATOR,SHOW,SIGNAL,SLOW,SPATIAL,SPECIFIC,SQL_BIG_RESULT,SQL_CALC_FOUND_ROWS,SQL_SMALL_RESULT,"
+               + "SQLEXCEPTION,SSL,STARTING,STRAIGHT_JOIN,TERMINATED,TINYBLOB,TINYINT,TINYTEXT,TRIGGER,UNDO,UNLOCK,"
+               + "UNSIGNED,USE,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,VARBINARY,VARCHARACTER,WHILE,XOR,YEAR_MONTH,ZEROFILL";
   }
 
   /**
@@ -1426,7 +1426,7 @@ public String getSQLKeywords() {
   @Override
   public String getNumericFunctions() {
     return "DIV,ABS,ACOS,ASIN,ATAN,ATAN2,CEIL,CEILING,CONV,COS,COT,CRC32,DEGREES,EXP,FLOOR,GREATEST,LEAST,LN,LOG,"
-        + "LOG10,LOG2,MOD,OCT,PI,POW,POWER,RADIANS,RAND,ROUND,SIGN,SIN,SQRT,TAN,TRUNCATE";
+               + "LOG10,LOG2,MOD,OCT,PI,POW,POWER,RADIANS,RAND,ROUND,SIGN,SIN,SQRT,TAN,TRUNCATE";
   }
 
   /**
@@ -1437,11 +1437,11 @@ public String getNumericFunctions() {
   @Override
   public String getStringFunctions() {
     return "ASCII,BIN,BIT_LENGTH,CAST,CHARACTER_LENGTH,CHAR_LENGTH,CONCAT,CONCAT_WS,CONVERT,ELT,EXPORT_SET,"
-        + "EXTRACTVALUE,FIELD,FIND_IN_SET,FORMAT,FROM_BASE64,HEX,INSTR,LCASE,LEFT,LENGTH,LIKE,LOAD_FILE,LOCATE,LOWER,LPAD,LTRIM,MAKE_SET,MATCH"
-        + " AGAINST,MID,NOT LIKE,NOT"
-        + " REGEXP,OCTET_LENGTH,ORD,POSITION,QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,SOUNDS"
-        + " LIKE,SPACE,STRCMP,SUBSTR,SUBSTRING,"
-        + "SUBSTRING_INDEX,TO_BASE64,TRIM,UCASE,UNHEX,UPDATEXML,UPPER,WEIGHT_STRING";
+               + "EXTRACTVALUE,FIELD,FIND_IN_SET,FORMAT,FROM_BASE64,HEX,INSTR,LCASE,LEFT,LENGTH,LIKE,LOAD_FILE,LOCATE,LOWER,LPAD,LTRIM,MAKE_SET,MATCH"
+               + " AGAINST,MID,NOT LIKE,NOT"
+               + " REGEXP,OCTET_LENGTH,ORD,POSITION,QUOTE,REPEAT,REPLACE,REVERSE,RIGHT,RPAD,RTRIM,SOUNDEX,SOUNDS"
+               + " LIKE,SPACE,STRCMP,SUBSTR,SUBSTRING,"
+               + "SUBSTRING_INDEX,TO_BASE64,TRIM,UCASE,UNHEX,UPDATEXML,UPPER,WEIGHT_STRING";
   }
 
   /**
@@ -1462,11 +1462,11 @@ public String getSystemFunctions() {
   @Override
   public String getTimeDateFunctions() {
     return "ADDDATE,ADDTIME,CONVERT_TZ,CURDATE,CURRENT_DATE,CURRENT_TIME,CURRENT_TIMESTAMP,CURTIME,DATEDIFF,"
-        + "DATE_ADD,DATE_FORMAT,DATE_SUB,DAY,DAYNAME,DAYOFMONTH,DAYOFWEEK,DAYOFYEAR,EXTRACT,FROM_DAYS,"
-        + "FROM_UNIXTIME,GET_FORMAT,HOUR,LAST_DAY,LOCALTIME,LOCALTIMESTAMP,MAKEDATE,MAKETIME,MICROSECOND,"
-        + "MINUTE,MONTH,MONTHNAME,NOW,PERIOD_ADD,PERIOD_DIFF,QUARTER,SECOND,SEC_TO_TIME,STR_TO_DATE,SUBDATE,"
-        + "SUBTIME,SYSDATE,TIMEDIFF,TIMESTAMPADD,TIMESTAMPDIFF,TIME_FORMAT,TIME_TO_SEC,TO_DAYS,TO_SECONDS,"
-        + "UNIX_TIMESTAMP,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,WEEK,WEEKDAY,WEEKOFYEAR,YEAR,YEARWEEK";
+               + "DATE_ADD,DATE_FORMAT,DATE_SUB,DAY,DAYNAME,DAYOFMONTH,DAYOFWEEK,DAYOFYEAR,EXTRACT,FROM_DAYS,"
+               + "FROM_UNIXTIME,GET_FORMAT,HOUR,LAST_DAY,LOCALTIME,LOCALTIMESTAMP,MAKEDATE,MAKETIME,MICROSECOND,"
+               + "MINUTE,MONTH,MONTHNAME,NOW,PERIOD_ADD,PERIOD_DIFF,QUARTER,SECOND,SEC_TO_TIME,STR_TO_DATE,SUBDATE,"
+               + "SUBTIME,SYSDATE,TIMEDIFF,TIMESTAMPADD,TIMESTAMPDIFF,TIME_FORMAT,TIME_TO_SEC,TO_DAYS,TO_SECONDS,"
+               + "UNIX_TIMESTAMP,UTC_DATE,UTC_TIME,UTC_TIMESTAMP,WEEK,WEEKDAY,WEEKOFYEAR,YEAR,YEARWEEK";
   }
 
   public String getSearchStringEscape() {

src/main/java/org/mariadb/jdbc/DatabaseMetaData.java

@@ -85,7 +85,7 @@ public String getQualifier() {
    * @return true if version is greater than parameters
    */
   public boolean versionFixedMajorMinorGreaterOrEqual(int major, int minor, int patch) {
-      return this.majorVersion == major && this.minorVersion == minor && this.patchVersion >= patch;
+    return this.majorVersion == major && this.minorVersion == minor && this.patchVersion >= patch;
   }
 
   /**

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

@@ -185,7 +185,8 @@ public void testLargeBatchParameterClearAfterError() throws SQLException {
     try (Statement stmt = sharedConn.createStatement()) {
       stmt.execute("DROP TABLE IF EXISTS testLargeBatchParameterClearAfterError");
       stmt.execute(
-          "CREATE TABLE testLargeBatchParameterClearAfterError(id TINYINT PRIMARY KEY,value SMALLINT)");
+          "CREATE TABLE testLargeBatchParameterClearAfterError(id TINYINT PRIMARY KEY,value"
+              + " SMALLINT)");
       stmt.addBatch("INSERT INTO testLargeBatchParameterClearAfterError VALUES(1, 1)");
       stmt.addBatch("INSERT INTO testLargeBatchParameterClearAfterError VALUES(1, 1)");
 

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

@@ -975,7 +975,7 @@ public void localSocket() throws Exception {
     stmt.execute("DROP USER testSocket");
   }
 
-  static public int staticTestValue = 0;
+  public static int staticTestValue = 0;
 
   @Test
   public void socketFactoryTest() throws SQLException {
@@ -995,7 +995,8 @@ public void socketFactoryTest() throws SQLException {
     Common.assertThrowsContains(
         SQLNonTransientConnectionException.class,
         () -> createCon("socketFactory=org.mariadb.jdbc.integration.util.WrongSocketFactoryTest"),
-        "Socket factory failed to initialized with option \"socketFactory\" set to \"org.mariadb.jdbc.integration.util.WrongSocketFactoryTest\"");
+        "Socket factory failed to initialized with option \"socketFactory\" set to"
+            + " \"org.mariadb.jdbc.integration.util.WrongSocketFactoryTest\"");
     assertEquals(0, staticTestValue);
   }
 

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

@@ -182,9 +182,10 @@ public void primaryKeyTest2() throws SQLException {
     stmt.execute("drop table if exists primarykeytest1");
     stmt.execute("CREATE TABLE primarykeytest1 ( id1 integer, constraint pk primary key(id1))");
     stmt.execute(
-        "CREATE TABLE primarykeytest2 (`id2'a` integer, id2b integer, constraint pk primary key(`id2'a`,"
-            + " id2b), constraint fk1 foreign key(`id2'a`) references primarykeytest1(id1), "
-            + " constraint fk2 foreign key(id2b) references primarykeytest1(id1))");
+        "CREATE TABLE primarykeytest2 (`id2'a` integer, id2b integer, constraint pk primary"
+            + " key(`id2'a`, id2b), constraint fk1 foreign key(`id2'a`) references"
+            + " primarykeytest1(id1),  constraint fk2 foreign key(id2b) references"
+            + " primarykeytest1(id1))");
 
     DatabaseMetaData dbmd = sharedConn.getMetaData();
     ResultSet rs = dbmd.getPrimaryKeys(sharedConn.getCatalog(), null, "primarykeytest2");

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

@@ -6,7 +6,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.sql.*;
-
 import org.junit.jupiter.api.*;
 
 public class ErrorTest extends Common {
@@ -144,6 +143,7 @@ public void deadLockInformation() throws SQLException {
       }
     }
   }
+
   @Test
   public void connectionErrorFormat() throws SQLException {
     try {

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

@@ -24,6 +24,9 @@ public static void beforeAll2() throws SQLException {
     stmt.execute(
         "CREATE TABLE `infile`(`a` varchar(50) DEFAULT NULL, `b` varchar(50) DEFAULT NULL)"
             + " ENGINE=InnoDB DEFAULT CHARSET=latin1");
+    stmt.execute(
+        "CREATE TABLE small_load_data_infile(id int not null primary key auto_increment, name"
+            + " char(20)) ENGINE=myisam");
     stmt.execute(
         "CREATE TABLE big_load_data_infile(id int not null primary key auto_increment, name"
             + " char(20)) ENGINE=myisam");
@@ -40,6 +43,7 @@ public static void drop() throws SQLException {
     stmt.execute("DROP TABLE IF EXISTS ldinfile");
     stmt.execute("DROP TABLE IF EXISTS `infile`");
     stmt.execute("DROP TABLE IF EXISTS big_load_data_infile");
+    stmt.execute("DROP TABLE IF EXISTS small_load_data_infile");
   }
 
   private static boolean checkLocal() throws SQLException {
@@ -51,6 +55,30 @@ private static boolean checkLocal() throws SQLException {
     return false;
   }
 
+  @Test
+  public void smallLoadDataInfileTest() throws SQLException, IOException {
+
+    try (VeryLongAutoGeneratedInputStream in = new VeryLongAutoGeneratedInputStream(50)) {
+      try (Connection connection = createCon()) {
+        Statement statement = connection.createStatement();
+        org.mariadb.jdbc.Statement mariaDbStatement =
+            statement.unwrap(org.mariadb.jdbc.Statement.class);
+        mariaDbStatement.setLocalInfileInputStream(in);
+
+        String sql =
+            "LOAD DATA LOCAL INFILE 'dummyFileName'"
+                + " INTO TABLE small_load_data_infile "
+                + " FIELDS TERMINATED BY '\\t' ENCLOSED BY ''"
+                + " ESCAPED BY '\\\\' LINES TERMINATED BY '\\n'";
+        statement.execute(sql);
+
+        ResultSet rs = statement.executeQuery("select count(*) from small_load_data_infile");
+        assertTrue(rs.next());
+        assertEquals(50, rs.getInt(1));
+      }
+    }
+  }
+
   @Test
   public void bigLoadDataInfileTest() throws SQLException, IOException {
     Assumptions.assumeTrue(runLongTest());

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

@@ -310,10 +310,7 @@ public void checkParameters(org.mariadb.jdbc.Connection con, boolean text) throw
         ps -> ps.setURL(1, new URL("https://www.someUrl.com")),
         rs -> assertEquals("https://www.someUrl.com", rs.getString(1)),
         con);
-    checkSendString(
-            ps -> ps.setURL(1, (URL) null),
-            rs -> assertNull(rs.getString(1)),
-            con);
+    checkSendString(ps -> ps.setURL(1, (URL) null), rs -> assertNull(rs.getString(1)), con);
     // TODO SET OBJECT
   }