feat: improved QueryBuilder with deleteFrom and update function

Author: ez-plugins

src/main/java/com/github/ezframework/javaquerybuilder/query/builder/CreateBuilder.java

@@ -10,19 +10,22 @@
 
 /**
  * Builder for SQL CREATE TABLE statements.
-    /**
-     * Builds the SQL CREATE TABLE statement with a dialect.
-     * @param dialect the SQL dialect (optional)
-     * @return the SQL result
-     * @throws IllegalStateException if table or columns are missing
-     */
-    public SqlResult build(SqlDialect dialect) {
+ *
+ * @author EzFramework
+ * @version 1.0.0
+ */
+public class CreateBuilder {
+
+    /** The table to create. */
     private String table;
+
     /** The columns and their SQL types. */
     private final Map<String, String> columns = new LinkedHashMap<>();
+
     /** The primary key columns. */
     private final List<String> primaryKeys = new ArrayList<>();
-    /** If true, adds IF NOT EXISTS. */
+
+    /** Whether to add IF NOT EXISTS. */
     private boolean ifNotExists = false;
 
     /**
@@ -67,22 +70,22 @@ public CreateBuilder ifNotExists() {
 
     /**
      * Builds the SQL CREATE TABLE statement.
+     *
      * @return the SQL result
-     * @throws IllegalStateException if table or columns are missing
+     * @throws IllegalStateException if table name or columns are missing
      */
-    
     public SqlResult build() {
         return build(null);
     }
 
     /**
-     * Builds the SQL CREATE TABLE statement with a dialect.
-     * @param dialect the SQL dialect (optional)
+     * Builds the SQL CREATE TABLE statement using the given dialect.
+     *
+     * @param dialect the SQL dialect to use; if {@code null}, the standard dialect is used
      * @return the SQL result
-     * @throws IllegalStateException if table or columns are missing
-    
+     * @throws IllegalStateException if table name or columns are missing
+     */
     public SqlResult build(SqlDialect dialect) {
-        
         if (table == null || columns.isEmpty()) {
             throw new IllegalStateException("Table name and at least one column are required");
         }
@@ -112,6 +115,7 @@ public SqlResult build(SqlDialect dialect) {
             public String getSql() {
                 return sql.toString();
             }
+
             @Override
             public List<Object> getParameters() {
                 return List.of();

src/main/java/com/github/ezframework/javaquerybuilder/query/builder/DeleteBuilder.java

@@ -2,9 +2,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import com.github.ezframework.javaquerybuilder.query.condition.Condition;
 import com.github.ezframework.javaquerybuilder.query.condition.ConditionEntry;
+import com.github.ezframework.javaquerybuilder.query.condition.Connector;
+import com.github.ezframework.javaquerybuilder.query.condition.Operator;
+import com.github.ezframework.javaquerybuilder.query.sql.SqlDialect;
+import com.github.ezframework.javaquerybuilder.query.sql.SqlResult;
 
 /**
  * Builder for SQL DELETE statements.
@@ -14,6 +19,16 @@
  */
 public class DeleteBuilder {
 
+    /** Simple comparison operators mapped to their SQL fragments. */
+    private static final Map<Operator, String> SIMPLE_OPS = Map.of(
+        Operator.EQ, " = ?",
+        Operator.NEQ, " != ?",
+        Operator.GT, " > ?",
+        Operator.GTE, " >= ?",
+        Operator.LT, " < ?",
+        Operator.LTE, " <= ?"
+    );
+
     /** The table to delete from. */
     private String table;
 
@@ -74,6 +89,32 @@ public DeleteBuilder whereIn(String column, List<?> values) {
     /**
      * Builds the SQL DELETE statement.
      *
+     * @return the SQL result
+     */
+    public SqlResult build() {
+        return build(null);
+    }
+
+    /**
+     * Builds the SQL DELETE statement using the given dialect.
+     *
+     * @param dialect the SQL dialect (may be null for standard SQL)
+     * @return the SQL result
+     */
+    public SqlResult build(final SqlDialect dialect) {
+        final StringBuilder sql = new StringBuilder();
+        final List<Object> params = new ArrayList<>();
+        sql.append("DELETE FROM ").append(table);
+        if (!conditions.isEmpty()) {
+            sql.append(" WHERE ");
+            for (int j = 0; j < conditions.size(); j++) {
+                final ConditionEntry cond = conditions.get(j);
+                if (j > 0) {
+                    sql.append(" ").append(cond.getConnector().name()).append(" ");
+                }
+                appendDmlCondition(sql, params, cond);
+            }
+        }
         return new SqlResult() {
             @Override
             public String getSql() {
@@ -87,6 +128,24 @@ public List<Object> getParameters() {
         };
     }
 
+    private void appendDmlCondition(StringBuilder sql, List<Object> params, ConditionEntry cond) {
+        final Operator op = cond.getCondition().getOperator();
+        sql.append(cond.getColumn());
+        if (SIMPLE_OPS.containsKey(op)) {
+            sql.append(SIMPLE_OPS.get(op));
+            params.add(cond.getCondition().getValue());
+        } else if (op == Operator.IN) {
+            handleInOperator(sql, params, cond);
+        } else if (op == Operator.NOT_IN) {
+            handleNotInOperator(sql, params, cond);
+        } else if (op == Operator.BETWEEN) {
+            handleBetweenOperator(sql, params, cond);
+        } else {
+            sql.append(" = ?");
+            params.add(cond.getCondition().getValue());
+        }
+    }
+
     /**
      * Handles the NOT IN operator for SQL generation.
      *
@@ -113,14 +172,13 @@ private void handleNotInOperator(StringBuilder sql, List<Object> params, Conditi
     }
 
     /**
-    /**
-    * Handles the BETWEEN operator for SQL generation.
-    *
-    * @param sql the SQL string builder
-    * @param params the parameter list
-    * @param cond the condition entry
-    * @throws UnsupportedOperationException if the value list is null or not exactly two values
-    */
+     * Handles the BETWEEN operator for SQL generation.
+     *
+     * @param sql the SQL string builder
+     * @param params the parameter list
+     * @param cond the condition entry
+     * @throws UnsupportedOperationException if the value list is null or not exactly two values
+     */
     private void handleBetweenOperator(StringBuilder sql, List<Object> params, ConditionEntry cond) {
         @SuppressWarnings("unchecked")
         final List<?> betweenValues = (List<?>) cond.getCondition().getValue();