Enhance spqrparser (#242)

* Enhance spqrparser * Fix tests * Fix tests * Add unit test * Enhance lexel-parser more * Fix kill client stmt * Fix * No lint gen file * Fix nolint * no lint yacc/console --------- Co-authored-by: denchick <[email protected]>
pg-sharding · Jul 24, 2023 · c841ff8 · c841ff8
1 parent d6b85a5
commit c841ff8
Show file tree

Hide file tree

Showing 13 changed files with 1,547 additions and 723 deletions.
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -23,7 +23,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          args: --timeout=10m --out-format=colored-line-number
+          args: --timeout=10m --out-format=colored-line-number --skip-dirs=yacc/console
 
   goimports:
     runs-on: ubuntu-latest

diff --git a/Makefile b/Makefile
@@ -89,7 +89,7 @@ feature_test: build_images
 	(cd test/feature; go test -timeout 150m)
 
 lint:
-	golangci-lint run --timeout=10m --out-format=colored-line-number
+	golangci-lint run --timeout=10m --out-format=colored-line-number --skip-dirs=yacc/console
 
 ####################### GENERATE #######################
 

diff --git a/pkg/clientinteractor/interactor.go b/pkg/clientinteractor/interactor.go
@@ -328,7 +328,7 @@ func MatchRow(row []string, nameToIndex map[string]int, condition spqrparser.Whe
 	case spqrparser.WhereClauseEmpty:
 		return true, nil
 	case spqrparser.WhereClauseOp:
-		switch where.Op {
+		switch strings.ToLower(where.Op) {
 		case "and":
 			left, err := MatchRow(row, nameToIndex, where.Left)
 			if err != nil {

diff --git a/yacc/console/Makefile b/yacc/console/Makefile
@@ -0,0 +1,7 @@
+lexgen:
+	ragel -Z -G2 -o lex.go lex.rl
+
+yaccgen:
+	goyacc -o gram.go -p yy gram.y
+
+gen: lexgen yaccgen
diff --git a/yacc/console/console_test.go b/yacc/console/console_test.go