Merge branch 'release/1.14'

Author: Maxlego08

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>fr.maxlego08.sarah</groupId>
   <artifactId>SarahORM</artifactId>
-  <version>1.13</version>
+  <version>1.14</version>
   <build>
     <plugins>
       <plugin>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>fr.maxlego08.sarah</groupId>
     <artifactId>SarahORM</artifactId>
-    <version>1.13</version>
+    <version>1.14</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/fr/maxlego08/sarah/SchemaBuilder.java

@@ -15,6 +15,8 @@
 import fr.maxlego08.sarah.requests.DeleteRequest;
 import fr.maxlego08.sarah.requests.DropTableRequest;
 import fr.maxlego08.sarah.requests.InsertRequest;
+import fr.maxlego08.sarah.requests.ModifyRequest;
+import fr.maxlego08.sarah.requests.RenameExecutor;
 import fr.maxlego08.sarah.requests.UpdateRequest;
 import fr.maxlego08.sarah.requests.UpsertRequest;
 
@@ -53,6 +55,7 @@ public class SchemaBuilder implements Schema {
     private final List<WhereCondition> whereConditions = new ArrayList<>();
     private final List<JoinCondition> joinConditions = new ArrayList<>();
     private final List<SelectCondition> selectColumns = new ArrayList<>();
+    private String newTableName;
     private String orderBy;
     private Migration migration;
     private boolean isDistinct;
@@ -62,6 +65,37 @@ private SchemaBuilder(String tableName, SchemaType schemaType) {
         this.schemaType = schemaType;
     }
 
+    public static Schema copy(String tableName, SchemaType newSchemaType, Schema oldSchema) {
+        SchemaBuilder schema = new SchemaBuilder(tableName, newSchemaType);
+
+        schema.columns.addAll(oldSchema.getColumns());
+        schema.primaryKeys.addAll(oldSchema.getPrimaryKeys());
+        schema.foreignKeys.addAll(oldSchema.getForeignKeys());
+        schema.whereConditions.addAll(oldSchema.getWhereConditions());
+        schema.joinConditions.addAll(oldSchema.getJoinConditions());
+        schema.selectColumns.addAll(oldSchema.getSelectColumns());
+        schema.orderBy = oldSchema.getOrderBy();
+        schema.migration = oldSchema.getMigration();
+        schema.isDistinct = oldSchema.isDistinct();
+        schema.newTableName = oldSchema.getNewTableName();
+
+        return schema;
+    }
+
+    public static Schema rename(String tableName, String newTableName) {
+        return rename(null, tableName, newTableName);
+    }
+
+    public static Schema rename(Migration migration, String tableName, String newTableName) {
+        SchemaBuilder schema = new SchemaBuilder(tableName, SchemaType.RENAME);
+        schema.newTableName = newTableName;
+        if (migration != null) {
+            schema.migration = migration;
+            MigrationManager.registerSchema(schema);
+        }
+        return schema;
+    }
+
     public static Schema create(Migration migration, String tableName, Class<?> template) {
         return create(migration, tableName, ConsumerConstructor.createConsumerFromTemplate(template, null));
     }
@@ -76,6 +110,16 @@ public static Schema create(Migration migration, String tableName, Consumer<Sche
         return schema;
     }
 
+    public static Schema modify(Migration migration, String tableName, Consumer<Schema> consumer) {
+        SchemaBuilder schema = new SchemaBuilder(tableName, SchemaType.MODIFY);
+        if (migration != null) {
+            schema.migration = migration;
+            MigrationManager.registerSchema(schema);
+        }
+        consumer.accept(schema);
+        return schema;
+    }
+
     public static Schema drop(Migration migration, String tableName) {
         SchemaBuilder schema = new SchemaBuilder(tableName, SchemaType.DROP);
         if (migration != null) {
@@ -651,6 +695,12 @@ public boolean isDistinct() {
     public int execute(DatabaseConnection databaseConnection, Logger logger) throws SQLException {
         Executor executor;
         switch (this.schemaType) {
+            case RENAME:
+                executor = new RenameExecutor(this);
+                break;
+            case MODIFY:
+                executor = new ModifyRequest(this);
+                break;
             case CREATE:
                 executor = new CreateRequest(this);
                 break;
@@ -706,4 +756,19 @@ public void addSelect(String prefix, String selectedColumn, String aliases, Obje
     public SchemaType getSchemaType() {
         return this.schemaType;
     }
+
+    @Override
+    public List<WhereCondition> getWhereConditions() {
+        return whereConditions;
+    }
+
+    @Override
+    public List<SelectCondition> getSelectColumns() {
+        return selectColumns;
+    }
+
+    @Override
+    public String getNewTableName() {
+        return newTableName;
+    }
 }

src/main/java/fr/maxlego08/sarah/database/Migration.java

@@ -24,6 +24,14 @@ protected void create(String table, Class<?> template) {
         SchemaBuilder.create(this, table, template);
     }
 
+    protected void drop(String table) {
+        SchemaBuilder.drop(this, table);
+    }
+
+    protected void modify(String table, Consumer<Schema> consumer) {
+        SchemaBuilder.modify(this, table, consumer);
+    }
+
     protected void createOrAlter(String table, Consumer<Schema> consumer) {
         this.create(table, consumer);
         this.alter = true;

src/main/java/fr/maxlego08/sarah/database/Schema.java

@@ -3,6 +3,8 @@
 import fr.maxlego08.sarah.DatabaseConnection;
 import fr.maxlego08.sarah.conditions.ColumnDefinition;
 import fr.maxlego08.sarah.conditions.JoinCondition;
+import fr.maxlego08.sarah.conditions.SelectCondition;
+import fr.maxlego08.sarah.conditions.WhereCondition;
 import fr.maxlego08.sarah.logger.Logger;
 
 import java.sql.PreparedStatement;
@@ -151,5 +153,11 @@ public interface Schema {
     Schema addColumn(ColumnDefinition column);
 
     void setMigration(Migration migration);
+
+    List<WhereCondition> getWhereConditions();
+
+    List<SelectCondition> getSelectColumns();
+
+    String getNewTableName();
 }
 

src/main/java/fr/maxlego08/sarah/database/SchemaType.java

@@ -3,13 +3,15 @@
 public enum SchemaType {
 
     CREATE,
+    MODIFY,
     DROP,
     UPSERT,
     UPDATE,
     INSERT,
     SELECT,
     SELECT_COUNT,
     DELETE,
-    ALTER
+    ALTER,
+    RENAME,
 
 }

src/main/java/fr/maxlego08/sarah/requests/InsertAllRequest.java

@@ -0,0 +1,62 @@
+package fr.maxlego08.sarah.requests;
+
+import fr.maxlego08.sarah.DatabaseConfiguration;
+import fr.maxlego08.sarah.DatabaseConnection;
+import fr.maxlego08.sarah.conditions.ColumnDefinition;
+import fr.maxlego08.sarah.database.Executor;
+import fr.maxlego08.sarah.database.Schema;
+import fr.maxlego08.sarah.logger.Logger;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public class InsertAllRequest implements Executor {
+
+    private final Schema schema;
+    private final String toTableName;
+
+    public InsertAllRequest(Schema schema, String toTableName) {
+        this.schema = schema;
+        this.toTableName = toTableName;
+    }
+
+    @Override
+    public int execute(DatabaseConnection databaseConnection, DatabaseConfiguration databaseConfiguration, Logger logger) {
+
+        StringBuilder insertBuilder = new StringBuilder("INSERT INTO " + this.toTableName + " (");
+        StringBuilder columns = new StringBuilder();
+
+        int size = this.schema.getColumns().size();
+        for (int i = 0; i < size; i++) {
+
+            ColumnDefinition columnDefinition = this.schema.getColumns().get(i);
+
+            columns.append(columnDefinition.getSafeName());
+            if (i < (size - 1)) {
+                columns.append(",");
+            }
+        }
+
+        insertBuilder.append(columns).append(") ");
+
+        insertBuilder.append("SELECT ").append(columns);
+        insertBuilder.append(" FROM ");
+        insertBuilder.append(this.schema.getTableName());
+
+        String insertQuery = databaseConfiguration.replacePrefix(insertBuilder.toString());
+
+        if (databaseConfiguration.isDebug()) {
+            logger.info("Executing SQL: " + insertQuery);
+        }
+
+        try (Connection connection = databaseConnection.getConnection(); PreparedStatement preparedStatement = connection.prepareStatement(insertQuery)) {
+            preparedStatement.executeUpdate();
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+            return -1;
+        }
+
+        return 0;
+    }
+}

src/main/java/fr/maxlego08/sarah/requests/ModifyRequest.java

@@ -0,0 +1,46 @@
+package fr.maxlego08.sarah.requests;
+
+import fr.maxlego08.sarah.DatabaseConfiguration;
+import fr.maxlego08.sarah.DatabaseConnection;
+import fr.maxlego08.sarah.SchemaBuilder;
+import fr.maxlego08.sarah.database.Executor;
+import fr.maxlego08.sarah.database.Schema;
+import fr.maxlego08.sarah.database.SchemaType;
+import fr.maxlego08.sarah.logger.Logger;
+
+import java.sql.SQLException;
+
+public class ModifyRequest implements Executor {
+
+    private final Schema schema;
+
+    public ModifyRequest(Schema schema) {
+        this.schema = schema;
+    }
+
+    @Override
+    public int execute(DatabaseConnection databaseConnection, DatabaseConfiguration databaseConfiguration, Logger logger) {
+
+        String tmpTableName = schema.getTableName() + "_tmp";
+        Schema tmpSchema = SchemaBuilder.copy(tmpTableName, SchemaType.CREATE, schema);
+
+        try {
+            tmpSchema.execute(databaseConnection, logger);
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+            return -1;
+        }
+
+        Executor executor = new InsertAllRequest(schema, tmpTableName);
+        executor.execute(databaseConnection, databaseConfiguration, logger);
+
+        executor = new DropTableRequest(schema);
+        executor.execute(databaseConnection, databaseConfiguration, logger);
+
+        executor = new RenameExecutor(SchemaBuilder.rename(tmpTableName, schema.getTableName()));
+        executor.execute(databaseConnection, databaseConfiguration, logger);
+
+        return 0;
+    }
+
+}

src/main/java/fr/maxlego08/sarah/requests/RenameExecutor.java

@@ -0,0 +1,43 @@
+package fr.maxlego08.sarah.requests;
+
+import fr.maxlego08.sarah.DatabaseConfiguration;
+import fr.maxlego08.sarah.DatabaseConnection;
+import fr.maxlego08.sarah.database.Executor;
+import fr.maxlego08.sarah.database.Schema;
+import fr.maxlego08.sarah.logger.Logger;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public class RenameExecutor implements Executor {
+
+    private final Schema schema;
+
+    public RenameExecutor(Schema schema) {
+        this.schema = schema;
+    }
+
+    @Override
+    public int execute(DatabaseConnection databaseConnection, DatabaseConfiguration databaseConfiguration, Logger logger) {
+
+        StringBuilder alterTableSQL = new StringBuilder("ALTER TABLE ");
+        alterTableSQL.append(this.schema.getTableName());
+        alterTableSQL.append(" RENAME TO ");
+        alterTableSQL.append(this.schema.getNewTableName());
+
+        String finalQuery = databaseConfiguration.replacePrefix(alterTableSQL.toString());
+        if (databaseConfiguration.isDebug()) {
+            logger.info("Executing SQL: " + finalQuery);
+        }
+
+        try (Connection connection = databaseConnection.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement(finalQuery)) {
+            preparedStatement.execute();
+            return preparedStatement.getUpdateCount();
+        } catch (SQLException exception) {
+            exception.printStackTrace();
+            return -1;
+        }
+    }
+}