Remove partial DDL parsing; support options on DROP INDEX statements

BREAKING CHANGE:

Partial matches are no longer supported, making ParseStrictDDL
redundant, as it would be functionally equivalent to the new Parse;
therefore, the former was also removed.

Author: atavakoliyext

ast.go

@@ -22,7 +22,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"log"
 	"strings"
 
 	"github.com/yext/sqlparser/dependency/querypb"
@@ -42,25 +41,8 @@ import (
 // This will help avoid name collisions.
 
 // Parse parses the SQL in full and returns a Statement, which
-// is the AST representation of the query. If a DDL statement
-// is partially parsed but still contains a syntax error, the
-// error is ignored and the DDL is returned anyway.
+// is the AST representation of the query.
 func Parse(sql string) (Statement, error) {
-	tokenizer := NewStringTokenizer(sql)
-	if yyParse(tokenizer) != 0 {
-		if tokenizer.partialDDL != nil {
-			log.Printf("ignoring error parsing DDL '%s': %v", sql, tokenizer.LastError)
-			tokenizer.ParseTree = tokenizer.partialDDL
-			return tokenizer.ParseTree, nil
-		}
-		return nil, tokenizer.LastError
-	}
-	return tokenizer.ParseTree, nil
-}
-
-// ParseStrictDDL is the same as Parse except it errors on
-// partially parsed DDL statements.
-func ParseStrictDDL(sql string) (Statement, error) {
 	tokenizer := NewStringTokenizer(sql)
 	if yyParse(tokenizer) != 0 {
 		return nil, tokenizer.LastError
@@ -85,10 +67,6 @@ func ParseNext(tokenizer *Tokenizer) (Statement, error) {
 	tokenizer.reset()
 	tokenizer.multi = true
 	if yyParse(tokenizer) != 0 {
-		if tokenizer.partialDDL != nil {
-			tokenizer.ParseTree = tokenizer.partialDDL
-			return tokenizer.ParseTree, nil
-		}
 		return nil, tokenizer.LastError
 	}
 	return tokenizer.ParseTree, nil

parse_next_test.go

@@ -98,9 +98,10 @@ func TestParseNextErrors(t *testing.T) {
 // TestParseNextEdgeCases tests various ParseNext edge cases.
 func TestParseNextEdgeCases(t *testing.T) {
 	tests := []struct {
-		name  string
-		input string
-		want  []string
+		name     string
+		input    string
+		want     []string
+		firstErr string
 	}{{
 		name:  "Trailing ;",
 		input: "select 1 from a; update a set b = 2;",
@@ -126,19 +127,29 @@ func TestParseNextEdgeCases(t *testing.T) {
 		input: "set character set ';'; select 1 from a",
 		want:  []string{"set charset ';'", "select 1 from a"},
 	}, {
-		name:  "Partial DDL",
-		input: "create table a; select 1 from a",
-		want:  []string{"create table a", "select 1 from a"},
+		name:     "Invalid DDL",
+		input:    "create table a; select 1 from a",
+		firstErr: "syntax error at position 15",
+		want:     []string{"select 1 from a"},
 	}, {
-		name:  "Partial DDL",
-		input: "create table a ignore me this is garbage; select 1 from a",
-		want:  []string{"create table a", "select 1 from a"},
+		name:     "Invalid DDL with trailing garbage",
+		input:    "create table a ignore me this is garbage; select 1 from a",
+		firstErr: "syntax error at position 22 near 'ignore'",
+		want:     []string{"select 1 from a"},
 	}}
 
 	for _, test := range tests {
 		tokens := NewStringTokenizer(test.input)
+		i := 0
 
-		for i, want := range test.want {
+		if test.firstErr != "" {
+			if _, err := ParseNext(tokens); err == nil || err.Error() != test.firstErr {
+				t.Fatalf("[%d] ParseNext(%q) err = %q, want %q", i, test.input, err, test.firstErr)
+			}
+			i++
+		}
+
+		for _, want := range test.want {
 			tree, err := ParseNext(tokens)
 			if err != nil {
 				t.Fatalf("[%d] ParseNext(%q) err = %q, want nil", i, test.input, err)
@@ -148,6 +159,7 @@ func TestParseNextEdgeCases(t *testing.T) {
 			if got := String(tree); got != want {
 				t.Fatalf("[%d] ParseNext(%q) = %q, want %q", i, test.input, got, want)
 			}
+			i++
 		}
 
 		// Read once more and it should be EOF.