Merge branch 'main' into zachmu/sql-driver-tests

Author: zachmu

core/sequences/collection.go

@@ -50,19 +50,20 @@ const (
 
 // Sequence represents a single sequence within the pg_sequence table.
 type Sequence struct {
-	Id          id.Sequence
-	DataTypeID  id.Type
-	Persistence Persistence
-	Start       int64
-	Current     int64
-	Increment   int64
-	Minimum     int64
-	Maximum     int64
-	Cache       int64
-	Cycle       bool
-	IsAtEnd     bool
-	OwnerTable  id.Table
-	OwnerColumn string
+	Id            id.Sequence
+	DataTypeID    id.Type
+	Persistence   Persistence
+	Start         int64
+	Current       int64
+	Increment     int64
+	Minimum       int64
+	Maximum       int64
+	Cache         int64
+	Cycle         bool
+	IsAtEnd       bool
+	HasBeenCalled bool
+	OwnerTable    id.Table
+	OwnerColumn   string
 }
 
 var _ objinterface.Collection = (*Collection)(nil)
@@ -297,6 +298,7 @@ func (pgs *Collection) SetVal(ctx context.Context, name id.Sequence, newValue in
 	}
 	seq.Current = newValue
 	seq.IsAtEnd = false
+	seq.HasBeenCalled = false
 	if autoAdvance {
 		_, err := seq.nextValForSequence()
 		return err
@@ -450,6 +452,7 @@ func (sequence *Sequence) nextValForSequence() (int64, error) {
 		}
 	}
 	// We'll return the current value, so everything after this sets the value for the next call
+	sequence.HasBeenCalled = true
 	valueToReturn := sequence.Current
 	// Increment the current value
 	if sequence.Increment > 0 {

core/sequences/collection_funcs.go

@@ -102,6 +102,9 @@ func (*Collection) HandleMerge(ctx context.Context, mro merge.MergeRootObject) (
 			return ourCurrent
 		}
 	})
+	mergedSeq.HasBeenCalled = merge2.ResolveMergeValues(ourSeq.HasBeenCalled, theirSeq.HasBeenCalled, ancSeq.HasBeenCalled, hasAncestor, func(ourcalled, theirCalled bool) bool {
+		return ourcalled || theirCalled
+	})
 	return &mergedSeq, &merge.MergeStats{
 		Operation:            merge.TableModified,
 		Adds:                 0,

core/sequences/root_object.go

@@ -27,18 +27,19 @@ import (
 )
 
 const (
-	FIELD_NAME_DATA_TYPE    = "data_type"
-	FIELD_NAME_PERSISTENCE  = "persistence"
-	FIELD_NAME_START        = "start"
-	FIELD_NAME_CURRENT      = "current"
-	FIELD_NAME_INCREMENT    = "increment"
-	FIELD_NAME_MINIMUM      = "minimum"
-	FIELD_NAME_MAXIMUM      = "maximum"
-	FIELD_NAME_CACHE        = "cache"
-	FIELD_NAME_CYCLE        = "cycle"
-	FIELD_NAME_IS_AT_END    = "is_at_end"
-	FIELD_NAME_OWNER_TABLE  = "owner_table"
-	FIELD_NAME_OWNER_COLUMN = "owner_column"
+	FIELD_NAME_DATA_TYPE       = "data_type"
+	FIELD_NAME_PERSISTENCE     = "persistence"
+	FIELD_NAME_START           = "start"
+	FIELD_NAME_CURRENT         = "current"
+	FIELD_NAME_INCREMENT       = "increment"
+	FIELD_NAME_MINIMUM         = "minimum"
+	FIELD_NAME_MAXIMUM         = "maximum"
+	FIELD_NAME_CACHE           = "cache"
+	FIELD_NAME_CYCLE           = "cycle"
+	FIELD_NAME_IS_AT_END       = "is_at_end"
+	FIELD_NAME_HAS_BEEN_CALLED = "has_been_called"
+	FIELD_NAME_OWNER_TABLE     = "owner_table"
+	FIELD_NAME_OWNER_COLUMN    = "owner_column"
 )
 
 // DeserializeRootObject implements the interface objinterface.Collection.
@@ -109,6 +110,18 @@ func (pgs *Collection) DiffRootObjects(ctx context.Context, fromHash string, o o
 			ours.Current = diff.OurValue.(int64)
 		}
 	}
+	if ours.HasBeenCalled != theirs.HasBeenCalled {
+		diff := objinterface.RootObjectDiff{
+			Type:      pgtypes.Bool,
+			FromHash:  fromHash,
+			FieldName: FIELD_NAME_HAS_BEEN_CALLED,
+		}
+		if pgmerge.DiffValues(&diff, ours.HasBeenCalled, theirs.HasBeenCalled, ancestor.HasBeenCalled, hasAncestor) {
+			diffs = append(diffs, diff)
+		} else {
+			ours.HasBeenCalled = diff.OurValue.(bool)
+		}
+	}
 	if ours.Increment != theirs.Increment {
 		diff := objinterface.RootObjectDiff{
 			Type:      pgtypes.Int64,
@@ -239,6 +252,8 @@ func (pgs *Collection) GetFieldType(ctx context.Context, fieldName string) *pgty
 		return pgtypes.Bool
 	case FIELD_NAME_IS_AT_END:
 		return pgtypes.Bool
+	case FIELD_NAME_HAS_BEEN_CALLED:
+		return pgtypes.Bool
 	case FIELD_NAME_OWNER_TABLE:
 		return pgtypes.Text
 	case FIELD_NAME_OWNER_COLUMN:

core/sequences/serialization.go

@@ -31,7 +31,7 @@ func (sequence *Sequence) Serialize(ctx context.Context) ([]byte, error) {
 
 	// Create the writer
 	writer := utils.NewWriter(256)
-	writer.VariableUint(0) // Version
+	writer.VariableUint(1) // Version
 	// Write the sequence data
 	writer.Id(sequence.Id.AsId())
 	writer.Id(sequence.DataTypeID.AsId())
@@ -44,6 +44,7 @@ func (sequence *Sequence) Serialize(ctx context.Context) ([]byte, error) {
 	writer.Int64(sequence.Cache)
 	writer.Bool(sequence.Cycle)
 	writer.Bool(sequence.IsAtEnd)
+	writer.Bool(sequence.HasBeenCalled)
 	writer.Id(sequence.OwnerTable.AsId())
 	writer.String(sequence.OwnerColumn)
 	// Returns the data
@@ -52,13 +53,13 @@ func (sequence *Sequence) Serialize(ctx context.Context) ([]byte, error) {
 
 // DeserializeSequence returns the Sequence that was serialized in the byte slice. Returns an empty Sequence if data is
 // nil or empty.
-func DeserializeSequence(ctx context.Context, data []byte) (*Sequence, error) {
+func DeserializeSequence(_ context.Context, data []byte) (*Sequence, error) {
 	if len(data) == 0 {
 		return nil, nil
 	}
 	reader := utils.NewReader(data)
 	version := reader.VariableUint()
-	if version != 0 {
+	if version > 1 {
 		return nil, errors.Errorf("version %d of sequences is not supported, please upgrade the server", version)
 	}
 
@@ -75,6 +76,9 @@ func DeserializeSequence(ctx context.Context, data []byte) (*Sequence, error) {
 	sequence.Cache = reader.Int64()
 	sequence.Cycle = reader.Bool()
 	sequence.IsAtEnd = reader.Bool()
+	if version >= 1 {
+		sequence.HasBeenCalled = reader.Bool()
+	}
 	sequence.OwnerTable = id.Table(reader.Id())
 	sequence.OwnerColumn = reader.String()
 	if !reader.IsEmpty() {

go.mod

@@ -6,13 +6,13 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.1
 	github.com/cockroachdb/apd/v3 v3.2.3
 	github.com/cockroachdb/errors v1.7.5
-	github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069
+	github.com/dolthub/dolt/go v0.40.5-0.20260605000101-c6f847cb5242
 	github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69
 	github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
-	github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e
+	github.com/dolthub/go-mysql-server v0.20.1-0.20260604232018-6a9dd7b59c86
 	github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1
 	github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216
-	github.com/dolthub/vitess v0.0.0-20260528164423-e3f9fa81284c
+	github.com/dolthub/vitess v0.0.0-20260604210335-0893abc80542
 	github.com/fatih/color v1.13.0
 	github.com/goccy/go-json v0.10.2
 	github.com/gogo/protobuf v1.3.2
@@ -23,7 +23,7 @@ require (
 	github.com/jackc/pglogrepl v0.0.0-20240307033717-828fbfe908e9
 	github.com/jackc/pgtype v1.14.0
 	github.com/jackc/pgx/v4 v4.18.2
-	github.com/jackc/pgx/v5 v5.6.1-0.20240826124046-97d20ccfadaa
+	github.com/jackc/pgx/v5 v5.9.2
 	github.com/lib/pq v1.10.9
 	github.com/madflojo/testcerts v1.1.1
 	github.com/mitchellh/go-ps v1.0.0
@@ -41,7 +41,7 @@ require (
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
 	golang.org/x/net v0.50.0
 	golang.org/x/sync v0.20.0
-	golang.org/x/sys v0.42.0
+	golang.org/x/sys v0.45.0
 	golang.org/x/text v0.35.0
 	gopkg.in/src-d/go-errors.v1 v1.0.0
 	gopkg.in/yaml.v2 v2.4.0
@@ -104,7 +104,7 @@ require (
 	github.com/denisbrodbeck/machineid v1.0.1 // indirect
 	github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 // indirect
 	github.com/dolthub/dolt-mcp v0.3.4 // indirect
-	github.com/dolthub/fslock v0.0.4 // indirect
+	github.com/dolthub/fslock v0.0.5 // indirect
 	github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 // indirect
 	github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 // indirect
 	github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 // indirect
@@ -142,6 +142,7 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d // indirect
 	github.com/kch42/buzhash v0.0.0-20160816060738-9bdec3dec7c6 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect

go.sum

@@ -246,18 +246,18 @@ github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12 h1:I
 github.com/dolthub/aws-sdk-go-ini-parser v0.0.0-20250305001723-2821c37f6c12/go.mod h1:rN7X8BHwkjPcfMQQ2QTAq/xM3leUSGLfb+1Js7Y6TVo=
 github.com/dolthub/dolt-mcp v0.3.4 h1:AyG5cw+fNWXDHXujtQnqUPZrpWtPg6FN6yYtjv1pP44=
 github.com/dolthub/dolt-mcp v0.3.4/go.mod h1:bCZ7KHvDYs+M0e+ySgmGiNvLhcwsN7bbf5YCyillLrk=
-github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069 h1:tsedds8wbL0CnHNYSH0bL9jXArGVdtlpx5ProefkB40=
-github.com/dolthub/dolt/go v0.40.5-0.20260603172609-0adf0e2d0069/go.mod h1:TJo9UN4IiXL4sx6NHVxWntKmpMKx4Cng31lqxtZxZlw=
+github.com/dolthub/dolt/go v0.40.5-0.20260605000101-c6f847cb5242 h1:nx7bb7QFGHvZgCDjTDFQgU3IwdyKs0GI3fT9HqdnB1w=
+github.com/dolthub/dolt/go v0.40.5-0.20260605000101-c6f847cb5242/go.mod h1:VQdcfyqjyhjVDZSBagYjimKXfTQNYGtWA0MHx1fIGDU=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69 h1:JShhbqMw26nKx3pqqu/cFxOpzBkN+4elVhzuUfgDw2k=
 github.com/dolthub/eventsapi_schema v0.0.0-20260310172945-37a9265ade69/go.mod h1:SSLraQS/jGLYFgff3vuZ+JbVUct6vyEeMzjLBqWqoyM=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1Gms9599cr0REMww=
 github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
-github.com/dolthub/fslock v0.0.4 h1:p0FcUPu81bO53349qPT1im7XyGu3CwZDsB0PEVdFcaE=
-github.com/dolthub/fslock v0.0.4/go.mod h1:895XJNoMTlL5N1TjOJbd9Pnpjtv1DW/Ddw9qShcAYsM=
+github.com/dolthub/fslock v0.0.5 h1:QoXhBhgY1oumHE26qyE7tgmXUT8qjJwxsIzo54O/B/k=
+github.com/dolthub/fslock v0.0.5/go.mod h1:sdofYYqE0D79zNZyB4/kmlnsQOVap1C2yByjGKSirEM=
 github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866 h1:U6gSf5I0e6h6GP1/5Sa7D2lWW1CWfcVPtY5wkyHq6jY=
 github.com/dolthub/go-icu-regex v0.0.0-20260412212219-49724d547866/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e h1:rqmQ4Jm9lSZKbeFNZBvjZmPrfauN3ZYosfajkE5hlRM=
-github.com/dolthub/go-mysql-server v0.20.1-0.20260603165028-b60521c3724e/go.mod h1:UTL4UvG/y8PMBcI8I60gf0DH4YPBALW/8UQCcvft95Y=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260604232018-6a9dd7b59c86 h1:V5tdwzJZOzaRHq7TpCP12/rHztVl7m3YKGZd8ej4h+E=
+github.com/dolthub/go-mysql-server v0.20.1-0.20260604232018-6a9dd7b59c86/go.mod h1:A3nEC4RgBm9UzuQCGhQhJDQAiFMPsZU3NPKbGhEd8R4=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63 h1:OAsXLAPL4du6tfbBgK0xXHZkOlos63RdKYS3Sgw/dfI=
 github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63/go.mod h1:lV7lUeuDhH5thVGDCKXbatwKy2KW80L4rMT46n+Y2/Q=
 github.com/dolthub/ishell v0.0.0-20260414231531-5f031e3e9037 h1:oIW9HwuWrhxv+4HZxA+QQSKHLqWFyXZ2FmNjUYwkdiM=
@@ -268,8 +268,8 @@ github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1 h1:GY17cGA4
 github.com/dolthub/pg_query_go/v6 v6.0.0-20251215122834-fb20be4254d1/go.mod h1:qnrZP3/1slFl2Bq5yw38HLOsArZareGwdpEceriblLc=
 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 h1:JWkKRE4EHUcEVQCMRBej8DYxjYjRz/9MdF/NNQh0o70=
 github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216/go.mod h1:e/FIZVvT2IR53HBCAo41NjqgtEnjMJGKca3Y/dAmZaA=
-github.com/dolthub/vitess v0.0.0-20260528164423-e3f9fa81284c h1:DRmvqtt1OCIdtFAg8daaaIOGEe6gVWiSlhABDi+lNIg=
-github.com/dolthub/vitess v0.0.0-20260528164423-e3f9fa81284c/go.mod h1:dKAkzdfRkAudpc0g8JOQ0eiEjV83TYIFz/yNIEdcjXM=
+github.com/dolthub/vitess v0.0.0-20260604210335-0893abc80542 h1:0A5Y1IP9ribdYzzWDZwN/NM+oxCfmYh7NuM2xIIrEag=
+github.com/dolthub/vitess v0.0.0-20260604210335-0893abc80542/go.mod h1:dKAkzdfRkAudpc0g8JOQ0eiEjV83TYIFz/yNIEdcjXM=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -515,14 +515,13 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.18.2 h1:xVpYkNR5pk5bMCZGfClbO962UIqVABcAGt7ha1s/FeU=
 github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
-github.com/jackc/pgx/v5 v5.6.1-0.20240826124046-97d20ccfadaa h1:IIbDgou/DST5BTnRceegoZORXtRgthC3VR1TKIrsrns=
-github.com/jackc/pgx/v5 v5.6.1-0.20240826124046-97d20ccfadaa/go.mod h1:awP1KNnjylvpxHuHP63gzjhnGkI1iw+PMoIwvoleN/8=
+github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
+github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
-github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jcmturner/gofork v0.0.0-20180107083740-2aebee971930/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -1036,8 +1035,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4 h1:bTLqdHv7xrGlFbvf5/TXNxy/iUwwdkjhqQTJDjW7aj0=
 golang.org/x/telemetry v0.0.0-20260209163413-e7419c687ee4/go.mod h1:g5NllXBEermZrmR51cJDQxmJUHUOfRAaNyWBM+R+548=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=

server/ast/alter_table.go

@@ -22,6 +22,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/dolthub/doltgresql/postgres/parser/sem/tree"
+	pgnodes "github.com/dolthub/doltgresql/server/node"
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
@@ -44,6 +45,16 @@ func nodeAlterTable(ctx *Context, node *tree.AlterTable) (vitess.Statement, erro
 		if ok {
 			return nodeAlterTableComputed(ctx, treeTableName, cmd)
 		}
+		if vcmd, ok := node.Cmds[0].(*tree.AlterTableValidateConstraint); ok {
+			return vitess.InjectedStatement{
+				Statement: pgnodes.NewValidateConstraint(
+					tableName.SchemaQualifier.String(),
+					tableName.Name.String(),
+					bareIdentifier(vcmd.Constraint),
+				),
+				Children: nil,
+			}, nil
+		}
 	}
 	statements, noOps, err := nodeAlterTableCmds(ctx, node.Cmds, tableName, node.IfExists)
 	if err != nil {
@@ -184,18 +195,20 @@ func nodeAlterTableAddConstraint(
 	tableName vitess.TableName,
 	ifExists bool) (*vitess.DDL, error) {
 
-	if node.ValidationBehavior == tree.ValidationSkip {
-		// currently only allowed for foreign key and CHECK constraints
-		return nil, errors.Errorf("NOT VALID is not supported yet")
+	notValid := node.ValidationBehavior == tree.ValidationSkip
+	if notValid {
+		if _, ok := node.ConstraintDef.(*tree.UniqueConstraintTableDef); ok {
+			return nil, errors.Errorf("NOT VALID is not applicable to UNIQUE or PRIMARY KEY constraints")
+		}
 	}
 
 	switch constraintDef := node.ConstraintDef.(type) {
 	case *tree.CheckConstraintTableDef:
-		return nodeCheckConstraintTableDef(ctx, constraintDef, tableName, ifExists)
+		return nodeCheckConstraintTableDef(ctx, constraintDef, tableName, ifExists, notValid)
 	case *tree.UniqueConstraintTableDef:
 		return nodeUniqueConstraintTableDef(ctx, constraintDef, tableName, ifExists)
 	case *tree.ForeignKeyConstraintTableDef:
-		foreignKeyDefinition, err := nodeForeignKeyConstraintTableDef(ctx, constraintDef)
+		foreignKeyDefinition, err := nodeForeignKeyConstraintTableDef(ctx, constraintDef, notValid)
 		if err != nil {
 			return nil, err
 		}

server/ast/constraint_table_def.go

@@ -25,12 +25,13 @@ import (
 // nodeCheckConstraintTableDef converts a tree.CheckConstraintTableDef instance
 // into a vitess.DDL instance that can be executed by GMS. |tableName| identifies
 // the table being altered, and |ifExists| indicates whether the IF EXISTS clause
-// was specified.
+// was specified. |notValid| reflects whether the NOT VALID clause was present.
 func nodeCheckConstraintTableDef(
 	ctx *Context,
 	node *tree.CheckConstraintTableDef,
 	tableName vitess.TableName,
-	ifExists bool) (*vitess.DDL, error) {
+	ifExists bool,
+	notValid bool) (*vitess.DDL, error) {
 
 	if node.NoInherit {
 		return nil, errors.Errorf("NO INHERIT is not yet supported for check constraints")
@@ -53,6 +54,7 @@ func nodeCheckConstraintTableDef(
 					Details: &vitess.CheckConstraintDefinition{
 						Expr:     expr,
 						Enforced: true,
+						NotValid: notValid,
 					},
 				},
 			},

server/ast/convert.go

@@ -23,6 +23,12 @@ import (
 	"github.com/dolthub/doltgresql/postgres/parser/sem/tree"
 )
 
+// UnknownColSentinelPrefix is prepended to the index position of unaliased string literals in a
+// SELECT clause. This gives GMS a unique per-position alias so its alias scope map can distinguish
+// multiple unnamed columns in the same SELECT. schemaToFieldDescriptions in doltgres_handler.go
+// strips this prefix and returns Postgres's "?column?" placeholder on the wire.
+const UnknownColSentinelPrefix = "__?column?__"
+
 // Convert converts a Postgres AST into a Vitess AST.
 func Convert(postgresStmt parser.Statement) (vitess.Statement, error) {
 	ctx := NewContext(postgresStmt)

server/ast/foreign_key_constraint_table_def.go

@@ -23,15 +23,16 @@ import (
 )
 
 // nodeForeignKeyConstraintTableDef handles *tree.ForeignKeyConstraintTableDef nodes.
-func nodeForeignKeyConstraintTableDef(ctx *Context, node *tree.ForeignKeyConstraintTableDef) (*vitess.ForeignKeyDefinition, error) {
+func nodeForeignKeyConstraintTableDef(ctx *Context, node *tree.ForeignKeyConstraintTableDef, notValid bool) (*vitess.ForeignKeyDefinition, error) {
 	if node == nil {
 		return nil, nil
 	}
+	var matchType vitess.ForeignKeyMatchType
 	switch node.Match {
 	case tree.MatchSimple:
-		// This is the default behavior
+		matchType = vitess.MatchSimple
 	case tree.MatchFull:
-		return nil, errors.Errorf("MATCH FULL is not yet supported")
+		matchType = vitess.MatchFull
 	case tree.MatchPartial:
 		return nil, errors.Errorf("MATCH PARTIAL is not yet supported")
 	default:
@@ -78,5 +79,7 @@ func nodeForeignKeyConstraintTableDef(ctx *Context, node *tree.ForeignKeyConstra
 		ReferencedColumns: toCols,
 		OnDelete:          refActions[0],
 		OnUpdate:          refActions[1],
+		NotValid:          notValid,
+		MatchType:         matchType,
 	}, nil
 }