提交 611e58c7 authored 作者: junjie's avatar junjie

fix: 直连数据集sql order by预览顺序

上级 2dcae3d1
...@@ -101,7 +101,7 @@ public class CKQueryProvider extends QueryProvider { ...@@ -101,7 +101,7 @@ public class CKQueryProvider extends QueryProvider {
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 0,1000";
} }
@Override @Override
...@@ -716,7 +716,7 @@ public class CKQueryProvider extends QueryProvider { ...@@ -716,7 +716,7 @@ public class CKQueryProvider extends QueryProvider {
} }
return stringBuilder.toString(); return stringBuilder.toString();
}).toArray(String[]::new); }).toArray(String[]::new);
return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
} }
@Override @Override
......
...@@ -105,7 +105,7 @@ public class EsQueryProvider extends QueryProvider { ...@@ -105,7 +105,7 @@ public class EsQueryProvider extends QueryProvider {
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 1000"; return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 1000";
} }
@Override @Override
...@@ -645,7 +645,7 @@ public class EsQueryProvider extends QueryProvider { ...@@ -645,7 +645,7 @@ public class EsQueryProvider extends QueryProvider {
stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName()); stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
return stringBuilder.toString(); return stringBuilder.toString();
}).toArray(String[]::new); }).toArray(String[]::new);
return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
} }
@Override @Override
......
...@@ -73,7 +73,7 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -73,7 +73,7 @@ public class MysqlQueryProvider extends QueryProvider {
@Override @Override
public String createSQLPreview(String sql, String orderBy) { public String createSQLPreview(String sql, String orderBy) {
return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp ORDER BY null " + " LIMIT 0,1000"; return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp " + " LIMIT 0,1000";
} }
@Override @Override
...@@ -684,7 +684,7 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -684,7 +684,7 @@ public class MysqlQueryProvider extends QueryProvider {
} }
return stringBuilder.toString(); return stringBuilder.toString();
}).toArray(String[]::new); }).toArray(String[]::new);
return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table); return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
} }
@Override @Override
......
...@@ -730,7 +730,7 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -730,7 +730,7 @@ public class OracleQueryProvider extends QueryProvider {
return stringBuilder.toString(); return stringBuilder.toString();
}).toArray(String[]::new); }).toArray(String[]::new);
OracleConfigration oracleConfigration = new Gson().fromJson(ds.getConfiguration(), OracleConfigration.class); OracleConfigration oracleConfigration = new Gson().fromJson(ds.getConfiguration(), OracleConfigration.class);
return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), oracleConfigration.getSchema() + ".\"" + table + "\""); return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), oracleConfigration.getSchema() + ".\"" + table + "\"");
} }
@Override @Override
...@@ -740,7 +740,7 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -740,7 +740,7 @@ public class OracleQueryProvider extends QueryProvider {
stringBuilder.append(" \"").append(f.getOriginName()).append("\""); stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
return stringBuilder.toString(); return stringBuilder.toString();
}).toArray(String[]::new); }).toArray(String[]::new);
return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), " (" + sqlFix(sql) + ") DE_TMP "); return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), " (" + sqlFix(sql) + ") DE_TMP ");
} }
public String transMysqlFilterTerm(String term) { public String transMysqlFilterTerm(String term) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论