Query creator method rename

skodjob · Jan 16, 2024 · 8f46291 · 8f46291
1 parent 1b81ab9
commit 8f46291
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 28 deletions.
diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/AbstractBasicDao.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/AbstractBasicDao.java
@@ -96,7 +96,7 @@ public void dropTable(DatabaseEntry databaseEntry) {
         DatabaseTableMetadata metadata = databaseEntry.getDatabaseTableMetadata();
         try (Connection conn = source.getConnection();
                 Statement stmt = conn.createStatement()) {
-            stmt.execute(queryCreator.dropTable(metadata));
+            stmt.execute(queryCreator.dropTableQuery(metadata));
         }
         catch (SQLException ex) {
             LOG.error("Could not drop table " + metadata.getName());

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/MysqlDao.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/MysqlDao.java
@@ -34,8 +34,8 @@ public void resetDatabase() {
         try (Connection conn = source.getConnection();
                 Statement stmt = conn.createStatement()) {
             String schema = conn.getCatalog();
-            stmt.execute(queryCreator.dropDatabase(schema));
-            stmt.execute(queryCreator.createDatabase(schema));
+            stmt.execute(queryCreator.dropDatabaseQuery(schema));
+            stmt.execute(queryCreator.createDatabaseQuery(schema));
             stmt.execute(((MysqlQueryCreator) queryCreator).useDatabase(schema));
             LOG.info("Successfully reset database");
         }

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/PostgresDao.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/dao/PostgresDao.java
@@ -10,7 +10,6 @@
 import java.sql.Statement;
 
 import jakarta.enterprise.context.Dependent;
-import jakarta.enterprise.context.RequestScoped;
 import jakarta.inject.Inject;
 
 
@@ -35,8 +34,8 @@ public void resetDatabase() {
         try (Connection conn = source.getConnection();
                 Statement stmt = conn.createStatement()) {
             String schema = "public";
-            stmt.execute(queryCreator.dropDatabase(schema));
-            stmt.execute(queryCreator.createDatabase(schema));
+            stmt.execute(queryCreator.dropDatabaseQuery(schema));
+            stmt.execute(queryCreator.createDatabaseQuery(schema));
             LOG.info("Successfully reset database");
         }
         catch (SQLException ex) {

diff --git a/...anipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/AbstractBasicQueryCreator.java b/...anipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/AbstractBasicQueryCreator.java
@@ -105,7 +105,7 @@ public String addColumnsQuery(List<DatabaseColumn> columns, String databaseName)
     }
 
     @Override
-    public String dropTable(DatabaseTableMetadata databaseTableMetadata) {
+    public String dropTableQuery(DatabaseTableMetadata databaseTableMetadata) {
         String query = "DROP TABLE IF EXISTS " + databaseTableMetadata.getName();
         LOG.debug("Created DROP TABLE query: " + query);
         return query;

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/MysqlQueryCreator.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/MysqlQueryCreator.java
@@ -14,14 +14,14 @@ public MysqlQueryCreator() {
     }
 
     @Override
-    public String dropDatabase(String schema) {
+    public String dropDatabaseQuery(String schema) {
         String query = "DROP SCHEMA IF EXISTS " + schema;
         LOG.debug("Created DROP DATABASE query: " + query);
         return query;
     }
 
     @Override
-    public String createDatabase(String schema) {
+    public String createDatabaseQuery(String schema) {
         String query = "CREATE SCHEMA " + schema;
         LOG.debug("Created CREATE DATABASE query: " + query);
         return query;

diff --git a/...ase-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/PostgresQueryCreator.java b/...ase-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/PostgresQueryCreator.java
@@ -41,14 +41,14 @@ public String createTableQuery(DatabaseTableMetadata databaseTableMetadata) {
     }
 
     @Override
-    public String dropDatabase(String schema) {
+    public String dropDatabaseQuery(String schema) {
         String query = "DROP SCHEMA IF EXISTS " + schema + " CASCADE";
         LOG.debug("Created DROP SCHEMA query: " + query);
         return query;
     }
 
     @Override
-    public String createDatabase(String schema) {
+    public String createDatabaseQuery(String schema) {
         String query = "CREATE SCHEMA " + schema;
         LOG.debug("Created CREATE SCHEMA query: " + query);
         return query;

diff --git a/database-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/QueryCreator.java b/database-manipulation-tool/src/main/java/io/skodjob/dmt/queryCreator/QueryCreator.java
@@ -20,9 +20,9 @@ public interface QueryCreator {
 
     String addColumnsQuery(List<DatabaseColumn> columns, String databaseName);
 
-    String dropTable(DatabaseTableMetadata databaseTableMetadata);
+    String dropTableQuery(DatabaseTableMetadata databaseTableMetadata);
 
-    String dropDatabase(String schema);
+    String dropDatabaseQuery(String schema);
 
-    String createDatabase(String schema);
+    String createDatabaseQuery(String schema);
 }
diff --git a/database-manipulation-tool/src/main/resources/application.properties b/database-manipulation-tool/src/main/resources/application.properties
@@ -43,4 +43,8 @@ quarkus.vertx.max-event-loop-execute-time=1000
 #%prod.quarkus.mongodb.devservices.enabled=false
 #%prod.quarkus.mongodb.main.connection-string=mongodb://quarkus_user:quarkus_test@localhost:27017
 #%prod.quarkus.mongodb.main.enabled=true
-#%prod.mongodb.database=quarkus_test
+#%prod.mongodb.database=quarkus_test
+
+%test.quarkus.datasource.postgresql.enabled=false
+%test.quarkus.datasource.mysql.enabled=false
+%test.quarkus.mongodb.main.enabled=false
diff --git a/...se-manipulation-tool/src/test/java/io/skodjob/dmt/queryCreator/MysqlQueryCreatorTest.java b/...se-manipulation-tool/src/test/java/io/skodjob/dmt/queryCreator/MysqlQueryCreatorTest.java
@@ -52,28 +52,28 @@ void addColumnsQuery() {
     }
 
     @Test
-    void dropTable() {
+    void dropTableQuery() {
         String expectedQuery = "DROP TABLE IF EXISTS TestTable";
-        String actualQuery = mysqlQueryCreator.dropTable(generateTableMetadata());
+        String actualQuery = mysqlQueryCreator.dropTableQuery(generateTableMetadata());
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 
     @Test
-    void dropDatabase() {
+    void dropDatabaseQuery() {
         String expectedQuery = "DROP SCHEMA IF EXISTS TestSchema";
-        String actualQuery = mysqlQueryCreator.dropDatabase("TestSchema");
+        String actualQuery = mysqlQueryCreator.dropDatabaseQuery("TestSchema");
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 
     @Test
-    void createDatabase() {
+    void createDatabaseQuery() {
         String expectedQuery = "CREATE SCHEMA TestSchema";
-        String actualQuery = mysqlQueryCreator.createDatabase("TestSchema");
+        String actualQuery = mysqlQueryCreator.createDatabaseQuery("TestSchema");
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 
     @Test
-    void useDatabase() {
+    void useDatabaseQuery() {
         String expectedQuery = "USE TestSchema";
         String actualQuery = mysqlQueryCreator.useDatabase("TestSchema");
         Assertions.assertEquals(expectedQuery, actualQuery);

diff --git a/...manipulation-tool/src/test/java/io/skodjob/dmt/queryCreator/PostgresQueryCreatorTest.java b/...manipulation-tool/src/test/java/io/skodjob/dmt/queryCreator/PostgresQueryCreatorTest.java
@@ -51,23 +51,23 @@ void addColumnsQuery() {
     }
 
     @Test
-    void dropTable() {
+    void dropTableQuery() {
         String expectedQuery = "DROP TABLE IF EXISTS TestTable";
-        String actualQuery = postgresQueryCreator.dropTable(generateTableMetadata());
+        String actualQuery = postgresQueryCreator.dropTableQuery(generateTableMetadata());
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 
     @Test
-    void dropDatabase() {
+    void dropDatabaseQuery() {
         String expectedQuery = "DROP SCHEMA IF EXISTS TestSchema CASCADE";
-        String actualQuery = postgresQueryCreator.dropDatabase("TestSchema");
+        String actualQuery = postgresQueryCreator.dropDatabaseQuery("TestSchema");
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 
     @Test
-    void createDatabase() {
+    void createDatabaseQuery() {
         String expectedQuery = "CREATE SCHEMA TestSchema";
-        String actualQuery = postgresQueryCreator.createDatabase("TestSchema");
+        String actualQuery = postgresQueryCreator.createDatabaseQuery("TestSchema");
         Assertions.assertEquals(expectedQuery, actualQuery);
     }
 }