Replace spansql

pkg/spanner/migration.go

@@ -26,8 +26,6 @@ import (
 	"path/filepath"
 	"regexp"
 	"strconv"
-
-	"cloud.google.com/go/spanner/spansql"
 )
 
 var (
@@ -111,14 +109,7 @@ func LoadMigrations(dir string) (Migrations, error) {
 			continue
 		}
 
-		statements, err := ddlToStatements(f.Name(), file)
-		if err != nil {
-			nstatements, nerr := dmlToStatements(f.Name(), file)
-			if nerr != nil {
-				return nil, fmt.Errorf("failed to parse DDL/DML statements: %v, %v", err, nerr)
-			}
-			statements = nstatements
-		}
+		statements := ToStatements(file)
 
 		kind, err := inspectStatementsKind(statements)
 		if err != nil {
@@ -141,32 +132,25 @@ func LoadMigrations(dir string) (Migrations, error) {
 	return migrations, nil
 }
 
+// ddlToStatements wraps ToStatements(data) to minimize changes
 func ddlToStatements(filename string, data []byte) ([]string, error) {
-	ddl, err := spansql.ParseDDL(filename, string(data))
-	if err != nil {
-		return nil, err
-	}
-
-	var statements []string
-	for _, stmt := range ddl.List {
-		statements = append(statements, stmt.SQL())
-	}
-
-	return statements, nil
+	return ToStatements(data), nil
 }
 
+// dmlToStatements wraps ToStatements(data) to minimize changes
 func dmlToStatements(filename string, data []byte) ([]string, error) {
-	dml, err := spansql.ParseDML(filename, string(data))
-	if err != nil {
-		return nil, err
-	}
+	return ToStatements(data), nil
+}
+
+func ToStatements(data []byte) []string {
+	inputStatement := separateInput(string(data))
 
 	var statements []string
-	for _, stmt := range dml.List {
-		statements = append(statements, stmt.SQL())
+	for _, stmt := range inputStatement {
+		statements = append(statements, stmt.statement)
 	}
 
-	return statements, nil
+	return statements
 }
 
 func inspectStatementsKind(statements []string) (statementKind, error) {

pkg/spanner/migration_test.go

@@ -24,6 +24,7 @@ import (
 	"testing"
 
 	"github.com/cloudspannerecosystem/wrench/pkg/spanner"
+	"github.com/google/go-cmp/cmp"
 )
 
 func TestLoadMigrations(t *testing.T) {
@@ -37,19 +38,22 @@ func TestLoadMigrations(t *testing.T) {
 	}
 
 	testcases := []struct {
-		idx         int
-		wantVersion uint
-		wantName    string
+		idx            int
+		wantVersion    uint
+		wantName       string
+		wantStatements []string
 	}{
 		{
-			idx:         0,
-			wantVersion: 2,
-			wantName:    "test",
+			idx:            0,
+			wantVersion:    2,
+			wantName:       "test",
+			wantStatements: []string{"ALTER TABLE Singers ADD COLUMN LastName STRING(MAX)"},
 		},
 		{
-			idx:         1,
-			wantVersion: 3,
-			wantName:    "",
+			idx:            1,
+			wantVersion:    3,
+			wantName:       "",
+			wantStatements: []string{"UPDATE Singers SET LastName = \"\" WHERE LastName IS NULL"},
 		},
 	}
 
@@ -61,5 +65,9 @@ func TestLoadMigrations(t *testing.T) {
 		if ms[tc.idx].Name != tc.wantName {
 			t.Errorf("migrations[%d].name want %v, but got %v", tc.idx, tc.wantName, ms[tc.idx].Name)
 		}
+
+		if !cmp.Equal(ms[tc.idx].Statements, tc.wantStatements) {
+			t.Errorf("migrations[%d].statements differ: %v", tc.idx, cmp.Diff(ms[tc.idx].Statements, tc.wantStatements))
+		}
 	}
 }