Code hygiene

spannm · Feb 9, 2025 · 385498e · 385498e
1 parent 9c46b0a
commit 385498e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/src/main/java/net/ucanaccess/converters/SQLConverter.java b/src/main/java/net/ucanaccess/converters/SQLConverter.java
@@ -762,9 +762,13 @@ private static String convertTypeDeclaration(String typeDecl) {
         return Patterns.DEFAULT_VARCHAR_0.matcher(typeDecl).replaceAll("$1VARCHAR(255)$2");
     }
 
-    private static String convertCreateTable(String sql, Map<String, String> _types2Convert) throws SQLException {
+    private static String convertCreateTable(String _sql, Map<String, String> _types2Convert) throws SQLException {
+        if (_sql == null || _sql.isBlank()) {
+            return _sql;
+        }
+
         // padding for detecting the right exception
-        sql += " ";
+        String sql = _sql + " ";
         if (!sql.contains("(")) {
             return sql;
         }
@@ -778,7 +782,9 @@ private static String convertCreateTable(String sql, Map<String, String> _types2
                      .replaceAll("(\\W)" + exprTypesTranslate.replace("_", "___" + entry.getKey() + "___"), "$1" + entry.getKey() + "$2");
         }
         sql = Patterns.DEFAULT_VARCHAR.matcher(sql).replaceAll("$1VARCHAR(255)$2");
-        return clearDefaultsCreateStatement(pre + sql);
+
+        sql = clearDefaultsCreateStatement(pre + sql);
+        return sql;
     }
 
     public static String getDDLDefault(String ddlf) {

diff --git a/src/main/java/net/ucanaccess/converters/TypesMap.java b/src/main/java/net/ucanaccess/converters/TypesMap.java
@@ -13,20 +13,20 @@ public enum AccessType {
         INTEGER(SqlConstants.SMALLINT),
         LONG(SqlConstants.INTEGER),
         TEXT(SqlConstants.VARCHAR),
-        OLE("BLOB"),
+        OLE(SqlConstants.BLOB),
         MEMO(SqlConstants.LONGVARCHAR),
         CURRENCY("DECIMAL(" + DataType.MONEY.getFixedSize() + ", 4)"),
         GUID("CHAR(38)"),
         COUNTER(SqlConstants.INTEGER),
         AUTOINCREMENT(SqlConstants.INTEGER),
-        NUMERIC("DECIMAL"),
-        YESNO("BOOLEAN"),
-        DATETIME("TIMESTAMP"),
-        SINGLE("FLOAT"),
+        NUMERIC(SqlConstants.DECIMAL),
+        YESNO(SqlConstants.BOOLEAN),
+        DATETIME(SqlConstants.TIMESTAMP),
+        SINGLE(SqlConstants.FLOAT),
         COMPLEX("OBJECT"),
         CHAR(SqlConstants.VARCHAR), // CHAR mapped into TEXT when used in CREATE TABLE.
         HYPERLINK(SqlConstants.LONGVARCHAR), // HYPERLINK is a special type of MEMO field
-        DOUBLE("DOUBLE");
+        DOUBLE(SqlConstants.DOUBLE);
 
         private final String hsqlType;
 

diff --git a/src/main/java/net/ucanaccess/type/SqlConstants.java b/src/main/java/net/ucanaccess/type/SqlConstants.java
@@ -11,21 +11,26 @@ public final class SqlConstants {
     public static final String ALTER                 = "ALTER";
     public static final String AND                   = "AND";
     public static final String ASC_OR_DESC           = "ASC_OR_DESC";
-    public static final String COLUMNS_VIEW          = "COLUMNS_VIEW";
+    public static final String BLOB                  = "BLOB";
+    public static final String BOOLEAN               = "BOOLEAN";
     public static final String COLUMN_NAME           = "COLUMN_NAME";
     public static final String COLUMN_SIZE           = "COLUMN_SIZE";
+    public static final String COLUMNS_VIEW          = "COLUMNS_VIEW";
     public static final String COUNT_STAR            = "COUNT(*)";
     public static final String CREATE                = "CREATE";
     public static final String DATA_TYPE             = "DATA_TYPE";
+    public static final String DECIMAL               = "DECIMAL";
     public static final String DECIMAL_DIGITS        = "DECIMAL_DIGITS";
     public static final String DELETE                = "DELETE";
     public static final String DISTINCT              = "DISTINCT";
+    public static final String DOUBLE                = "DOUBLE";
     public static final String DROP                  = "DROP";
     public static final String ESCAPED_COLUMN_NAME   = "ESCAPED_COLUMN_NAME";
     public static final String ESCAPED_TABLE_NAME    = "ESCAPED_TABLE_NAME";
     public static final String EXISTS                = "EXISTS";
-    public static final String FKCOLUMN_NAME         = "FKCOLUMN_NAME";
     public static final String FK_NAME               = "FK_NAME";
+    public static final String FKCOLUMN_NAME         = "FKCOLUMN_NAME";
+    public static final String FLOAT                 = "FLOAT";
     public static final String FROM                  = "FROM";
     public static final String GROUP_BY              = "GROUP BY";
     public static final String HAVING                = "HAVING";
@@ -49,9 +54,9 @@ public final class SqlConstants {
     public static final String ORDINAL_POSITION      = "ORDINAL_POSITION";
     public static final String ORIGINAL_TYPE         = "ORIGINAL_TYPE";
     public static final String PIVOT                 = "PIVOT";
+    public static final String PK_NAME               = "PK_NAME";
     public static final String PKCOLUMN_NAME         = "PKCOLUMN_NAME";
     public static final String PKTABLE_NAME          = "PKTABLE_NAME";
-    public static final String PK_NAME               = "PK_NAME";
     public static final String PUBLIC                = "PUBLIC";
     public static final String SELECT                = "SELECT";
     public static final String SELECT_COLUMN_ESCAPED = "SELECT_COLUMN_ESCAPED";
@@ -60,14 +65,15 @@ public final class SqlConstants {
     public static final String SYSTEM_SUBQUERY       = "SYSTEM_SUBQUERY";
     public static final String SYSTEM_TABLES         = "SYSTEM_TABLES";
     public static final String TABLE                 = "TABLE";
-    public static final String TABLES                = "TABLES";
     public static final String TABLE_CAT             = "TABLE_CAT";
     public static final String TABLE_CATALOG         = "TABLE_CATALOG";
     public static final String TABLE_ID              = "TABLE_ID";
     public static final String TABLE_NAME            = "TABLE_NAME";
     public static final String TABLE_PRIVILEGES      = "TABLE_PRIVILEGES";
     public static final String TABLE_SCHEM           = "TABLE_SCHEM";
     public static final String TABLE_SCHEMA          = "TABLE_SCHEMA";
+    public static final String TABLES                = "TABLES";
+    public static final String TIMESTAMP             = "TIMESTAMP";
     public static final String TRUNCATE              = "TRUNCATE";
     public static final String UNION                 = "UNION";
     public static final String UNION_ALL             = "UNION ALL";

diff --git a/src/test/java/net/ucanaccess/test/UcanaccessBaseTest.java b/src/test/java/net/ucanaccess/test/UcanaccessBaseTest.java
@@ -43,7 +43,6 @@ public abstract class UcanaccessBaseTest extends AbstractBaseTest {
 
     private File                   fileAccDb;
     private AccessVersion          accessVersion;
-    @SuppressWarnings("checkstyle:VisibilityModifierCheck")
     protected UcanaccessConnection ucanaccess;
     private UcanaccessConnection   verifyConnection;