Browse Source

Pull request #13940: REPORT-118163 获取到了数据集sql语句中注释的参数

Merge in DESIGN/design from ~ROGER.CHEN/design:release/11.0 to release/11.0

* commit '123de4010e6508a03b4eb647ef3b7ddc72d5ef55':
  修改方法名称
  修改方法名称
  REPORT-118163 获取到了数据集sql语句中注释的参数
release/11.0
Roger.Chen-陈旺 8 months ago
parent
commit
205dde94ee
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java

2
designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java

@ -251,7 +251,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
private static Parameter[] processParameters(DBTableData tableData, Calculator calculator) { private static Parameter[] processParameters(DBTableData tableData, Calculator calculator) {
ParameterProvider[] parameters = tableData.getParameters(); ParameterProvider[] parameters = tableData.getParameters();
if (parameters == null || parameters.length == 0) { if (parameters == null || parameters.length == 0) {
tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQuery(), false)); tableData.setParameters(ParameterHelper.analyze4Parameters(tableData.getQueryWithoutComments(), false));
return new Parameter[0]; return new Parameter[0];
} }
return Parameter.providers2Parameter(Calculator.processParameters(calculator, parameters)); return Parameter.providers2Parameter(Calculator.processParameters(calculator, parameters));

Loading…
Cancel
Save