Skip to content

fix table alias problem #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allwefantasy merged 1 commit into from
Jun 25, 2020
Merged

fix table alias problem #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/tech/mlsql/autosuggest/dsl/TokenMatcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ class TokenMatcher(tokens: List[Token], val start: Int) {

foods.foreach { foodw =>

if (currentIndex >= tokens.size) {
if (currentIndex >= tokens.size && !foodw.optional) {
isFail = true
} else {
val stepSize = foodw.foods.count
Expand All @@ -184,10 +184,7 @@ class TokenMatcher(tokens: List[Token], val start: Int) {
}
}
}

if (!isFail && currentIndex == tokens.size) {
currentIndex = tokens.size - 1
}

val targetIndex = if (isFail) -1 else currentIndex
cacheResult = targetIndex
this
Expand All @@ -200,7 +197,7 @@ class TokenMatcher(tokens: List[Token], val start: Int) {

foods.foreach { foodw =>
// if out of bound then mark fail
if (currentIndex <= -1) {
if (currentIndex <= -1 && !foodw.optional) {
isFail = true
} else {
val stepSize = foodw.foods.count
Expand Down Expand Up @@ -276,6 +273,9 @@ object TokenTypeWrapper {
val LEFT_SQUARE_BRACKET = SqlBaseLexer.T__7 //[
val RIGHT_SQUARE_BRACKET = SqlBaseLexer.T__8 //]
val COLON = SqlBaseLexer.T__9 //:

val LIST = List(LEFT_BRACKET, RIGHT_BRACKET, COMMA, DOT, LEFT_SQUARE_BRACKET, RIGHT_SQUARE_BRACKET, COLON)
val MAP = LIST.map((_, 1)).toMap
}

object MLSQLTokenTypeWrapper {
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/tech/mlsql/autosuggest/statement/LexerUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ object LexerUtils {
&& colNum <= lastToken._1.getCharPositionInLine + lastToken._1.getText.size
&&
(lastToken._1.getType != DSLSQLLexer.UNRECOGNIZED
&& lastToken._1.getType != MLSQLTokenTypeWrapper.DOT)
&& lastToken._1.getType != MLSQLTokenTypeWrapper.DOT)
) {
return TokenPos(lastToken._2, TokenPosType.CURRENT, colNum - lastToken._1.getCharPositionInLine)
}
Expand Down Expand Up @@ -151,7 +151,11 @@ object LexerUtils {
return TokenPos(lastToken._2, TokenPosType.NEXT, 0)
}

if (colNum > lastToken._1.getCharPositionInLine && colNum <= lastToken._1.getCharPositionInLine + lastToken._1.getText.size) {
if (colNum > lastToken._1.getCharPositionInLine
&& colNum <= lastToken._1.getCharPositionInLine + lastToken._1.getText.size
&& !TokenTypeWrapper.MAP.contains(lastToken._1.getType)

) {
return TokenPos(lastToken._2, TokenPosType.CURRENT, colNum - lastToken._1.getCharPositionInLine)
}
oneLineTokens.map { case (token, index) =>
Expand All @@ -161,13 +165,7 @@ object LexerUtils {
//这个token是 [(,).]等，则不算
if (colNum == end && (1 <= token.getType)
&& (
token.getType == DSLSQLLexer.UNRECOGNIZED
|| token.getType == TokenTypeWrapper.COLON
|| token.getType == TokenTypeWrapper.DOT
|| token.getType == TokenTypeWrapper.LEFT_BRACKET
|| token.getType == TokenTypeWrapper.RIGHT_BRACKET
|| token.getType == TokenTypeWrapper.LEFT_SQUARE_BRACKET
|| token.getType == TokenTypeWrapper.RIGHT_SQUARE_BRACKET
TokenTypeWrapper.MAP.contains(token.getType)
)) {
TokenPos(index, TokenPosType.NEXT, 0)
} else if (start < colNum && colNum <= end) {
Expand Down
27 changes: 15 additions & 12 deletions src/main/java/tech/mlsql/autosuggest/statement/TableExtractor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,22 @@ class TableExtractor(autoSuggestContext: AutoSuggestContext, ast: SingleStatemen

override def extractor(start: Int, end: Int): List[MetaTableKeyWrapper] = {
val dbTableTokens = tokens.slice(start, end)
val dbTable = if (dbTableTokens.length == 3) {
val List(dbToken, _, tableToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), None)
} else if (dbTableTokens.length == 4) {
val List(dbToken, _, tableToken, aliasToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), Option(aliasToken.getText))
} else if (dbTableTokens.length == 5) {
val List(dbToken, _, tableToken, _, aliasToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), Option(aliasToken.getText))
}
else {
MetaTableKeyWrapper(MetaTableKey(None, None, dbTableTokens.head.getText), None)
val dbTable = dbTableTokens.length match {
case 2 =>
val List(tableToken, aliasToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, None, tableToken.getText), Option(aliasToken.getText))
case 3 =>
val List(dbToken, _, tableToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), None)
case 4 =>
val List(dbToken, _, tableToken, aliasToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), Option(aliasToken.getText))
case 5 =>
val List(dbToken, _, tableToken, _, aliasToken) = dbTableTokens
MetaTableKeyWrapper(MetaTableKey(None, Option(dbToken.getText), tableToken.getText), Option(aliasToken.getText))
case _ => MetaTableKeyWrapper(MetaTableKey(None, None, dbTableTokens.head.getText), None)
}

List(dbTable)
}

Expand Down
12 changes: 12 additions & 0 deletions src/test/java/com/intigua/antlr4/autosuggest/AutoSuggestContextTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,18 @@ class AutoSuggestContextTest extends BaseTest with BeforeAndAfterEach {
println(items)

}
test("table alias with temp table") {
val sql =
"""
|select a,b,c from table1 as table1;
|select aa,bb,cc from table2 as table2;
|select from table1 t1 left join table2 t2 on t1.a = t2.
|""".stripMargin

val items = context.buildFromString(sql).suggest(4, 58)
assert(items.map(_.name) == List("aa", "bb", "cc"))

}
}


2 changes: 2 additions & 0 deletions src/test/java/com/intigua/antlr4/autosuggest/SelectSuggesterTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,4 +255,6 @@ class SelectSuggesterTest extends BaseTest {
}




}
18 changes: 0 additions & 18 deletions src/test/java/com/intigua/antlr4/autosuggest/SelectTest.scala
View file
Open in desktop

This file was deleted.