From b6e15f62a988b8849c5e35307d723851d951f94e Mon Sep 17 00:00:00 2001
From: pvranik <petr.vranik@mgm-tp.com>
Date: Wed, 22 Nov 2023 16:30:02 +0100
Subject: [PATCH] updated tests

---
 .../jdbc/influxdb/InfluxDbConnection.java     | 26 +++++++++----------
 .../jdbc/influxdb/InfluxDbConnectionTest.java | 11 ++++----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/main/java/net/suteren/jdbc/influxdb/InfluxDbConnection.java b/src/main/java/net/suteren/jdbc/influxdb/InfluxDbConnection.java
index 77da7b0..2d5e995 100644
--- a/src/main/java/net/suteren/jdbc/influxdb/InfluxDbConnection.java
+++ b/src/main/java/net/suteren/jdbc/influxdb/InfluxDbConnection.java
@@ -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 =
@@ -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");
diff --git a/src/test/java/net/suteren/jdbc/influxdb/InfluxDbConnectionTest.java b/src/test/java/net/suteren/jdbc/influxdb/InfluxDbConnectionTest.java
index 40d6faf..f9ef8d3 100644
--- a/src/test/java/net/suteren/jdbc/influxdb/InfluxDbConnectionTest.java
+++ b/src/test/java/net/suteren/jdbc/influxdb/InfluxDbConnectionTest.java
@@ -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")
 		);
 	}