[fix] support delimiter

Author: muir

internal/mhelp/run_sql.go

@@ -8,6 +8,7 @@ import (
 	"github.com/muir/libschema"
 	"github.com/muir/libschema/classifysql"
 	"github.com/muir/libschema/internal"
+	"github.com/muir/sqltoken"
 	"github.com/pkg/errors"
 )
 
@@ -16,7 +17,25 @@ type CanExecContext interface {
 }
 
 func RunSQL(ctx context.Context, log *internal.Log, tx CanExecContext, statements classifysql.Statements, rowsAffected *int64, m libschema.Migration, d *libschema.Database) error {
-	for _, commandSQL := range statements.TokensList().Strings() {
+	for _, tokens := range statements.TokensList() {
+		tokens = tokens.Strip()
+		if len(tokens) == 0 {
+			return nil
+		}
+		if tokens[0].Type == sqltoken.DelimiterStatement {
+			log.Debug("Stripping leading delimiter statement from migration", map[string]any{
+				"name":    m.Base().Name.Name,
+				"library": m.Base().Name.Library,
+			})
+			tokens = tokens[1:]
+		}
+		if tokens[len(tokens)-1].Type == sqltoken.DelimiterStatement {
+			log.Debug("Stripping trailing delimiter statement from migration", map[string]any{
+				"name":    m.Base().Name.Name,
+				"library": m.Base().Name.Library,
+			})
+			tokens = tokens[:len(tokens)-1]
+		}
 		result, err := tx.ExecContext(ctx, commandSQL)
 		if d.Options.DebugLogging {
 			log.Debug("Executed SQL", map[string]any{

lsmysql/mysql_test.go

@@ -273,3 +273,47 @@ func testMysqlNotAllowed(t *testing.T, dsn string, createPostfix string, driverN
 		}
 	}
 }
+
+func TestMigrationWithDelimiter(t *testing.T) {
+	options, cleanup := lstesting.FakeSchema(t, "")
+
+	t.Log("Doing migrations in database/schema", options.SchemaOverride)
+
+	t.Log("We will error on unknown migrations")
+
+	options.DebugLogging = true
+	t.Log("No opening the database...")
+	db, err := sql.Open("mysql", dsn)
+	require.NoError(t, err, "open database")
+	defer func() {
+		assert.NoError(t, db.Close())
+	}()
+	defer cleanup(db)
+
+	s := libschema.New(context.Background(), options)
+	dbase, _, err := driverNew(t, "test", s, db)
+	require.NoError(t, err, "libschema NewDatabase")
+
+	dbase.Migrations("L1",
+		lsmysql.Script("SP", `
+DELIMITER //
+CREATE PROCEDURE charge_account(id BIGINT, amount DECIMAL(18,4)) AS
+  DECLARE
+    balance_tbl QUERY(bal DECIMAL(18,4)) =
+      SELECT remaining_balance
+      FROM account_balance
+      WHERE account_id = id;
+    balance DECIMAL(18,4) = SCALAR(balance_tbl);
+    updated_balance DECIMAL(18,4) = balance - amount;
+  BEGIN
+    IF balance > amount THEN
+      UPDATE account_balance
+      SET remaining_balance = updated_balance
+      WHERE account_id = id;
+    END IF;
+  END //
+DELIMITER ;
+`))
+	err = s.Migrate(context.Background())
+	assert.NoError(t, err)
+}