carm/EasySQL
carm/EasySQL
1
Fork 0
mirror of https://github.com/CarmJos/EasySQL.git synced 2024-09-19 13:25:47 +00:00
Code Issues Releases Activity

[v0.3.1] 修复一些小的规范问题

Browse Source
This commit is contained in:
Carm Jos 2022-01-26 14:49:19 +08:00
parent 386093e58b
commit 36a23af450
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
View File

@ -15,6 +15,7 @@ public interface SQLUpdateBatchAction extends SQLAction<List<Integer>> {
*/
SQLUpdateBatchAction addBatch(@NotNull String sql);
@Override
default @NotNull String getSQLContent() {
return getSQLContents().get(0);
}

2
easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java
View File

@ -35,7 +35,7 @@ public class PreparedSQLBatchUpdateActionImpl
}
@Override
public PreparedSQLUpdateBatchAction addParamsBatch(Object[] params) {
public PreparedSQLUpdateBatchAction addParamsBatch(Object... params) {
this.allParams.add(params);
return this;
}

2
easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLUpdateActionImpl.java
View File

@ -35,7 +35,7 @@ public class PreparedSQLUpdateActionImpl
}
@Override
public PreparedSQLUpdateActionImpl setParams(Object[] params) {
public PreparedSQLUpdateActionImpl setParams(Object... params) {
this.params = params;
return this;
}

2
easysql-impl/src/main/java/cc/carm/lib/easysql/action/query/PreparedQueryActionImpl.java
View File

@ -25,7 +25,7 @@ public class PreparedQueryActionImpl extends QueryActionImpl implements Prepared
}
@Override
public PreparedQueryActionImpl setParams(@Nullable Object[] params) {
public PreparedQueryActionImpl setParams(@Nullable Object... params) {
this.params = params;
return this;
}

2
easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/AbstractConditionalBuilder.java
View File

@ -62,7 +62,7 @@ public abstract class AbstractConditionalBuilder<B extends ConditionalBuilder<B,
public B addCondition(
@NotNull String[] queryNames, @Nullable Object[] queryValues
) {
if (queryNames.length != queryValues.length) {
if (queryValues == null || queryNames.length != queryValues.length) {
throw new RuntimeException("queryNames are not match with queryValues");
}
for (int i = 0; i < queryNames.length; i++) {

2
easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableCreateBuilderImpl.java
View File

@ -111,7 +111,7 @@ public class TableCreateBuilderImpl extends AbstractSQLBuilder implements TableC
}
@Override
public TableCreateBuilder setColumns(@NotNull String[] columns) {
public TableCreateBuilder setColumns(@NotNull String... columns) {
this.columns = Arrays.asList(columns);
return this;
}

2
easysql-impl/src/main/java/cc/carm/lib/easysql/builder/impl/TableQueryBuilderImpl.java
View File

@ -63,7 +63,7 @@ public class TableQueryBuilderImpl
}
@Override
public TableQueryBuilderImpl selectColumns(@NotNull String[] columnNames) {
public TableQueryBuilderImpl selectColumns(@NotNull String... columnNames) {
this.columns = columnNames;
return this;
}

3
easysql-impl/src/main/java/cc/carm/lib/easysql/manager/SQLManagerImpl.java
View File

@ -62,6 +62,7 @@ public class SQLManagerImpl implements SQLManager {
if (isDebugMode()) getLogger().info("[DEBUG] " + msg);
}
@Override
public Logger getLogger() {
return LOGGER;
}
@ -103,7 +104,7 @@ public class SQLManagerImpl implements SQLManager {
}
@Override
public List<Integer> executeSQLBatch(@NotNull String sql, String[] moreSQL) {
public List<Integer> executeSQLBatch(@NotNull String sql, String... moreSQL) {
SQLUpdateBatchAction action = new SQLUpdateBatchActionImpl(this, sql);
if (moreSQL != null && moreSQL.length > 0) {
Arrays.stream(moreSQL).forEach(action::addBatch);

10
easysql-impl/src/main/java/cc/carm/lib/easysql/util/StatementUtil.java
View File

@ -128,16 +128,12 @@ public class StatementUtil {
* @return 数据类型，默认为 {@link Types#VARCHAR}
*/
public static int getNullType(PreparedStatement statement, int paramIndex) {
int sqlType = Types.VARCHAR;
final ParameterMetaData pmd;
try {
pmd = statement.getParameterMetaData();
sqlType = pmd.getParameterType(paramIndex);
ParameterMetaData pmd = statement.getParameterMetaData();
return pmd.getParameterType(paramIndex);
} catch (SQLException ignore) {
return Types.VARCHAR;
}
return sqlType;
}
/**

2
example/easysql-test/src/main/java/cc/carm/lib/easysql/testrunner/Main.java
View File

@ -7,12 +7,14 @@ import cc.carm.lib.easysql.testrunner.tests.TableCreateTest;
import cc.carm.lib.easysql.testrunner.tests.TableRenameTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Scanner;
import java.util.Set;
@TestOnly
public class Main {
public static void main(String[] args) {