Merge pull request #158 from cloudspannerecosystem/add-allow-commitment-timestamp-test

support AllowCommitTimestamp

Author: sinmetal

Makefile

@@ -69,8 +69,8 @@ testdata-from-ddl/default:
 	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --package models --out test/testmodels/default/
 
 testdata-from-ddl/underscore:
-	rm -rf test/testmodels/underscores && mkdir -p test/testmodels/underscores
-	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --package models --underscore --out test/testmodels/underscores/
+	rm -rf test/testmodels/underscore && mkdir -p test/testmodels/underscore
+	$(YOBIN) generate ./test/testdata/schema.sql --from-ddl --package models --underscore --out test/testmodels/underscore/
 
 testdata-from-ddl/single:
 	rm -rf test/testmodels/single && mkdir -p test/testmodels/single

loaders/parser.go

@@ -148,13 +148,13 @@ func (s *SpannerLoaderFromDDL) ColumnList(name string) ([]*models.Column, error)
 		}
 
 		cols = append(cols, &models.Column{
-			FieldOrdinal:         i + 1,
-			ColumnName:           c.Name.Name,
-			DataType:             c.Type.SQL(),
-			NotNull:              c.NotNull,
-			IsPrimaryKey:         pk,
-			IsGenerated:          isGenerated,
-			AllowCommitTimestamp: allowCommitTimestamp,
+			FieldOrdinal:           i + 1,
+			ColumnName:             c.Name.Name,
+			DataType:               c.Type.SQL(),
+			NotNull:                c.NotNull,
+			IsPrimaryKey:           pk,
+			IsGenerated:            isGenerated,
+			IsAllowCommitTimestamp: allowCommitTimestamp,
 		})
 	}
 

loaders/spanner.go

@@ -250,7 +250,13 @@ func spanTableColumns(client *spanner.Client, table string) ([]*models.Column, e
 		`  AND ic.COLUMN_NAME = c.COLUMN_NAME` +
 		`  AND ic.INDEX_NAME = "PRIMARY_KEY" ` +
 		`) IS_PRIMARY_KEY, ` +
-		`IS_GENERATED = "ALWAYS" AS IS_GENERATED ` +
+		`IS_GENERATED = "ALWAYS" AS IS_GENERATED, ` +
+		`EXISTS (` +
+		`	SELECT 1 FROM INFORMATION_SCHEMA.COLUMN_OPTIONS ic` +
+		`	WHERE ic.TABLE_SCHEMA = "" AND ic.TABLE_NAME = c.TABLE_NAME` +
+		`	AND ic.COLUMN_NAME = c.COLUMN_NAME` +
+		`	AND ic.OPTION_NAME = "allow_commit_timestamp"` +
+		`) IS_ALLOW_COMMIT_TIMESTAMP,` +
 		`FROM INFORMATION_SCHEMA.COLUMNS c ` +
 		`WHERE c.TABLE_SCHEMA = "" AND c.TABLE_NAME = @table ` +
 		`ORDER BY c.ORDINAL_POSITION`
@@ -296,6 +302,9 @@ func spanTableColumns(client *spanner.Client, table string) ([]*models.Column, e
 		if err := row.ColumnByName("IS_GENERATED", &c.IsGenerated); err != nil {
 			return nil, err
 		}
+		if err := row.ColumnByName("IS_ALLOW_COMMIT_TIMESTAMP", &c.IsAllowCommitTimestamp); err != nil {
+			return nil, err
+		}
 
 		res = append(res, &c)
 	}

models/model.go

@@ -28,13 +28,13 @@ type Table struct {
 
 // Column represents column info.
 type Column struct {
-	FieldOrdinal         int    // field_ordinal
-	ColumnName           string // column_name
-	DataType             string // data_type
-	NotNull              bool   // not_null
-	IsPrimaryKey         bool   // is_primary_key
-	IsGenerated          bool   // is_generated
-	AllowCommitTimestamp bool   // allow_commit_timestamp
+	FieldOrdinal           int    // field_ordinal
+	ColumnName             string // column_name
+	DataType               string // data_type
+	NotNull                bool   // not_null
+	IsPrimaryKey           bool   // is_primary_key
+	IsGenerated            bool   // is_generated
+	IsAllowCommitTimestamp bool   // is_allow_commit_timestamp
 }
 
 // Index represents an index.

templates/type.go.tpl

@@ -67,7 +67,9 @@ func ({{ $short }} *{{ .Name }}) columnsToValues(cols []string) ([]interface{},
 		switch col {
 {{- range .Fields }}
 		case "{{ colname .Col }}":
-			{{- if .CustomType }}
+		    {{- if .Col.IsAllowCommitTimestamp }}
+		    ret = append(ret, spanner.CommitTimestamp)
+			{{- else if .CustomType }}
 			ret = append(ret, {{ .Type }}({{ $short }}.{{ .Name }}))
 			{{- else }}
 			ret = append(ret, {{ $short }}.{{ .Name }})

test/integration_test.go

@@ -32,6 +32,7 @@ import (
 	"cloud.google.com/go/spanner"
 	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/gax-go/v2/apierror"
+	"go.mercari.io/yo/loaders"
 	"go.mercari.io/yo/test/testmodels/customtypes"
 	models "go.mercari.io/yo/test/testmodels/default"
 	"go.mercari.io/yo/test/testutil"
@@ -579,6 +580,96 @@ func TestCustomCompositePrimaryKey(t *testing.T) {
 	})
 }
 
+func TestAllowCommitTimestamp(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	v := &models.AllowCommitTimestamp{
+		ID:        300,
+		UpdatedAt: spanner.CommitTimestamp,
+	}
+
+	if _, err := client.Apply(ctx, []*spanner.Mutation{v.Insert(ctx)}); err != nil {
+		t.Fatalf("Apply failed: %v", err)
+	}
+
+	var insertTime time.Time
+	t.Run("Insert", func(t *testing.T) {
+		got, err := models.FindAllowCommitTimestamp(ctx, client.Single(), 300)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if got.UpdatedAt.IsZero() {
+			t.Errorf("got UpdatedAt.IsZero")
+		}
+		insertTime = got.UpdatedAt
+	})
+
+	t.Run("Update", func(t *testing.T) {
+		gc := &models.AllowCommitTimestamp{
+			ID:        300,
+			UpdatedAt: spanner.CommitTimestamp,
+		}
+
+		if _, err := client.Apply(ctx, []*spanner.Mutation{gc.Update(ctx)}); err != nil {
+			t.Fatalf("Apply failed: %v", err)
+		}
+
+		got, err := models.FindAllowCommitTimestamp(ctx, client.Single(), 300)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		if !got.UpdatedAt.After(insertTime) {
+			t.Errorf("expected UpdatedAt (%v) to be after insertTime (%v)", got.UpdatedAt, insertTime)
+		}
+	})
+
+	t.Run("InsertOrUpdate", func(t *testing.T) {
+		gc := &models.AllowCommitTimestamp{
+			ID:        300,
+			UpdatedAt: spanner.CommitTimestamp,
+		}
+
+		if _, err := client.Apply(ctx, []*spanner.Mutation{gc.InsertOrUpdate(ctx)}); err != nil {
+			t.Fatalf("Apply failed: %v", err)
+		}
+
+		got, err := models.FindAllowCommitTimestamp(ctx, client.Single(), 300)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+
+		if got.UpdatedAt.IsZero() {
+			t.Errorf("got UpdatedAt.IsZero")
+		}
+	})
+
+	t.Run("IsAllowCommitTimestamp", func(t *testing.T) {
+		gc := &models.AllowCommitTimestamp{
+			ID:        300,
+			UpdatedAt: spanner.CommitTimestamp,
+		}
+
+		if _, err := client.Apply(ctx, []*spanner.Mutation{gc.Update(ctx)}); err != nil {
+			t.Fatalf("Apply failed: %v", err)
+		}
+
+		cols, err := loaders.SpanTableColumns(client, "AllowCommitTimestamp")
+		if err != nil {
+			t.Fatalf("SpanTableColumns failed: %v", err)
+		}
+
+		for _, col := range cols {
+			if col.ColumnName == "UpdatedAt" {
+				if !col.IsAllowCommitTimestamp {
+					t.Errorf("updated_at is not AllowCommitTimestamp")
+				}
+			}
+		}
+	})
+}
+
 func TestGeneratedColumn(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

test/testdata/schema.sql

@@ -116,3 +116,8 @@ CREATE TABLE GeneratedColumns (
   LastName STRING(50) NOT NULL,
   FullName STRING(100) NOT NULL AS (ARRAY_TO_STRING([FirstName, LastName], " ")) STORED,
 ) PRIMARY KEY (ID);
+
+CREATE TABLE AllowCommitTimestamp (
+  ID INT64 NOT NULL,
+  UpdatedAt TIMESTAMP NOT NULL OPTIONS (allow_commit_timestamp=true)
+) PRIMARY KEY(ID);