Merge pull request #150 from earlgray283/master

[v1] add allowCommitTimestamp field to models.Column

Author: sinmetal

loaders/parser.go

@@ -132,13 +132,29 @@ func (s *SpannerLoaderFromDDL) ColumnList(name string) ([]*models.Column, error)
 		if _, ok := c.DefaultSemantics.(*ast.GeneratedColumnExpr); ok {
 			isGenerated = true
 		}
+
+		allowCommitTimestamp := false
+		if c.Options != nil {
+			for _, r := range c.Options.Records {
+				if r.Name.Name == "allow_commit_timestamp" {
+					boolLiteral, ok := r.Value.(*ast.BoolLiteral)
+					if !ok {
+						return nil, fmt.Errorf("the type of 'allow_commit_timestamp' should be 'bool', but got '%T'", r.Value)
+					}
+					allowCommitTimestamp = boolLiteral.Value
+					break
+				}
+			}
+		}
+
 		cols = append(cols, &models.Column{
-			FieldOrdinal: i + 1,
-			ColumnName:   c.Name.Name,
-			DataType:     c.Type.SQL(),
-			NotNull:      c.NotNull,
-			IsPrimaryKey: pk,
-			IsGenerated:  isGenerated,
+			FieldOrdinal:         i + 1,
+			ColumnName:           c.Name.Name,
+			DataType:             c.Type.SQL(),
+			NotNull:              c.NotNull,
+			IsPrimaryKey:         pk,
+			IsGenerated:          isGenerated,
+			AllowCommitTimestamp: allowCommitTimestamp,
 		})
 	}
 

models/model.go

@@ -28,12 +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
+	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
 }
 
 // Index represents an index.