p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

[analysis]SqlDataSet移除sqlDataSetSqlResolver改为通过protected方法返回默认对象，避免JSON序列化时出错

This commit is contained in:
interestinglife 2020-05-07 23:02:44 +08:00
parent 056eb52000
commit 062eed8a0f
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java
View File

@ -10,7 +10,6 @@ package org.datagear.analysis.support;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -42,8 +41,6 @@ public class SqlDataSet extends AbstractDataSet
private String sql;
private SqlDataSetSqlResolver sqlDataSetSqlResolver = SQL_DATA_SET_SQL_RESOLVER;
public SqlDataSet()
{
super();
@ -77,30 +74,12 @@ public class SqlDataSet extends AbstractDataSet
this.sql = sql;
}
public boolean hasSqlDataSetSqlResolver()
{
return (this.sqlDataSetSqlResolver != null);
}
public SqlDataSetSqlResolver getSqlDataSetSqlResolver()
{
return sqlDataSetSqlResolver;
}
public void setSqlDataSetSqlResolver(SqlDataSetSqlResolver sqlDataSetSqlResolver)
{
this.sqlDataSetSqlResolver = sqlDataSetSqlResolver;
}
@Override
public DataSetResult getResult(Map<String, ?> paramValues) throws DataSetException
{
if (paramValues == null)
paramValues = new HashMap<>(0);
String sql = getSql();
if (hasSqlDataSetSqlResolver())
if (getSqlDataSetSqlResolver() != null)
sql = getSqlDataSetSqlResolver().resolve(this, paramValues);
Connection cn = null;
@ -131,6 +110,11 @@ public class SqlDataSet extends AbstractDataSet
}
}
protected SqlDataSetSqlResolver getSqlDataSetSqlResolver()
{
return SQL_DATA_SET_SQL_RESOLVER;
}
/**
* 获取{@linkplain DataSetResult}。
*