Merge pull request #43 from ZorTik/development

Development

Author: ZorTik

asql-api/src/main/java/me/zort/sqllib/internal/annotation/LinkedOne.java

@@ -1,5 +1,7 @@
 package me.zort.sqllib.internal.annotation;
 
+import org.jetbrains.annotations.ApiStatus;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -25,6 +27,7 @@
  *
  * @author ZorTik
  */
+@ApiStatus.Experimental
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 public @interface LinkedOne {

asql-core/src/main/java/me/zort/sqllib/SQLConnectionRegistry.java

@@ -50,6 +50,7 @@ public static void debug(Connection connection, String message) {
   private static class RegistryCodeHandler implements SQLDatabaseConnection.CodeObserver {
     private final SQLDatabaseConnection connection;
 
+    // This will ensure that only connected instances are present in the registry
     @Override
     public void onNotified(int code) {
       if (code == SQLDatabaseConnection.Code.CONNECTED) {

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

@@ -31,9 +31,9 @@
 import me.zort.sqllib.mapping.DefaultStatementMappingFactory;
 import me.zort.sqllib.mapping.MappingRegistryImpl;
 import me.zort.sqllib.mapping.ProxyInstanceImpl;
-import me.zort.sqllib.model.schema.DatabaseSchemaBuilder;
-import me.zort.sqllib.model.schema.EntitySchemaBuilder;
-import me.zort.sqllib.model.schema.SQLSchemaSynchronizer;
+import me.zort.sqllib.model.builder.DatabaseSchemaBuilder;
+import me.zort.sqllib.model.builder.EntitySchemaBuilder;
+import me.zort.sqllib.model.SQLSchemaSynchronizer;
 import me.zort.sqllib.pool.PooledSQLDatabaseConnection;
 import me.zort.sqllib.transaction.Transaction;
 import me.zort.sqllib.util.Validator;

asql-core/src/main/java/me/zort/sqllib/SQLDatabaseOptions.java

@@ -7,7 +7,6 @@
 import me.zort.sqllib.api.ISQLDatabaseOptions;
 import me.zort.sqllib.api.options.NamingStrategy;
 import me.zort.sqllib.internal.Defaults;
-import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
 import org.jetbrains.annotations.NotNull;
 
 @AllArgsConstructor

asql-core/src/main/java/me/zort/sqllib/SQLiteDatabaseConnection.java

@@ -8,9 +8,9 @@
 import me.zort.sqllib.internal.factory.SQLConnectionFactory;
 import me.zort.sqllib.internal.query.*;
 import me.zort.sqllib.internal.query.part.SetStatement;
-import me.zort.sqllib.model.column.SQLiteColumnQueryBuilder;
-import me.zort.sqllib.model.column.SQLiteColumnTypeAdjuster;
-import me.zort.sqllib.model.schema.SQLSchemaSynchronizer;
+import me.zort.sqllib.model.builder.SQLiteColumnQueryBuilder;
+import me.zort.sqllib.model.adjuster.SQLiteColumnTypeAdjuster;
+import me.zort.sqllib.model.SQLSchemaSynchronizer;
 import me.zort.sqllib.util.PrimaryKey;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

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

@@ -3,15 +3,15 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import me.zort.sqllib.api.options.NamingStrategy;
-import me.zort.sqllib.naming.SymbolSeparatedNamingStrategy;
+import me.zort.sqllib.naming.SnakeCaseNamingStrategy;
 
 public final class Defaults {
 
   public static final String DEFAULT_DRIVER = "com.mysql.jdbc.Driver";
   public static final boolean DEFAULT_AUTO_RECONNECT = true;
   public static final boolean DEFAULT_DEBUG = false;
   public static final boolean DEFAULT_LOG_SQL_ERRORS = true;
-  public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SymbolSeparatedNamingStrategy('_');
+  public static final NamingStrategy DEFAULT_NAMING_STRATEGY = new SnakeCaseNamingStrategy('_');
 
   public static final Gson DEFAULT_GSON = new GsonBuilder()
           .enableComplexMapKeySerialization()

asql-core/src/main/java/me/zort/sqllib/internal/fieldResolver/ConstructorParameterResolver.java

@@ -24,8 +24,9 @@ public Object obtainValue(
           String convertedName,
           Type type
   ) {
-    if (!(element instanceof Parameter) || !(((Parameter) element).getDeclaringExecutable() instanceof Constructor))
+    if (!(element instanceof Parameter) || !(((Parameter) element).getDeclaringExecutable() instanceof Constructor)) {
       return null;
+    }
 
     Parameter p = (Parameter) element;
     Matcher matcher = argumentPattern.matcher(p.getName());

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

@@ -0,0 +1,18 @@
+package me.zort.sqllib.internal.query;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Top-level query node that is used to build a query.
+ *
+ * @author ZorTik
+ */
+public abstract class AncestorQueryNode extends QueryNode<QueryNode<?>> {
+  public AncestorQueryNode() {
+    this(new ArrayList<>());
+  }
+  public AncestorQueryNode(List<QueryNode<?>> initial) {
+    super(null, initial, QueryPriority.GENERAL);
+  }
+}

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

@@ -4,12 +4,13 @@
 import me.zort.sqllib.api.Executive;
 import me.zort.sqllib.SQLDatabaseConnection;
 import me.zort.sqllib.internal.query.part.LimitStatement;
+import me.zort.sqllib.internal.query.part.OffsetStatement;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Objects;
 
-public class DeleteQuery extends QueryNode<QueryNode<?>> implements Executive, Conditional<DeleteQuery>, Limitable<DeleteQuery> {
+public class DeleteQuery extends AncestorQueryNode implements Executive, Conditional<DeleteQuery>, Limitable<DeleteQuery> {
 
   private String table;
 
@@ -25,7 +26,7 @@ public DeleteQuery(@Nullable SQLDatabaseConnection connection) {
   }
 
   public DeleteQuery(@Nullable SQLDatabaseConnection connection, @Nullable String table) {
-    super(null, new ArrayList<>(), QueryPriority.GENERAL);
+    super(new ArrayList<>());
     this.table = table;
     this.connection = connection;
   }
@@ -35,6 +36,12 @@ public DeleteQuery from(String table) {
     return this;
   }
 
+  @Override
+  public DeleteQuery offset(int offset) {
+    then(new OffsetStatement<>(this, new ArrayList<>(), offset));
+    return this;
+  }
+
   public DeleteQuery limit(int limit) {
     then(new LimitStatement<>(this, new ArrayList<>(), limit));
     return this;

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

@@ -11,7 +11,7 @@
 import java.util.ArrayList;
 import java.util.Objects;
 
-public class InsertQuery extends QueryNode<QueryNode<?>> implements Executive, Conditional<InsertQuery> {
+public class InsertQuery extends AncestorQueryNode implements Executive, Conditional<InsertQuery> {
 
   @Getter
   private String table;
@@ -31,7 +31,7 @@ public InsertQuery(@Nullable SQLDatabaseConnection connection) {
   }
 
   public InsertQuery(@Nullable SQLDatabaseConnection connection, @Nullable String table) {
-    super(null, new ArrayList<>(), QueryPriority.GENERAL);
+    super(new ArrayList<>());
     this.table = table;
     this.connection = connection;
     this.defs = new String[0];