1
mirror of https://github.com/CarmJos/EasySQL.git synced 2026-06-05 09:01:26 +08:00

feat(sql): 预备支持事务(v0.5.0)

This commit is contained in:
2022-10-16 23:49:53 +08:00
parent a9a7543e65
commit a88843f768
30 changed files with 429 additions and 69 deletions
@@ -46,19 +46,19 @@ public class PreparedSQLUpdateActionImpl<T extends Number>
}
@Override
public PreparedSQLUpdateActionImpl<T> setParams(Object... params) {
public PreparedSQLUpdateActionImpl<T> params(Object... params) {
this.params = params;
return this;
}
@Override
public PreparedSQLUpdateActionImpl<T> setParams(@Nullable Iterable<Object> params) {
public PreparedSQLUpdateActionImpl<T> params(@Nullable Iterable<Object> params) {
if (params == null) {
return setParams((Object[]) null);
return params((Object[]) null);
} else {
List<Object> paramsList = new ArrayList<>();
params.forEach(paramsList::add);
return setParams(paramsList.toArray());
return params(paramsList.toArray());
}
}
@@ -27,7 +27,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
protected abstract B getThis();
@Override
public B setConditions(@Nullable String condition) {
public B where(@Nullable String condition) {
this.conditionSQLs = new ArrayList<>();
this.conditionParams = new ArrayList<>();
if (condition != null) this.conditionSQLs.add(condition);
@@ -35,7 +35,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
}
@Override
public B setConditions(
public B where(
LinkedHashMap<@NotNull String, @Nullable Object> conditions
) {
conditions.forEach(this::addCondition);
@@ -119,7 +119,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
@Override
public B setLimit(int limit) {
public B limit(int limit) {
this.limit = limit;
return getThis();
}
@@ -33,7 +33,7 @@ public class QueryBuilderImpl extends AbstractSQLBuilder implements QueryBuilder
}
@Override
public TableQueryBuilder inTable(@NotNull String tableName) {
public TableQueryBuilder fromTable(@NotNull String tableName) {
Objects.requireNonNull(tableName, "tableName could not be null");
return new TableQueryBuilderImpl(getManager(), tableName);
}
@@ -150,7 +150,7 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
}
@Override
public TableCreateBuilder setColumns(@NotNull String... columns) {
public TableCreateBuilder columns(@NotNull String... columns) {
Objects.requireNonNull(columns, "columns could not be null");
this.columns = Arrays.asList(columns);
return this;
@@ -68,7 +68,7 @@ public class TableQueryBuilderImpl
}
@Override
public TableQueryBuilderImpl selectColumns(@NotNull String... columnNames) {
public TableQueryBuilderImpl select(@NotNull String... columnNames) {
Objects.requireNonNull(columnNames, "columnNames could not be null");
this.columns = columnNames;
return this;
@@ -82,7 +82,7 @@ public class TableQueryBuilderImpl
}
@Override
public TableQueryBuilder setPageLimit(int start, int end) {
public TableQueryBuilder limit(int start, int end) {
this.pageLimit = new int[]{start, end};
return this;
}
@@ -56,20 +56,20 @@ public class UpdateBuilderImpl
}
@Override
public UpdateBuilder addColumnValue(@NotNull String columnName, Object columnValue) {
public UpdateBuilder set(@NotNull String columnName, Object columnValue) {
Objects.requireNonNull(columnName, "columnName could not be null");
this.columnData.put(columnName, columnValue);
return this;
}
@Override
public UpdateBuilder setColumnValues(LinkedHashMap<String, Object> columnData) {
public UpdateBuilder setAll(LinkedHashMap<String, Object> columnData) {
this.columnData = columnData;
return this;
}
@Override
public UpdateBuilder setColumnValues(@NotNull String[] columnNames, @Nullable Object[] columnValues) {
public UpdateBuilder setAll(@NotNull String[] columnNames, @Nullable Object[] columnValues) {
Objects.requireNonNull(columnNames, "columnName could not be null");
if (columnNames.length != columnValues.length) {
throw new RuntimeException("columnNames are not match with columnValues");
@@ -78,7 +78,7 @@ public class UpdateBuilderImpl
for (int i = 0; i < columnNames.length; i++) {
columnData.put(columnNames[i], columnValues[i]);
}
return setColumnValues(columnData);
return setAll(columnData);
}
@@ -203,7 +203,7 @@ public class SQLManagerImpl implements SQLManager {
public InsertBuilder<PreparedSQLUpdateBatchAction<Integer>> createInsertBatch(@NotNull String tableName) {
return new InsertBuilderImpl<PreparedSQLUpdateBatchAction<Integer>>(this, tableName) {
@Override
public PreparedSQLUpdateBatchAction<Integer> setColumnNames(List<String> columnNames) {
public PreparedSQLUpdateBatchAction<Integer> columns(List<String> columnNames) {
return new PreparedSQLBatchUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
}
};
@@ -213,7 +213,7 @@ public class SQLManagerImpl implements SQLManager {
public InsertBuilder<PreparedSQLUpdateAction<Integer>> createInsert(@NotNull String tableName) {
return new InsertBuilderImpl<PreparedSQLUpdateAction<Integer>>(this, tableName) {
@Override
public PreparedSQLUpdateAction<Integer> setColumnNames(List<String> columnNames) {
public PreparedSQLUpdateAction<Integer> columns(List<String> columnNames) {
return new PreparedSQLUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
}
};
@@ -223,7 +223,7 @@ public class SQLManagerImpl implements SQLManager {
public ReplaceBuilder<PreparedSQLUpdateBatchAction<Integer>> createReplaceBatch(@NotNull String tableName) {
return new ReplaceBuilderImpl<PreparedSQLUpdateBatchAction<Integer>>(this, tableName) {
@Override
public PreparedSQLUpdateBatchAction<Integer> setColumnNames(List<String> columnNames) {
public PreparedSQLUpdateBatchAction<Integer> columns(List<String> columnNames) {
return new PreparedSQLBatchUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
}
};
@@ -233,7 +233,7 @@ public class SQLManagerImpl implements SQLManager {
public ReplaceBuilder<PreparedSQLUpdateAction<Integer>> createReplace(@NotNull String tableName) {
return new ReplaceBuilderImpl<PreparedSQLUpdateAction<Integer>>(this, tableName) {
@Override
public PreparedSQLUpdateAction<Integer> setColumnNames(List<String> columnNames) {
public PreparedSQLUpdateAction<Integer> columns(List<String> columnNames) {
return new PreparedSQLUpdateActionImpl<>(getManager(), Integer.class, buildSQL(getTableName(), columnNames));
}
};