mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-01 20:00:22 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

[no-release-notes] GMS bump for indexing refactor (#6649)

Browse Source 
* [no-release-notes] GMS bump for indexing refactor

* fix log table

* bump fix union test

* bump

* bump
This commit is contained in:
Maximilian Hoffman
2023-09-14 09:45:55 -07:00
committed by GitHub
parent 6bb5389eb9
commit 26a949d3c5
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/go.mod
+1 -1
View File
@@ -59,7 +59,7 @@ require (
github.com/cespare/xxhash v1.1.0
github.com/creasty/defaults v1.6.0
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2
github.com/dolthub/go-mysql-server v0.17.1-0.20230914120350-e725bf11fd15
github.com/dolthub/go-mysql-server v0.17.1-0.20230914133410-4c1d9a7cbca1
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
go/go.sum
+2 -2
View File
@@ -180,8 +180,8 @@ github.com/dolthub/fslock v0.0.3 h1:iLMpUIvJKMKm92+N1fmHVdxJP5NdyDK5bK7z7Ba2s2U=
github.com/dolthub/fslock v0.0.3/go.mod h1:QWql+P17oAAMLnL4HGB5tiovtDuAjdDTPbuqx7bYfa0=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e h1:kPsT4a47cw1+y/N5SSCkma7FhAPw7KeGmD6c9PBZW9Y=
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.17.1-0.20230914120350-e725bf11fd15 h1:4/HbFlOsExwh1mAs/Ey3iphMRLteb/Q5WTx7ysDf5uA=
github.com/dolthub/go-mysql-server v0.17.1-0.20230914120350-e725bf11fd15/go.mod h1:9JIDVpLqXjbVJMnAi8qC+ZYmzWQiUyq7DeKd3mU+YT4=
github.com/dolthub/go-mysql-server v0.17.1-0.20230914133410-4c1d9a7cbca1 h1:HAeLCztR3g/1u8wJF/Yy5EcO9HfnUzZ/zZ39f7IWWKQ=
github.com/dolthub/go-mysql-server v0.17.1-0.20230914133410-4c1d9a7cbca1/go.mod h1:9JIDVpLqXjbVJMnAi8qC+ZYmzWQiUyq7DeKd3mU+YT4=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488 h1:0HHu0GWJH0N6a6keStrHhUAK5/o9LVfkh44pvsV4514=
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488/go.mod h1:ehexgi1mPxRTk0Mok/pADALuHbvATulTh6gzr7NzZto=
github.com/dolthub/jsonpath v0.0.2-0.20230525180605-8dc13778fd72 h1:NfWmngMi1CYUWU4Ix8wM+USEhjc+mhPlT9JUR/anvbQ=
go/libraries/doltcore/sqle/dolt_log_table_function.go
+12 -8
View File
@@ -63,7 +63,7 @@ func (ltf *LogTableFunction) NewInstance(ctx *sql.Context, db sql.Database, expr
database: db,
}
node, err := newInstance.WithExpressions(expressions...)
node, err := newInstance.evalArguments(expressions...)
if err != nil {
return nil, err
}
@@ -179,11 +179,7 @@ func (ltf *LogTableFunction) CheckPrivileges(ctx *sql.Context, opChecker sql.Pri
// Expressions implements the sql.Expressioner interface.
func (ltf *LogTableFunction) Expressions() []sql.Expression {
var exprs []sql.Expression
for _, expr := range ltf.revisionExprs {
exprs = append(exprs, expr)
}
return exprs
return []sql.Expression{}
}
// getDoltArgs builds an argument string from sql expressions so that we can
@@ -252,8 +248,16 @@ func (ltf *LogTableFunction) addOptions(expression []sql.Expression) error {
return nil
}
// WithExpressions implements the sql.Expressioner interface.
func (ltf *LogTableFunction) WithExpressions(expression ...sql.Expression) (sql.Node, error) {
func (ltf *LogTableFunction) WithExpressions(exprs ...sql.Expression) (sql.Node, error) {
if len(exprs) != 0 {
return nil, sql.ErrInvalidChildrenNumber.New(0, len(exprs))
}
return ltf, nil
}
// evalArguments converts the input expressions into string literals and
// formats them as function arguments.
func (ltf *LogTableFunction) evalArguments(expression ...sql.Expression) (sql.Node, error) {
for _, expr := range expression {
if !expr.Resolved() {
return nil, ErrInvalidNonLiteralArgument.New(ltf.Name(), expr.String())
go/libraries/doltcore/sqle/sqlutil/schema.go
+1 -1
View File
@@ -63,7 +63,7 @@ func ParseCreateTableStatement(ctx *sql.Context, root *doltdb.RootValue, engine
}
// foreign keys are stored on the *doltdb.Table object, ignore them here
for _, chk := range create.ChDefs {
for _, chk := range create.Checks() {
name := getCheckConstraintName(chk)
_, err = sch.Checks().AddCheck(name, chk.Expr.String(), chk.Enforced)
if err != nil {