Skip to content

remove pk and not null constraint from to_ and from_ columns #11191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jycor wants to merge 8 commits into
base: main
Choose a base branch
from
Open

remove pk and not null constraint from to_ and from_ columns #11191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd7acfb
test bump
Jun 10, 2026
43e2d49
fix
Jun 10, 2026
28c3213
fix tests
Jun 10, 2026
cf842a3
bump
Jun 10, 2026
796ebbd
more dolt index generation
Jun 10, 2026
d73ca71
fix error messages
Jun 10, 2026
2de22d2
bats
Jun 10, 2026
4310db8
goddamit
Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ require (
github.com/dolthub/dolt-mcp v0.3.4
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.20260610164400-95a86636de35
github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101
github.com/dolthub/gozstd v0.0.0-20240423170813-23a2903bca63
github.com/edsrzf/mmap-go v1.2.0
github.com/esote/minmaxheap v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ 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-20260610153742-72563bc7ca83 h1:FEMjCGEroDnY/BXyAffVZxUpXhP2GpoUJyyq5KaLn8c=
github.com/dolthub/go-icu-regex v0.0.0-20260610153742-72563bc7ca83/go.mod h1:F3cnm+vMRK1HaU6+rNqQrOCyR03HHhR1GWG2gnPOqaE=
github.com/dolthub/go-mysql-server v0.20.1-0.20260610164400-95a86636de35 h1:vwfXXg7kqpmJhBrBc2tbJXQTg1PdlNjztesIdgQhgkk=
github.com/dolthub/go-mysql-server v0.20.1-0.20260610164400-95a86636de35/go.mod h1:xrwqyZnkLeqNm/LNp57NB+otApMXv1UJohn9dSkbgR0=
github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101 h1:Abci4YqSTb0jRO7H/BGljkSJ0hkAZvZlim74JLAWros=
github.com/dolthub/go-mysql-server v0.20.1-0.20260610222239-82ca9a426101/go.mod h1:xrwqyZnkLeqNm/LNp57NB+otApMXv1UJohn9dSkbgR0=
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=
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/dtables/commit_diff_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (dt *CommitDiffTable) LookupPartitions(ctx *sql.Context, lookup sql.IndexLo
switch to.UpperBound.(type) {
case sql.Above, sql.Below:
default:
return nil, ErrInvalidCommitDiffTableArgs
return nil, ErrExactlyOneToCommit
}
switch from.UpperBound.(type) {
case sql.Above, sql.Below:
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/enginetest/dolt_queries_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5339,7 +5339,7 @@ var CommitDiffSystemTableScriptTests = []queries.ScriptTest{
},
{
Query: "SELECT * FROM DOLT_COMMIT_DIFF_t where from_commit=@Commit1;",
ExpectedErrStr: "error querying table dolt_commit_diff_t: dolt_commit_diff_* tables must be filtered to a single 'to_commit'",
ExpectedErrStr: dtables.ErrExactlyOneToCommit.Error(),
},
},
},
Expand Down
5 changes: 5 additions & 0 deletions go/libraries/doltcore/sqle/index/dolt_index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ func DoltDiffIndexesFromTable(ctx context.Context, db, tbl string, t *doltdb.Tab
for i, col := range cols {
keyCols[i] = col
keyCols[i].Name = toFrom + "_" + col.Name
keyCols[i].IsPartOfPK = false
keyCols[i].Constraints = nil
}

// to_ columns
Expand Down Expand Up @@ -224,6 +226,8 @@ func MakeDiffTableIndex(tableName string, prefix string, sch schema.Schema, incl
}
for _, col := range sch.GetPKCols().GetColumns() {
col.Name = prefix + "_" + col.Name
col.IsPartOfPK = false
col.Constraints = nil
cols = append(cols, col)
}

Expand Down Expand Up @@ -637,6 +641,7 @@ func (di *doltIndex) ColumnExpressionTypes(ctx *sql.Context) []sql.ColumnExpress
di.colExprTypes[i] = sql.ColumnExpressionType{
Expression: di.tblName + "." + col.Name,
Type: col.TypeInfo.ToSqlType(),
Nullable: col.IsNullable(),
}
}
}
Expand Down
Loading