Merge pull request #38 from ZorTik/development

Development

Author: ZorTik

api/src/main/java/me/zort/sqllib/api/data/QueryRowsResult.java

@@ -27,4 +27,12 @@ public QueryRowsResult<T> rejectMessage(String message) {
         return this;
     }
 
+    @Override
+    public String toString() {
+        return "QueryRowsResult{" +
+                "successful=" + successful +
+                ", rejectMessage='" + rejectMessage + '\'' +
+                ", data=" + super.toString() +
+                '}';
+    }
 }

api/src/main/java/me/zort/sqllib/api/model/TableSchema.java

@@ -14,6 +14,13 @@ public ColumnDefinition getDefinitionDetails(int index) {
         return definitions[index];
     }
 
+    public ColumnDefinition getDefinitionDetails(String name) {
+        for (ColumnDefinition definition : definitions) {
+            if (definition.getName().equals(name)) return definition;
+        }
+        return null;
+    }
+
     public String getDefinitionName(int index) {
         return getDefinitionDetails(index).getName();
     }

core/src/main/java/me/zort/sqllib/SQLDatabaseConnectionImpl.java

@@ -415,7 +415,7 @@ QueryRowsResult<Row> query(final @NotNull Query query, boolean isRetry) {
             }
 
             cacheManager.set(query, result);
-
+            debug(result);
             return result;
         } catch (SQLException e) {
             if (!isRetry && e.getMessage().contains("database connection closed")) {
@@ -460,6 +460,7 @@ public QueryResult exec(final @NotNull String query) {
             stmt.execute();
             QueryResultImpl result = new QueryResultImpl(true);
             cacheManager.set(query, result);
+            debug(result);
             return result;
         } catch (SQLException e) {
             if (!isRetry && e.getMessage().contains("database connection closed")) {
@@ -565,6 +566,13 @@ public void debug(String message) {
         if(options.isDebug()) logger.info(message);
     }
 
+    private void debug(QueryResult result) {
+        debug("Query result: " + result);
+        if (result instanceof QueryRowsResult) {
+            debug("Rows: " + ((QueryRowsResult<?>) result).size());
+        }
+    }
+
     @Override
     public void close() {
         if (errorCount > 0 && getAssignedPool() != null) {

core/src/main/java/me/zort/sqllib/internal/impl/QueryResultImpl.java

@@ -25,4 +25,11 @@ public QueryResultImpl rejectMessage(String message) {
         return this;
     }
 
+    @Override
+    public String toString() {
+        return "QueryResultImpl{" +
+                "successful=" + successful +
+                ", rejectMessage='" + rejectMessage + '\'' +
+                '}';
+    }
 }

core/src/main/java/me/zort/sqllib/mapping/DefaultResultAdapter.java

@@ -17,7 +17,7 @@ public Object adaptResult(Method method, QueryResult result) {
         if(returnType.equals(QueryResult.class)) {
             return result;
         } else if (isVoid(returnType) || !(result instanceof QueryRowsResult)) {
-            return null;
+            return noResult(returnType, result.isSuccessful());
         }
         QueryRowsResult<?> rows = (QueryRowsResult<?>) result;
         if (List.class.isAssignableFrom(returnType)) return rows;
@@ -38,6 +38,12 @@ public Class<?> retrieveResultType(Method method) {
         }
     }
 
+    private static <T> Object noResult(Class<T> returnType, boolean successful) {
+        if (Optional.class.isAssignableFrom(returnType)) return Optional.empty();
+        if (List.class.isAssignableFrom(returnType)) return new QueryRowsResult<T>(successful);
+        return null;
+    }
+
     // List<T>
     private static Class<?> getGenericArgument(Class<?> clazz, Type genericType, boolean throwNotFound) {
         Type[] typeParameters = ((ParameterizedType) genericType).getActualTypeArguments();

core/src/main/java/me/zort/sqllib/model/column/SQLColumnQueryBuilder.java

@@ -4,8 +4,25 @@
 
 import java.util.List;
 
+/**
+ * This interface is used to build queries for column actions that are
+ * used while synchronizing models.
+ *
+ * @author ZorTik
+ */
 public interface SQLColumnQueryBuilder {
 
+    /**
+     * This method should return queries that result in modifying the 'to' column
+     * to the 'from'. In simple terms, 'to' should be changed to 'from' definition
+     * using the returned queries.
+     *
+     * @param action The column action
+     * @param table Table name
+     * @param from The new column definition
+     * @param to The old column definition
+     * @return List of SQL queries
+     */
     List<String> buildActionQuery(ColumnAction action, String table, ColumnDefinition from, ColumnDefinition to);
 
     enum ColumnAction {

core/src/main/java/me/zort/sqllib/model/column/SQLiteColumnQueryBuilder.java

@@ -13,11 +13,11 @@ public class SQLiteColumnQueryBuilder extends InnoColumnQueryBuilder {
     private final SQLiteDatabaseConnection connection;
     @Override
     public List<String> buildActionQuery(ColumnAction action, String table, ColumnDefinition from, ColumnDefinition to) {
-        if (action.equals(ColumnAction.MODIFY)) {
+        if (action.equals(ColumnAction.MODIFY) || action.equals(ColumnAction.RENAME)) {
             TableSchema schema = connection.getSchemaBuilder(table).buildTableSchema();
             String[] newDefinitions = new String[schema.size()];
             for (int i = 0; i < schema.size(); i++) {
-                if (schema.getDefinitionName(i).equals(from.getName())) {
+                if (schema.getDefinitionName(i).equals(to.getName())) {
                     newDefinitions[i] = from.getName() + " " + from.getType();
                 } else {
                     newDefinitions[i] = schema.getDefinition(i);

core/src/main/java/me/zort/sqllib/model/schema/SQLSchemaSynchronizer.java

@@ -26,9 +26,10 @@ public class SQLSchemaSynchronizer implements SchemaSynchronizer<SQLDatabaseConn
     @Override
     public QueryResult synchronize(SQLDatabaseConnection source, TableSchema from, TableSchema to) {
         List<String> columnQueries = new ArrayList<>();
-        for (int i = 0; i < Math.max(from.size(), to.size()); i++) {
-            ColumnDefinition fromDefinition = from.size() > i ? from.getDefinitionDetails(i) : null;
-            ColumnDefinition toDefinition = to.size() > i ? to.getDefinitionDetails(i) : null;
+        ColumnDefinition[][] definitions = orderDefinitions(from, to);
+        for (int i = 0; i < Math.max(definitions[0].length, definitions[1].length); i++) {
+            final ColumnDefinition fromDefinition = definitions[0][i];
+            final ColumnDefinition toDefinition = definitions[1][i];
 
             if (fromDefinition == null && toDefinition != null) {
                 columnQueries.addAll(columnQueryBuilder.buildActionQuery(SQLColumnQueryBuilder.ColumnAction.DROP, from.getTable(), fromDefinition, toDefinition));
@@ -55,4 +56,25 @@ public QueryResult synchronize(SQLDatabaseConnection source, TableSchema from, T
         }
         return results.stream().allMatch(QueryResult::isSuccessful) ? QueryResult.successful() : new QueryResultImpl(false);
     }
+
+    private static ColumnDefinition[][] orderDefinitions(TableSchema one, TableSchema two) {
+        int maxSize = Math.max(one.size(), two.size());
+        ColumnDefinition[][] definitions = new ColumnDefinition[2][maxSize];
+        for (int i = 0; i < maxSize; i++) {
+            if (one.size() > i && two.size() > i && two.getDefinitionDetails(one.getDefinitionName(i)) != null) {
+                definitions[0][i] = one.getDefinitionDetails(i);
+                definitions[1][i] = two.getDefinitionDetails(one.getDefinitionName(i));
+            } else if (one.size() > i && two.size() > i) {
+                definitions[0][i] = one.getDefinitionDetails(i);
+                definitions[1][i] = two.getDefinitionDetails(i);
+            } else if (one.size() > i) {
+                definitions[0][i] = one.getDefinitionDetails(i);
+                definitions[1][i] = null;
+            } else if (two.size() > i) {
+                definitions[1][i] = two.getDefinitionDetails(i);
+                definitions[0][i] = null;
+            }
+        }
+        return definitions;
+    }
 }