From 006d3866adc6bc0e818ebef02fef31f126de12bd Mon Sep 17 00:00:00 2001 From: torcato Date: Tue, 23 Jan 2024 10:47:19 +0100 Subject: [PATCH] Fixing bug in identifiers --- sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala | 5 +---- .../src/test/scala/raw/client/sql/TestSqlCodeUtils.scala | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala b/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala index d89c4906a..986c74b3f 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala +++ b/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala @@ -107,10 +107,7 @@ object SqlCodeUtils { } } } - // If we were checking for a second quote and we reached the end, then add the quote to the identifier - if (state == CheckQuote) { - idn += '"' - } + // We reached the end of the string append what is left idns += SqlIdentifier(idn.toString(), quoted) idns.toSeq diff --git a/sql-client/src/test/scala/raw/client/sql/TestSqlCodeUtils.scala b/sql-client/src/test/scala/raw/client/sql/TestSqlCodeUtils.scala index 683a1f0c4..2920ee0d1 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestSqlCodeUtils.scala +++ b/sql-client/src/test/scala/raw/client/sql/TestSqlCodeUtils.scala @@ -182,9 +182,9 @@ class TestSqlCodeUtils extends AnyFunSuite { |""".stripMargin val values = Seq( - Pos(1, 16) -> Seq(SqlIdentifier("e", quoted = false)), - Pos(1, 19) -> Seq(SqlIdentifier("exam", quoted = false)), - Pos(1, 28) -> Seq(SqlIdentifier("example", quoted = false), SqlIdentifier("airpo", quoted = false)), + Pos(1, 16) -> Seq(SqlIdentifier("ex", quoted = false)), + Pos(1, 19) -> Seq(SqlIdentifier("examp", quoted = false)), + Pos(1, 28) -> Seq(SqlIdentifier("example", quoted = false), SqlIdentifier("airpor", quoted = false)), ) val analyzer = new SqlCodeUtils(code) for((pos, expected) <- values ) {