Merge branch 'main' into snippets

README.md

@@ -91,6 +91,27 @@ Cloud Spanner supports the following data types in combination with `gorm`.
 | bytes                    | []byte                       |
 
 
+## AutoMigrate Dry Run
+The Spanner `gorm` dialect supports dry-runs for auto-migration. Use this to get the
+DDL statements that would be generated and executed by auto-migration. You can manually
+verify and modify these statements to optimize your data model.
+
+Example:
+
+```go
+tables := []interface{}{&singer{}, &album{}}
+
+// Unwrap the underlying SpannerMigrator interface. This interface supports
+// the `AutoMigrateDryRun` method, which does not actually execute the
+// generated statements, and instead just returns these as an array.
+m := db.Migrator()
+migrator, ok := m.(spannergorm.SpannerMigrator)
+if !ok {
+    return fmt.Errorf("unexpected migrator type: %v", m)
+}
+statements, err := migrator.AutoMigrateDryRun(tables...)
+```
+
 ## Limitations
 The Cloud Spanner `gorm` dialect has the following known limitations:
 

go.mod

@@ -8,6 +8,7 @@ require (
 	cloud.google.com/go/longrunning v0.6.2
 	cloud.google.com/go/spanner v1.73.0
 	github.com/golang/protobuf v1.5.4
+	github.com/google/go-cmp v0.6.0
 	github.com/googleapis/go-sql-spanner v1.8.0
 	github.com/shopspring/decimal v1.4.0
 	github.com/stretchr/testify v1.9.0

migrator.go

@@ -17,6 +17,7 @@ package gorm
 import (
 	"database/sql"
 	"fmt"
+	"slices"
 	"sort"
 	"strings"
 
@@ -179,17 +180,32 @@ func (m spannerMigrator) CreateTable(values ...interface{}) error {
 			}
 
 			// Indexes should always be created after the table, as Spanner does not support
-			// inline index creation.
-			for _, idx := range stmt.Schema.ParseIndexes() {
+			// inline index creation. Iterate over the indexes in a fixed order to make the
+			// script outcome deterministic.
+			indexes := stmt.Schema.ParseIndexes()
+			indexNames := make([]string, 0, len(indexes))
+			for name := range indexes {
+				indexNames = append(indexNames, name)
+			}
+			slices.Sort(indexNames)
+			for _, name := range indexNames {
+				idx := indexes[name]
 				defer func(value interface{}, name string) {
 					if errr == nil {
 						errr = tx.Migrator().CreateIndex(value, name)
 					}
 				}(value, idx.Name)
 			}
 
-			for _, rel := range stmt.Schema.Relationships.Relations {
+			// Iterator over the relationships in a fixed order.
+			relationshipKeys := make([]string, 0, len(stmt.Schema.Relationships.Relations))
+			for key := range stmt.Schema.Relationships.Relations {
+				relationshipKeys = append(relationshipKeys, key)
+			}
+			slices.Sort(relationshipKeys)
+			for _, key := range relationshipKeys {
 				if !m.DB.DisableForeignKeyConstraintWhenMigrating {
+					rel := stmt.Schema.Relationships.Relations[key]
 					if constraint := rel.ParseConstraint(); constraint != nil {
 						if constraint.Schema == stmt.Schema {
 							sql, vars := buildConstraint(constraint)

migrator_emulator_test.go

@@ -25,6 +25,7 @@ import (
 	"cloud.google.com/go/spanner"
 	database "cloud.google.com/go/spanner/admin/database/apiv1"
 	"cloud.google.com/go/spanner/admin/database/apiv1/databasepb"
+	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/go-gorm-spanner/testutil"
 	"github.com/shopspring/decimal"
 	"gorm.io/datatypes"
@@ -107,7 +108,30 @@ func TestAutoMigrate_CreateDataModel(t *testing.T) {
 	if err != nil {
 		log.Fatal(err)
 	}
-	err = db.Migrator().AutoMigrate(&Singer{}, &Album{}, &Track{}, &Venue{}, &Concert{})
+	tables := []interface{}{&Singer{}, &Album{}, &Track{}, &Venue{}, &Concert{}}
+	statements, err := db.Migrator().(SpannerMigrator).AutoMigrateDryRun(tables...)
+	if diff := cmp.Diff(statements, []spanner.Statement{
+		{SQL: `CREATE SEQUENCE IF NOT EXISTS singers_seq OPTIONS (sequence_kind = "bit_reversed_positive")`, Params: map[string]any{}},
+		{SQL: "CREATE TABLE `singers` (`id` INT64 DEFAULT (GET_NEXT_SEQUENCE_VALUE(Sequence singers_seq)),`created_at` TIMESTAMP,`updated_at` TIMESTAMP,`deleted_at` TIMESTAMP,`first_name` STRING(MAX),`last_name` STRING(MAX),`full_name` STRING(MAX) AS (concat(coalesce(first_name, ''),' ',last_name)) STORED,`active` BOOL) PRIMARY KEY (`id`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_singers_deleted_at` ON `singers`(`deleted_at`)", Params: map[string]any{}},
+		{SQL: `CREATE SEQUENCE IF NOT EXISTS albums_seq OPTIONS (sequence_kind = "bit_reversed_positive")`, Params: map[string]any{}},
+		{SQL: "CREATE TABLE `albums` (`id` INT64 DEFAULT (GET_NEXT_SEQUENCE_VALUE(Sequence albums_seq)),`created_at` TIMESTAMP,`updated_at` TIMESTAMP,`deleted_at` TIMESTAMP,`title` STRING(MAX),`marketing_budget` BOOL,`release_date` date,`cover_picture` BYTES(MAX),`singer_id` INT64,CONSTRAINT `fk_singers_albums` FOREIGN KEY (`singer_id`) REFERENCES `singers`(`id`)) PRIMARY KEY (`id`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_albums_deleted_at` ON `albums`(`deleted_at`)", Params: map[string]any{}},
+		{SQL: `CREATE SEQUENCE IF NOT EXISTS tracks_seq OPTIONS (sequence_kind = "bit_reversed_positive")`, Params: map[string]any{}},
+		{SQL: "CREATE TABLE `tracks` (`id` INT64 DEFAULT (GET_NEXT_SEQUENCE_VALUE(Sequence tracks_seq)),`created_at` TIMESTAMP,`updated_at` TIMESTAMP,`deleted_at` TIMESTAMP,`track_number` INT64,`title` STRING(MAX),`sample_rate` FLOAT64,`album_id` INT64,CONSTRAINT `fk_albums_tracks` FOREIGN KEY (`album_id`) REFERENCES `albums`(`id`)) PRIMARY KEY (`id`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_tracks_deleted_at` ON `tracks`(`deleted_at`)", Params: map[string]any{}},
+		{SQL: `CREATE SEQUENCE IF NOT EXISTS venues_seq OPTIONS (sequence_kind = "bit_reversed_positive")`, Params: map[string]any{}},
+		{SQL: "CREATE TABLE `venues` (`id` INT64 DEFAULT (GET_NEXT_SEQUENCE_VALUE(Sequence venues_seq)),`created_at` TIMESTAMP,`updated_at` TIMESTAMP,`deleted_at` TIMESTAMP,`name` STRING(MAX),`description` JSON) PRIMARY KEY (`id`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_venues_deleted_at` ON `venues`(`deleted_at`)", Params: map[string]any{}},
+		{SQL: `CREATE SEQUENCE IF NOT EXISTS concerts_seq OPTIONS (sequence_kind = "bit_reversed_positive")`, Params: map[string]any{}},
+		{SQL: "CREATE TABLE `concerts` (`id` INT64 DEFAULT (GET_NEXT_SEQUENCE_VALUE(Sequence concerts_seq)),`created_at` TIMESTAMP,`updated_at` TIMESTAMP,`deleted_at` TIMESTAMP,`name` STRING(MAX),`venue_id` INT64,`singer_id` INT64,`start_time` TIMESTAMP,`end_time` TIMESTAMP,CONSTRAINT `fk_singers_concerts` FOREIGN KEY (`singer_id`) REFERENCES `singers`(`id`),CONSTRAINT `fk_venues_concerts` FOREIGN KEY (`venue_id`) REFERENCES `venues`(`id`)) PRIMARY KEY (`id`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_concerts_time` ON `concerts`(`start_time`,`end_time`)", Params: map[string]any{}},
+		{SQL: "CREATE INDEX `idx_concerts_deleted_at` ON `concerts`(`deleted_at`)", Params: map[string]any{}},
+	}, cmp.AllowUnexported(spanner.Statement{})); diff != "" {
+		t.Errorf("auto-migrate statements mismatch: %v", diff)
+	}
+
+	err = db.Migrator().AutoMigrate(tables...)
 	if err != nil {
 		t.Fatal(err)
 	}

retry.go

@@ -27,11 +27,7 @@ import (
 
 // RunTransaction executes a transaction on Spanner using the given
 // gorm database, and retries the transaction if it is aborted by Spanner.
-func RunTransaction(
-	ctx context.Context,
-	db *gorm.DB,
-	fc func(tx *gorm.DB) error,
-	opts ...*sql.TxOptions) error {
+func RunTransaction(ctx context.Context, db *gorm.DB, fc func(tx *gorm.DB) error, opts ...*sql.TxOptions) error {
 	for {
 		err := db.Transaction(fc, opts...)
 		if err == nil {