|
|
|
@ -4,7 +4,7 @@ import com.fr.base.Parameter;
|
|
|
|
|
import com.fr.base.ParameterHelper; |
|
|
|
|
import com.fr.base.ParameterMapNameSpace; |
|
|
|
|
import com.fr.data.impl.DBTableData; |
|
|
|
|
import com.fr.data.impl.EscapeSqlHelper; |
|
|
|
|
import com.fr.data.impl.escapesql.EscapeSqlHelperManager; |
|
|
|
|
import com.fr.data.operator.DataOperator; |
|
|
|
|
import com.fr.decision.webservice.v10.config.ConfigService; |
|
|
|
|
import com.fr.design.dialog.DialogActionAdapter; |
|
|
|
@ -189,7 +189,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
|
|
|
|
|
Parameter[] paras = processParameters(tableData, calculator); |
|
|
|
|
// 所有被转义参数的集合
|
|
|
|
|
refreshEscapeSqlHelper(); |
|
|
|
|
Set<String> specialCharParam = EscapeSqlHelper.getInstance().getSpecialCharParam(paras); |
|
|
|
|
Set<String> specialCharParam = EscapeSqlHelperManager.getInstance().getSpecialCharParam(paras); |
|
|
|
|
// 将参数转义等
|
|
|
|
|
Set<TableDataProvider> tableDataProviders = getTableDataProviders(); |
|
|
|
|
for (TableDataProvider provider : tableDataProviders) { |
|
|
|
@ -228,10 +228,10 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static void refreshEscapeSqlHelper() { |
|
|
|
|
EscapeSqlHelper.getInstance().setUseForbidWord(ConfigService.getInstance().getPSIConfig().isUseForbidWord()); |
|
|
|
|
EscapeSqlHelper.getInstance().setSelectedForbidWord(ConfigService.getInstance().getPSIConfig().getSelectedForbidWord()); |
|
|
|
|
EscapeSqlHelper.getInstance().setUseEscapeSpecialChar(ConfigService.getInstance().getPSIConfig().isUseEscapeSpecialChar()); |
|
|
|
|
EscapeSqlHelper.getInstance().setSelectedSpecialChar(ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar()); |
|
|
|
|
EscapeSqlHelperManager.getInstance().setUseForbidWord(ConfigService.getInstance().getPSIConfig().isUseForbidWord()); |
|
|
|
|
EscapeSqlHelperManager.getInstance().setSelectedForbidWord(ConfigService.getInstance().getPSIConfig().getSelectedForbidWord()); |
|
|
|
|
EscapeSqlHelperManager.getInstance().setUseEscapeSpecialChar(ConfigService.getInstance().getPSIConfig().isUseEscapeSpecialChar()); |
|
|
|
|
EscapeSqlHelperManager.getInstance().setSelectedSpecialChar(ConfigService.getInstance().getPSIConfig().getSelectedSpecialChar()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private static boolean isShowSpecialCharSqlPane(List<int[]> specialCharParamIndex) { |
|
|
|
@ -284,7 +284,7 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
|
|
|
|
|
if (classManagerProvider == null) { |
|
|
|
|
return new HashSet<>(); |
|
|
|
|
} |
|
|
|
|
return classManagerProvider.getArray(TableDataProvider.XML_TAG, EscapeSqlHelper.getInstance()); |
|
|
|
|
return classManagerProvider.getArray(TableDataProvider.XML_TAG, EscapeSqlHelperManager.getInstance()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|