fix: support abnormal table name

teletha · Aug 28, 2024 · 11457f0 · 11457f0
1 parent 5e359cc
commit 11457f0
Show file tree

Hide file tree

Showing 14 changed files with 158 additions and 13 deletions.
diff --git a/src/main/java/typewriter/h2/H2.java b/src/main/java/typewriter/h2/H2.java
@@ -54,6 +54,14 @@ public class H2 extends Dialect {
     private H2() {
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String quote() {
+        return "\"";
+    }
+
     /**
      * {@inheritDoc}
      */

diff --git a/src/main/java/typewriter/rdb/RDB.java b/src/main/java/typewriter/rdb/RDB.java
@@ -97,7 +97,7 @@ public RDB(Class<M> type, String name, Dialect dialect, String url) {
         Map<String, String> rows = new HashMap();
         try (Connection connection = provider.get()) {
             DatabaseMetaData meta = connection.getMetaData();
-            try (ResultSet columns = meta.getColumns(null, null, tableName.replaceAll(dialect.quote(), ""), null)) {
+            try (ResultSet columns = meta.getColumns(null, null, this.name, null)) {
                 while (columns.next()) {
                     rows.put(columns.getString("COLUMN_NAME"), columns.getString("TYPE_NAME"));
                 }
@@ -130,8 +130,8 @@ private RDB(Model<M> model, String name, Dialect dialect, WiseSupplier<Connectio
         }
 
         this.model = model;
-        this.name = name;
-        this.tableName = dialect.quote() + name.replaceAll("[$\\.\s]+", "_") + dialect.quote();
+        this.name = name.replaceAll("['\"\\s]+", "_");
+        this.tableName = dialect.quote() + this.name + dialect.quote();
         this.dialect = dialect;
         this.provider = provider;
     }

diff --git a/src/test/java/typewriter/api/AbnormalTableNameTestSet.java b/src/test/java/typewriter/api/AbnormalTableNameTestSet.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.api;
+
+import org.junit.jupiter.api.Test;
+
+import typewriter.api.model.DerivableModel;
+
+public interface AbnormalTableNameTestSet extends Testable {
+
+    @Test
+    default void dot() {
+        createEmptyDB(Abnormal.class, "dot...");
+    }
+
+    @Test
+    default void doller() {
+        createEmptyDB(Abnormal.class, "$doller$");
+    }
+
+    @Test
+    default void whiteSpace() {
+        createEmptyDB(Abnormal.class, "white space");
+    }
+
+    @Test
+    default void reservedWord() {
+        createEmptyDB(Abnormal.class, "SELECT");
+    }
+
+    @Test
+    default void doubleQuote() {
+        createEmptyDB(Abnormal.class, "\"quoted\"");
+    }
+
+    @Test
+    default void singleQuote() {
+        createEmptyDB(Abnormal.class, "someone's");
+    }
+
+    class Abnormal extends DerivableModel {
+        public int item;
+    }
+}
diff --git a/src/test/java/typewriter/api/Testable.java b/src/test/java/typewriter/api/Testable.java
@@ -21,7 +21,18 @@ public interface Testable {
      * @param type
      * @return
      */
-    <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type);
+    default <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
+        return createEmptyDB(type, type.getName());
+    }
+
+    /**
+     * Create the {@link QueryExecutor} for test.
+     * 
+     * @param <M>
+     * @param type
+     * @return
+     */
+    <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name);
 
     /**
      * Create the {@link QueryExecutor} for test with initial models.

diff --git a/src/test/java/typewriter/duck/AbnormalTableNameTest.java b/src/test/java/typewriter/duck/AbnormalTableNameTest.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.duck;
+
+import typewriter.api.AbnormalTableNameTestSet;
+
+public class AbnormalTableNameTest extends DuckTestBase implements AbnormalTableNameTestSet {
+}
diff --git a/src/test/java/typewriter/duck/DuckTestBase.java b/src/test/java/typewriter/duck/DuckTestBase.java
@@ -36,7 +36,7 @@ void release() {
      * {@inheritDoc}
      */
     @Override
-    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
-        return (Q) new RDB(type, type.getName(), RDB.DuckDB, db);
+    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name) {
+        return (Q) new RDB(type, name, RDB.DuckDB, db);
     }
 }
diff --git a/src/test/java/typewriter/h2/AbnormalTableNameTest.java b/src/test/java/typewriter/h2/AbnormalTableNameTest.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.h2;
+
+import typewriter.api.AbnormalTableNameTestSet;
+
+public class AbnormalTableNameTest extends H2TestBase implements AbnormalTableNameTestSet {
+}
diff --git a/src/test/java/typewriter/h2/H2TestBase.java b/src/test/java/typewriter/h2/H2TestBase.java
@@ -36,7 +36,7 @@ void release() {
      * {@inheritDoc}
      */
     @Override
-    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
-        return (Q) new RDB(type, type.getName(), RDB.H2, db);
+    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name) {
+        return (Q) new RDB(type, name, RDB.H2, db);
     }
 }
diff --git a/src/test/java/typewriter/maria/AbnormalTableNameTest.java b/src/test/java/typewriter/maria/AbnormalTableNameTest.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.maria;
+
+import typewriter.api.AbnormalTableNameTestSet;
+
+public class AbnormalTableNameTest extends MariaDBTestBase implements AbnormalTableNameTestSet {
+}
diff --git a/src/test/java/typewriter/maria/MariaDBTestBase.java b/src/test/java/typewriter/maria/MariaDBTestBase.java
@@ -84,7 +84,7 @@ void release() throws ManagedProcessException {
      * {@inheritDoc}
      */
     @Override
-    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
-        return (Q) new RDB(type, type.getName(), RDB.MariaDB, url);
+    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name) {
+        return (Q) new RDB(type, name, RDB.MariaDB, url);
     }
 }
diff --git a/src/test/java/typewriter/mongo/AbnormalTableNameTest.java b/src/test/java/typewriter/mongo/AbnormalTableNameTest.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.mongo;
+
+import typewriter.api.AbnormalTableNameTestSet;
+
+public class AbnormalTableNameTest extends MongoTestBase implements AbnormalTableNameTestSet {
+}
diff --git a/src/test/java/typewriter/mongo/MongoTestBase.java b/src/test/java/typewriter/mongo/MongoTestBase.java
@@ -46,7 +46,7 @@ void teardown() {
      * {@inheritDoc}
      */
     @Override
-    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
+    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name) {
         return (Q) new Mongo(type, client);
     }
 

diff --git a/src/test/java/typewriter/sqlite/AbnormalTableNameTest.java b/src/test/java/typewriter/sqlite/AbnormalTableNameTest.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2024 The TYPEWRITER Development Team
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          https://opensource.org/licenses/MIT
+ */
+package typewriter.sqlite;
+
+import typewriter.api.AbnormalTableNameTestSet;
+
+public class AbnormalTableNameTest extends SQLiteTestBase implements AbnormalTableNameTestSet {
+}
diff --git a/src/test/java/typewriter/sqlite/SQLiteTestBase.java b/src/test/java/typewriter/sqlite/SQLiteTestBase.java
@@ -36,7 +36,7 @@ void release() {
      * {@inheritDoc}
      */
     @Override
-    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type) {
-        return (Q) new RDB(type, type.getName(), RDB.SQLite, db);
+    public <M extends IdentifiableModel, Q extends QueryExecutor<M, Signal<M>, ?, Q>> Q createEmptyDB(Class<M> type, String name) {
+        return (Q) new RDB(type, name, RDB.SQLite, db);
     }
 }