Tests & other major improvements and fixes

Author: ZorTik

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

@@ -0,0 +1,21 @@
+package me.zort.sqllib;
+
+import java.sql.Connection;
+
+public final class Logger {
+
+    private Logger() {
+    }
+
+    public static void debug(Connection connection, String message) {
+        SQLConnectionPool.find(connection)
+                .filter(c -> c instanceof SQLDatabaseConnectionImpl)
+                .ifPresent(c -> debug((SQLDatabaseConnectionImpl) c, message));
+    }
+
+    public static void debug(SQLDatabaseConnectionImpl connection, String message) {
+        if (connection.isDebug())
+            connection.debug(message);
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package me.zort.sqllib;
+
+import java.sql.Connection;
+
+public final class SQLClient {
+
+    private SQLClient() {
+    }
+
+    public static boolean isDebug(Connection connection) {
+        return SQLConnectionPool.find(connection)
+                .map(SQLDatabaseConnection::isDebug)
+                .orElse(false);
+    }
+
+}

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

@@ -0,0 +1,23 @@
+package me.zort.sqllib;
+
+import java.sql.Connection;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public final class SQLConnectionPool {
+
+    private SQLConnectionPool() {
+    }
+
+    private static final List<SQLDatabaseConnection> CONNECTIONS = new CopyOnWriteArrayList<>();
+
+    static void register(SQLDatabaseConnection connection) {
+        CONNECTIONS.add(connection);
+    }
+
+    static Optional<SQLDatabaseConnection> find(Connection connection) {
+        return CONNECTIONS.stream().filter(c -> c.getConnection() == connection).findFirst();
+    }
+
+}

…rt/sqllib/api/SQLDatabaseConnection.java …e/zort/sqllib/SQLDatabaseConnection.javacore/src/main/java/me/zort/sqllib/api/SQLDatabaseConnection.java renamed to core/src/main/java/me/zort/sqllib/SQLDatabaseConnection.java core/src/main/java/me/zort/sqllib/api/SQLDatabaseConnection.java renamed to core/src/main/java/me/zort/sqllib/SQLDatabaseConnection.java

@@ -1,6 +1,8 @@
-package me.zort.sqllib.api;
+package me.zort.sqllib;
 
 import lombok.Getter;
+import me.zort.sqllib.api.Query;
+import me.zort.sqllib.api.SQLConnection;
 import me.zort.sqllib.api.data.QueryResult;
 import me.zort.sqllib.api.data.QueryRowsResult;
 import me.zort.sqllib.api.data.Row;
@@ -26,6 +28,8 @@ public abstract class SQLDatabaseConnection implements SQLConnection {
     public SQLDatabaseConnection(SQLConnectionFactory connectionFactory) {
         this.connectionFactory = connectionFactory;
         this.connection = null;
+
+        SQLConnectionPool.register(this);
     }
 
     /**
@@ -79,6 +83,7 @@ public SQLDatabaseConnection(SQLConnectionFactory connectionFactory) {
      */
     public abstract QueryResult exec(Query query);
     public abstract boolean isLogSqlErrors();
+    public abstract boolean isDebug();
 
     public abstract SelectQuery select(String... cols);
     public abstract UpdateQuery update();

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

@@ -6,8 +6,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import me.zort.sqllib.api.Query;
-import me.zort.sqllib.api.SQLConnection;
-import me.zort.sqllib.api.SQLDatabaseConnection;
 import me.zort.sqllib.api.StatementFactory;
 import me.zort.sqllib.api.data.QueryResult;
 import me.zort.sqllib.api.data.QueryRowsResult;
@@ -161,7 +159,7 @@ protected Pair<String[], UnknownValueWrapper[]> buildDefsVals(Object obj) {
      */
     @Override
     public <T> QueryRowsResult<T> query(Query query, Class<T> typeClass) {
-        QueryRowsResult<Row> resultRows = query(query);
+        QueryRowsResult<Row> resultRows = query(query.getAncestor());
         QueryRowsResult<T> result = new QueryRowsResult<>(resultRows.isSuccessful());
         for(Row row : resultRows) {
             Optional.ofNullable(assignValues(row, typeClass))
@@ -227,6 +225,7 @@ private <T> T assignValues(Row row, Class<T> typeClass) {
         try {
             try {
                 Constructor<T> c = typeClass.getConstructor();
+                c.setAccessible(true);
                 instance = c.newInstance();
             } catch (NoSuchMethodException e) {
                 for(Constructor<?> c : typeClass.getConstructors()) {
@@ -277,7 +276,7 @@ private Object buildElementValue(AnnotatedElement element, Row row) {
         if(element instanceof Field) {
             name = ((Field) element).getName();
             type = ((Field) element).getGenericType();
-        } else if(element instanceof Parameter) {
+        } else if(element instanceof Parameter) { // TODO: Parameter names are arg[a-zA-Z0-9]+, use different strategy.
             name = ((Parameter) element).getName();
             type = ((Parameter) element).getType();
         } else {
@@ -363,6 +362,11 @@ public boolean isLogSqlErrors() {
         return options.isLogSqlErrors();
     }
 
+    @Override
+    public boolean isDebug() {
+        return options.isDebug();
+    }
+
     @SuppressWarnings("unchecked")
     private PreparedStatement buildStatement(Query query) throws SQLException {
         StatementFactory<PreparedStatement> factory = new DefaultStatementFactory(query);

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

@@ -1,7 +1,6 @@
 package me.zort.sqllib;
 
 import com.google.gson.internal.Primitives;
-import me.zort.sqllib.api.SQLDatabaseConnection;
 import me.zort.sqllib.api.repository.CachingSQLTableRepository;
 import me.zort.sqllib.api.repository.SQLTableRepository;
 import me.zort.sqllib.internal.annotation.JsonField;

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

@@ -36,7 +36,7 @@ public SQLiteDatabaseConnectionImpl(SQLConnectionFactory connectionFactory, SQLD
 
     /**
      * Performs an upsert query for defined object
-     * as stated in {@link me.zort.sqllib.api.SQLDatabaseConnection#save(String, Object)}.
+     * as stated in {@link SQLDatabaseConnection#save(String, Object)}.
      * <p>
      * Object needs to have {@link me.zort.sqllib.internal.annotation.PrimaryKey} annotation
      * set to determine which column is a primary key.

core/src/main/java/me/zort/sqllib/api/repository/CachingSQLTableRepository.java

@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import me.zort.sqllib.api.SQLDatabaseConnection;
+import me.zort.sqllib.SQLDatabaseConnection;
 
 import java.util.Map;
 import java.util.Optional;

core/src/main/java/me/zort/sqllib/api/repository/SQLTableRepository.java

@@ -4,7 +4,7 @@
 import lombok.Data;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import me.zort.sqllib.api.SQLDatabaseConnection;
+import me.zort.sqllib.SQLDatabaseConnection;
 import me.zort.sqllib.api.provider.Select;
 import me.zort.sqllib.internal.annotation.Id;
 import me.zort.sqllib.internal.annotation.PrimaryKey;

core/src/main/java/me/zort/sqllib/internal/query/DeleteQuery.java

@@ -2,7 +2,7 @@
 
 import lombok.Getter;
 import me.zort.sqllib.api.Executive;
-import me.zort.sqllib.api.SQLDatabaseConnection;
+import me.zort.sqllib.SQLDatabaseConnection;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -34,8 +34,7 @@ public DeleteQuery from(String table) {
     public QueryDetails buildQueryDetails() {
         Objects.requireNonNull(table, "Table cannot be null!");
 
-        return new QueryDetails.Builder("DELETE FROM <table>")
-                .placeholder("table", table)
+        return new QueryDetails.Builder("DELETE FROM " + table)
                 .build()
                 .append(buildInnerQuery());
     }