mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-13 03:10:03 -05:00
Code Issues Packages Projects Releases 164 Wiki Activity

[auto-bump] [no-release-notes] dependency by jycor (#7342)

Browse Source
This commit is contained in:
Dustin Brown
2024-01-17 12:27:11 -08:00
committed by GitHub
parent ff1e8f75ad
commit 95aeffef44
21 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/commands/add.go
+2 -2
View File
@@ -127,13 +127,13 @@ func (cmd AddCmd) Exec(ctx context.Context, commandStr string, args []string, dE
}
}
schema, rowIter, err := queryist.Query(sqlCtx, generateAddSql(apr))
_, rowIter, err := queryist.Query(sqlCtx, generateAddSql(apr))
if err != nil {
cli.PrintErrln(errhand.VerboseErrorFromError(err))
return 1
}
_, err = sql.RowIterToRows(sqlCtx, schema, rowIter)
_, err = sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
cli.PrintErrln(errhand.VerboseErrorFromError(err))
return 1
go/cmd/dolt/commands/assist.go
+2 -2
View File
@@ -586,11 +586,11 @@ func getCreateTableStatements(ctx *sql.Context, sqlEngine *engine.SqlEngine, dEn
tables, err := root.GetTableNames(ctx)
for _, table := range tables {
sch, iter, err := sqlEngine.Query(ctx, fmt.Sprintf("SHOW CREATE TABLE %s", sql.QuoteIdentifier(table)))
_, iter, err := sqlEngine.Query(ctx, fmt.Sprintf("SHOW CREATE TABLE %s", sql.QuoteIdentifier(table)))
if err != nil {
return "", err
}
rows, err := sql.RowIterToRows(ctx, sch, iter)
rows, err := sql.RowIterToRows(ctx, iter)
if err != nil {
return "", err
}
go/cmd/dolt/commands/branch.go
+2 -2
View File
@@ -486,7 +486,7 @@ func callStoredProcedure(sqlCtx *sql.Context, queryEngine cli.Queryist, args []s
if err != nil {
return HandleVErrAndExitCode(errhand.VerboseErrorFromError(err), nil)
}
schema, rowIter, err := queryEngine.Query(sqlCtx, query)
_, rowIter, err := queryEngine.Query(sqlCtx, query)
if err != nil {
if strings.Contains(err.Error(), "is not fully merged") {
newErrorMessage := fmt.Sprintf("%s. If you are sure you want to delete it, run 'dolt branch -D%s'", err.Error(), generateForceDeleteMessage(args))
@@ -494,7 +494,7 @@ func callStoredProcedure(sqlCtx *sql.Context, queryEngine cli.Queryist, args []s
}
return HandleVErrAndExitCode(errhand.VerboseErrorFromError(fmt.Errorf("error: %s", err.Error())), nil)
}
_, err = sql.RowIterToRows(sqlCtx, schema, rowIter)
_, err = sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
return HandleVErrAndExitCode(errhand.BuildDError("error: failed to get result rows for query %s", query).AddCause(err).Build(), nil)
}
go/cmd/dolt/commands/commit.go
+14 -14
View File
@@ -160,11 +160,11 @@ func performCommit(ctx context.Context, commandStr string, args []string, cliCtx
return 1, false
}
schema, rowIter, err := queryist.Query(sqlCtx, interpolatedQuery)
_, rowIter, err := queryist.Query(sqlCtx, interpolatedQuery)
if err != nil {
return handleCommitErr(sqlCtx, queryist, err, usage), false
}
resultRow, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
resultRow, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
cli.Println(err.Error())
return 1, false
@@ -297,12 +297,12 @@ func handleCommitErr(sqlCtx *sql.Context, queryist cli.Queryist, err error, usag
}
if err.Error() == "nothing to commit" {
schema, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
_, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
if err != nil {
cli.Println(err)
return 1
}
notStagedRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
notStagedRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
cli.Println(err)
return 1
@@ -387,20 +387,20 @@ func buildInitalCommitMsg(sqlCtx *sql.Context, queryist cli.Queryist, suggestedM
initialNoColor := color.NoColor
color.NoColor = true
schema, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = true")
_, ri, err := queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = true")
if err != nil {
return "", err
}
stagedRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
stagedRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
return "", err
}
schema, ri, err = queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
_, ri, err = queryist.Query(sqlCtx, "select table_name, status from dolt_status where staged = false")
if err != nil {
return "", err
}
notStagedRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
notStagedRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
return "", err
}
@@ -454,11 +454,11 @@ func PrintDiffsNotStaged(
linesPrinted int,
) (int, error) {
// get data conflict tables
schema, ri, err := queryist.Query(sqlCtx, "select `table` from dolt_conflicts")
_, ri, err := queryist.Query(sqlCtx, "select `table` from dolt_conflicts")
if err != nil {
return 0, err
}
conflictRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
conflictRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
return 0, err
}
@@ -469,11 +469,11 @@ func PrintDiffsNotStaged(
inCnfSet := set.NewStrSet(conflictTables)
// get schema conflict tables
schema, ri, err = queryist.Query(sqlCtx, "select table_name from dolt_status where status = 'schema conflict'")
_, ri, err = queryist.Query(sqlCtx, "select table_name from dolt_status where status = 'schema conflict'")
if err != nil {
return 0, err
}
schemaConflictRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
schemaConflictRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
return 0, err
}
@@ -484,11 +484,11 @@ func PrintDiffsNotStaged(
inCnfSet.Add(schemaConflictTables...)
// get constraint violation tables
schema, ri, err = queryist.Query(sqlCtx, "select `table` from dolt_constraint_violations")
_, ri, err = queryist.Query(sqlCtx, "select `table` from dolt_constraint_violations")
if err != nil {
return 0, err
}
constraintViolationRows, err := sql.RowIterToRows(sqlCtx, schema, ri)
constraintViolationRows, err := sql.RowIterToRows(sqlCtx, ri)
if err != nil {
return 0, err
}
go/cmd/dolt/commands/merge.go
+2 -2
View File
@@ -135,7 +135,7 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
cli.Println(err.Error())
return 1
}
schema, rowIter, err := queryist.Query(sqlCtx, query)
_, rowIter, err := queryist.Query(sqlCtx, query)
if err != nil {
cli.Println(err.Error())
return 1
@@ -146,7 +146,7 @@ func (cmd MergeCmd) Exec(ctx context.Context, commandStr string, args []string,
cli.Println(err.Error())
return 1
}
rows, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
rows, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
cli.Println("merge finished, but failed to check for fast-forward")
cli.Println(err.Error())
go/cmd/dolt/commands/pull.go
+2 -2
View File
@@ -129,7 +129,7 @@ func (cmd PullCmd) Exec(ctx context.Context, commandStr string, args []string, d
errChan <- err
}
schema, rowIter, err := queryist.Query(sqlCtx, query)
_, rowIter, err := queryist.Query(sqlCtx, query)
if err != nil {
errChan <- err
return
@@ -140,7 +140,7 @@ func (cmd PullCmd) Exec(ctx context.Context, commandStr string, args []string, d
errChan <- err
return
}
rows, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
rows, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
errChan <- err
return
go/cmd/dolt/commands/push.go
+2 -2
View File
@@ -105,13 +105,13 @@ func (cmd PushCmd) Exec(ctx context.Context, commandStr string, args []string, d
errChan := make(chan error)
go func() {
defer close(errChan)
schema, rowIter, err := queryist.Query(sqlCtx, query)
_, rowIter, err := queryist.Query(sqlCtx, query)
if err != nil {
errChan <- err
return
}
sqlRows, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
sqlRows, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
errChan <- err
return
go/cmd/dolt/commands/reset.go
+2 -2
View File
@@ -203,11 +203,11 @@ func buildStatRows(rows []sql.Row) []StatRow {
func printNotStaged(sqlCtx *sql.Context, queryist cli.Queryist) {
// Printing here is best effort. Fail silently
schema, rowIter, err := queryist.Query(sqlCtx, "select table_name,status from dolt_status where staged = false")
_, rowIter, err := queryist.Query(sqlCtx, "select table_name,status from dolt_status where staged = false")
if err != nil {
return
}
rows, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
rows, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
return
}
go/cmd/dolt/commands/revert.go
+2 -2
View File
@@ -124,12 +124,12 @@ func (cmd RevertCmd) Exec(ctx context.Context, commandStr string, args []string,
return 1
}
schema, rowIter, err := queryist.Query(sqlCtx, query)
_, rowIter, err := queryist.Query(sqlCtx, query)
if err != nil {
cli.Printf("Failure to execute '%s': %s\n", query, err.Error())
return 1
}
_, err = sql.RowIterToRows(sqlCtx, schema, rowIter)
_, err = sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
cli.Println(err.Error())
return 1
go/cmd/dolt/commands/sql.go
+3 -3
View File
@@ -1054,7 +1054,7 @@ func processParsedQuery(ctx *sql.Context, query string, qryist cli.Queryist, sql
if err != nil {
return nil, nil, err
}
_, err = sql.RowIterToRows(ctx, nil, ri)
_, err = sql.RowIterToRows(ctx, ri)
if err != nil {
return nil, nil, err
}
@@ -1065,7 +1065,7 @@ func processParsedQuery(ctx *sql.Context, query string, qryist cli.Queryist, sql
if err != nil {
return nil, nil, err
}
_, err = sql.RowIterToRows(ctx, nil, ri)
_, err = sql.RowIterToRows(ctx, ri)
if err != nil {
return nil, nil, err
}
@@ -1075,7 +1075,7 @@ func processParsedQuery(ctx *sql.Context, query string, qryist cli.Queryist, sql
if err != nil {
return nil, nil, err
}
_, err = sql.RowIterToRows(ctx, nil, ri)
_, err = sql.RowIterToRows(ctx, ri)
if err != nil {
return nil, nil, err
}
go/cmd/dolt/commands/utils.go
+2 -2
View File
@@ -308,11 +308,11 @@ func newLateBindingEngine(
}
func GetRowsForSql(queryist cli.Queryist, sqlCtx *sql.Context, query string) ([]sql.Row, error) {
schema, rowIter, err := queryist.Query(sqlCtx, query)
_, rowIter, err := queryist.Query(sqlCtx, query)
if err != nil {
return nil, err
}
rows, err := sql.RowIterToRows(sqlCtx, schema, rowIter)
rows, err := sql.RowIterToRows(sqlCtx, rowIter)
if err != nil {
return nil, err
}
go/go.mod
+2 -2
View File
@@ -15,7 +15,7 @@ require (
github.com/dolthub/fslock v0.0.3
github.com/dolthub/ishell v0.0.0-20221214210346-d7db0b066488
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81
github.com/dolthub/vitess v0.0.0-20240110233415-e46007d964c0
github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.13.0
github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568
@@ -57,7 +57,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.20240116235625-e7e445f8a22f
github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331
github.com/dolthub/swiss v0.1.0
github.com/goccy/go-json v0.10.2
github.com/google/go-github/v57 v57.0.0
go/go.sum
+4 -4
View File
@@ -183,8 +183,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.20240116235625-e7e445f8a22f h1:8DcfLeal4VyyC26JTKJIlKnIJhvGjAQ6KXf3+YhUzeo=
github.com/dolthub/go-mysql-server v0.17.1-0.20240116235625-e7e445f8a22f/go.mod h1:vANS+BQiobOQ3sfB1Qxm5zqOrsXOaK6S3EE1yb4vJuc=
github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331 h1:WPYOfoC37qa6Ul5f2dkVUFad6RACJ07EQgvNW0rFSjA=
github.com/dolthub/go-mysql-server v0.17.1-0.20240117075138-f66e0253d331/go.mod h1:m7avfVLGUe9zdJbYE4HVjbhhx7EFW9d2qYZf0mVBDWg=
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=
@@ -195,8 +195,8 @@ github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81 h1:7/v8q9X
github.com/dolthub/sqllogictest/go v0.0.0-20201107003712-816f3ae12d81/go.mod h1:siLfyv2c92W1eN/R4QqG/+RjjX5W2+gCTRjZxBjI3TY=
github.com/dolthub/swiss v0.1.0 h1:EaGQct3AqeP/MjASHLiH6i4TAmgbG/c4rA6a1bzCOPc=
github.com/dolthub/swiss v0.1.0/go.mod h1:BeucyB08Vb1G9tumVN3Vp/pyY4AMUnr9p7Rz7wJ7kAQ=
github.com/dolthub/vitess v0.0.0-20240110233415-e46007d964c0 h1:P8wb4dR5krirPa0swEJbEObc/I7GaAM/01nOnuQrl0c=
github.com/dolthub/vitess v0.0.0-20240110233415-e46007d964c0/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3 h1:nEwq2/8gTI2jm/4APIMTrWNDDRCn8AWJjrCbH+d7CJc=
github.com/dolthub/vitess v0.0.0-20240117061527-f9260279b3d3/go.mod h1:IwjNXSQPymrja5pVqmfnYdcy7Uv7eNJNBPK/MEh9OOw=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/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=
go/libraries/doltcore/mvdata/engine_table_writer.go
+2 -2
View File
@@ -283,11 +283,11 @@ func (s *SqlEngineTableWriter) createTable() error {
}
createTable := sql.GenerateCreateTableStatement(s.tableName, sqlCols, sql.CharacterSet_utf8.String(), sql.Collation_Default.String())
sch, iter, err := s.se.Query(s.sqlCtx, createTable)
_, iter, err := s.se.Query(s.sqlCtx, createTable)
if err != nil {
return err
}
_, err = sql.RowIterToRows(s.sqlCtx, sch, iter)
_, err = sql.RowIterToRows(s.sqlCtx, iter)
return err
}
go/libraries/doltcore/sqle/enginetest/branch_control_test.go
+4 -4
View File
@@ -1452,9 +1452,9 @@ func TestBranchControlBlocks(t *testing.T) {
addUserQueryResults := []sql.Row{{types.NewOkResult(2)}}
enginetest.TestQueryWithContext(t, rootCtx, engine, harness, addUserQuery, addUserQueryResults, nil, nil)
sch, iter, err := engine.Query(userCtx, test.Query)
_, iter, err := engine.Query(userCtx, test.Query)
if err == nil {
_, err = sql.RowIterToRows(userCtx, sch, iter)
_, err = sql.RowIterToRows(userCtx, iter)
}
assert.NoError(t, err)
})
@@ -1500,9 +1500,9 @@ func TestBranchControlBlocks(t *testing.T) {
addUserQueryResults = []sql.Row{{types.NewOkResult(1)}}
enginetest.TestQueryWithContext(t, rootCtx, engine, harness, addUserQuery, addUserQueryResults, nil, nil)
sch, iter, err := engine.Query(userCtx, test.Query)
_, iter, err := engine.Query(userCtx, test.Query)
if err == nil {
_, err = sql.RowIterToRows(userCtx, sch, iter)
_, err = sql.RowIterToRows(userCtx, iter)
}
assert.NoError(t, err)
})
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
+2 -2
View File
@@ -1488,9 +1488,9 @@ func TestDoltRevisionDbScripts(t *testing.T) {
_, err = enginetest.RunSetupScripts(ctx, harness.engine, setupScripts, true)
require.NoError(t, err)
sch, iter, err := harness.engine.Query(ctx, "select hashof('HEAD~2');")
_, iter, err := harness.engine.Query(ctx, "select hashof('HEAD~2');")
require.NoError(t, err)
rows, err := sql.RowIterToRows(ctx, sch, iter)
rows, err := sql.RowIterToRows(ctx, iter)
require.NoError(t, err)
assert.Equal(t, 1, len(rows))
commithash := rows[0][0].(string)
go/libraries/doltcore/sqle/enginetest/dolt_harness.go
+2 -2
View File
@@ -489,7 +489,7 @@ func (d *DoltHarness) SnapshotTable(db sql.VersionedDatabase, tableName string,
_, iter, err := e.Query(ctx,
"CALL DOLT_COMMIT('-Am', 'test commit');")
require.NoError(d.t, err)
_, err = sql.RowIterToRows(ctx, nil, iter)
_, err = sql.RowIterToRows(ctx, iter)
require.NoError(d.t, err)
// Create a new branch at this commit with the given identifier
@@ -499,7 +499,7 @@ func (d *DoltHarness) SnapshotTable(db sql.VersionedDatabase, tableName string,
_, iter, err = e.Query(ctx,
query)
require.NoError(d.t, err)
_, err = sql.RowIterToRows(ctx, nil, iter)
_, err = sql.RowIterToRows(ctx, iter)
require.NoError(d.t, err)
return nil
go/libraries/doltcore/sqle/index/mergeable_indexes_test.go
+2 -2
View File
@@ -1321,7 +1321,7 @@ func TestMergeableIndexes(t *testing.T) {
_, iter, err := engine.Query(sqlCtx, query)
require.NoError(t, err)
res, err := sql.RowIterToRows(sqlCtx, nil, iter)
res, err := sql.RowIterToRows(sqlCtx, iter)
require.NoError(t, err)
if assert.Equal(t, len(test.pks), len(res)) {
@@ -1528,7 +1528,7 @@ func TestMergeableIndexesNulls(t *testing.T) {
_, iter, err := engine.Query(sqlCtx, query)
require.NoError(t, err)
res, err := sql.RowIterToRows(sqlCtx, nil, iter)
res, err := sql.RowIterToRows(sqlCtx, iter)
require.NoError(t, err)
if assert.Equal(t, len(test.pks), len(res)) {
for i, pk := range test.pks {
go/libraries/doltcore/sqle/show_create_table.go
+1 -1
View File
@@ -45,7 +45,7 @@ func GetCreateTableStmt(ctx *sql.Context, engine *sqle.Engine, tableName string)
if err != nil {
return "", err
}
rows, err := sql.RowIterToRows(ctx, nil, rowIter)
rows, err := sql.RowIterToRows(ctx, rowIter)
if err != nil {
return "", err
}
go/libraries/doltcore/sqle/sqlddl_test.go
+2 -2
View File
@@ -1081,11 +1081,11 @@ func TestParseCreateTableStatement(t *testing.T) {
//eng, dbName, _ := engine.NewSqlEngineForEnv(ctx, dEnv)
eng, sqlCtx := newTestEngine(ctx, dEnv)
testSch, iter, err := eng.Query(sqlCtx, "create database test")
_, iter, err := eng.Query(sqlCtx, "create database test")
if err != nil {
panic(err)
}
_, _ = sql.RowIterToRows(sqlCtx, testSch, iter)
_, _ = sql.RowIterToRows(sqlCtx, iter)
sqlCtx.SetCurrentDatabase("test")
tblName, sch, err := sqlutil.ParseCreateTableStatement(sqlCtx, root, eng, tt.query)
go/libraries/doltcore/sqle/writer/noms_table_writer_test.go
+2 -2
View File
@@ -181,10 +181,10 @@ func TestTableEditor(t *testing.T) {
// TODO: not clear why this is necessary, the call to ed.Close should update the working set already
require.NoError(t, dEnv.UpdateWorkingRoot(context.Background(), root))
sch, rowIter, err := engine.Query(ctx, test.selectQuery)
_, rowIter, err := engine.Query(ctx, test.selectQuery)
require.NoError(t, err)
actualRows, err := sql.RowIterToRows(ctx, sch, rowIter)
actualRows, err := sql.RowIterToRows(ctx, rowIter)
require.NoError(t, err)
assert.Equal(t, test.expectedRows, actualRows)