Skip to content

Commit

Permalink
updated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pvranik committed Nov 22, 2023
1 parent fe79c51 commit b6e15f6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
26 changes: 13 additions & 13 deletions src/main/java/net/suteren/jdbc/influxdb/InfluxDbConnection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class InfluxDbConnection implements Connection {
Pattern.CASE_INSENSITIVE | Pattern.DOTALL);

private static final Pattern TABLE_SCHEMA_SQL_PATTERN =
Pattern.compile("\\s*SELECT\\s+(\\S+)\\s+FROM\\s+(?:(?:(([\"']?)(\\S+)\\3)\\.)?(([\"']?)(\\S+)\\6)\\.)?(([\"']?)(\\S+)\\9(\\s.*)?)",
Pattern.compile("\\s*SELECT\\s+(\\S+)\\s+FROM\\s+(?:(?:(((?:(?<!\\\\)[\"'])?)(\\S+)\\3)\\.)?(((?:(?<!\\\\)[\"'])?)(\\S+)\\6)\\.)?(((?:(?<!\\\\)[\"'])?)(\\S+)\\9(\\s.*)?)",
Pattern.CASE_INSENSITIVE | Pattern.DOTALL);

private static final Pattern DEFAULT_SCHEMA_PATTERN =
Expand Down Expand Up @@ -89,18 +89,18 @@ public InfluxDbConnection(String url, String username, String password, String d
.replaceAll(String.format("\\s+%s\\.", alias), " ")
.replaceAll(String.format("\\s+\"%s\"\\.", alias), " ");
}
matcher = TABLE_SCHEMA_SQL_PATTERN.matcher(sql);
if (matcher.matches()) {
if (StringUtils.isNotBlank(matcher.group(4))) {
if (StringUtils.isNotBlank(matcher.group(7))) {
sql = matcher.replaceFirst("SELECT $1 FROM \"$4\".\"$7\".\"$10\"$11");
} else {
sql = matcher.replaceFirst("SELECT $1 FROM \"$4\".\"$10\"$11");
}
} else {
sql = matcher.replaceFirst("SELECT $1 FROM \"$10\"$11");
}
}
// matcher = TABLE_SCHEMA_SQL_PATTERN.matcher(sql);
// if (matcher.matches()) {
// if (StringUtils.isNotBlank(matcher.group(4))) {
// if (StringUtils.isNotBlank(matcher.group(7))) {
// sql = matcher.replaceFirst("SELECT $1 FROM \"$4\".\"$7\".\"$10\"$11");
// } else {
// sql = matcher.replaceFirst("SELECT $1 FROM \"$4\".\"$10\"$11");
// }
// } else {
// sql = matcher.replaceFirst("SELECT $1 FROM \"$10\"$11");
// }
// }

// if (DEFAULT_SCHEMA_PATTERN.matcher(sql).matches()) {
// sql = sql.replaceAll("(\\s,)([\"']?)default\\2\\.", "$1");
Expand Down
11 changes: 6 additions & 5 deletions src/test/java/net/suteren/jdbc/influxdb/InfluxDbConnectionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ public static Stream<Arguments> sqlSamples() {
Arguments.arguments("select * from \\\"measure\\\"", "select * from \\\"measure\\\""),
Arguments.arguments("select * from \\\"measure\\\"", "select * from \"\"measure\"\""),
Arguments.arguments("select * from \"\\\"measure\\\"\"", "select * from \"\"\"measure\"\"\""),
Arguments.arguments("SELECT * FROM measure", "select * from test.measure"),
Arguments.arguments("SELECT * FROM jmeter where timestamp > now() - \"1 day\"", "select * from jmeter.jmeter where timestamp > now() - \"1 day\""),
Arguments.arguments("SELECT * FROM jmeter\nwhere timestamp > now() - \"2 days\"",
Arguments.arguments("select * from test.measure", "select * from test.measure"),
Arguments.arguments("select * from jmeter.jmeter where timestamp > now() - \"1 day\"", "select * from jmeter.jmeter where timestamp > now() - \"1 day\""),
Arguments.arguments("SELECT * FROM jmeter.jmeter\nwhere timestamp > now() - \"2 days\"",
"select t.*\nfrom jmeter.jmeter t\nwhere timestamp > now() - \"2 days\""),
Arguments.arguments("SELECT * FROM jmeter", "select t.*\nfrom jmeter.jmeter t"),
Arguments.arguments("SELECT * FROM \"_internal\".cq", "SELECT t.*\n FROM \"_internal\".cq t")
Arguments.arguments("SELECT * FROM jmeter.jmeter", "select t.*\nfrom jmeter.jmeter t"),
Arguments.arguments("SELECT * FROM \"_internal\".cq", "SELECT t.*\n FROM \"_internal\".cq t"),
Arguments.arguments("SELECT * FROM \"_internal\".\"measurement\".cq", "SELECT t.*\n FROM \"_internal\".\"measurement\".cq t")
);
}

Expand Down

0 comments on commit b6e15f6

Please sign in to comment.