Support for raw prepared queries

Author: ZorTik

asql-core/src/main/java/me/zort/sqllib/internal/query/QueryNode.java

@@ -48,6 +48,39 @@ public QueryNode(@Nullable P parent, List<QueryNode<?>> initial, int priority) {
     this.details = new ConcurrentHashMap<>();
   }
 
+  /**
+   * Creates a new QueryNode from a query string in PreparedStatement format and
+   * parameters to replace question marks in the query. This is useful if there is no
+   * other way to create a query than using raw SQL details.
+   * <p></p>
+   * Example:
+   * <pre>
+   * Query query = QueryNode.fromRawQuery("SELECT * FROM table WHERE id = ?", 1);
+   * </pre>
+   *
+   * @param query
+   * @param params
+   * @return
+   */
+  public static QueryNode<?> fromRawQuery(String query, Object... params) {
+    return new QueryNode<>(null, Collections.emptyList(), QueryPriority.GENERAL) {
+      @Override
+      public QueryDetails buildQueryDetails() {
+        Map<String, Object> values = new HashMap<>();
+        String preparedStr;
+        int index = 0;
+        while (true) {
+          preparedStr = query.replaceFirst("\\?", String.format("<val_%d>", index));
+          if (preparedStr.equals(query)) {
+            break;
+          }
+          values.put("val_" + index, params[index]);
+        }
+        return new QueryDetails(preparedStr, values);
+      }
+    };
+  }
+
   /**
    * Builds the query string with placeholders containing values
    * for passing into PreparedStatement.

src/test/java/me/zort/sqllib/test/TestCase1.java

@@ -5,6 +5,8 @@
 import me.zort.sqllib.SQLConnectionBuilder;
 import me.zort.sqllib.internal.annotation.NullableField;
 import me.zort.sqllib.internal.annotation.PrimaryKey;
+import me.zort.sqllib.internal.query.QueryDetails;
+import me.zort.sqllib.internal.query.QueryNode;
 import me.zort.sqllib.pool.SQLConnectionPool;
 import me.zort.sqllib.SQLDatabaseConnection;
 import me.zort.sqllib.SQLDatabaseOptions;
@@ -14,6 +16,7 @@
 import me.zort.sqllib.api.provider.Select;
 import me.zort.sqllib.internal.impl.DefaultSQLEndpoint;
 import me.zort.sqllib.transaction.TransactionFlow;
+import me.zort.sqllib.util.Pair;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
 import org.junit.jupiter.api.*;
@@ -196,7 +199,16 @@ public void test6_Transactions() {
   }
 
   @Test
-  public void test7_Close() {
+  public void test7_RawNode() {
+    String raw = "SELECT * FROM users WHERE nickname = ?";
+    QueryNode<?> query = QueryNode.fromRawQuery(raw, "User1");
+    Pair<String, Object[]> preparedQuery = query.toPreparedQuery();
+    assertEquals(raw, preparedQuery.getFirst());
+    assertArrayEquals(new Object[]{"User1"}, preparedQuery.getSecond());
+  }
+
+  @Test
+  public void test8_Close() {
     System.out.println("Closing connection...");
     connection.disconnect();
     System.out.println("Connection closed");