From daeb66b040d28becd35f0612708a6dc34fd3233e Mon Sep 17 00:00:00 2001 From: Alex Zerntev Date: Fri, 5 Jul 2024 17:52:04 +0300 Subject: [PATCH] fix --- .../scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala b/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala index 606fb9841..2351fe3b1 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala +++ b/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala @@ -26,9 +26,8 @@ class RawSqlSyntaxAnalyzer(val positions: Positions) extends Parsers(positions) val source = StringSource(s) val rawErrorListener = new RawSqlErrorListener() - val striped = s.stripTrailing() - val withoutNewLine = if(striped.endsWith("\n")) striped.substring(0, striped.length - 1) else striped - val lexer = new PsqlLexer(CharStreams.fromString(withoutNewLine)) + val striped = s.stripTrailing().stripSuffix("\r\n").stripSuffix("\n").stripSuffix("\r") + val lexer = new PsqlLexer(CharStreams.fromString(striped)) lexer.removeErrorListeners() lexer.addErrorListener(rawErrorListener)