Merge remote-tracking branch 'upstream/master' into stmt-cache2
# Conflicts: # tests/postgres/alltypes_test.go # tests/postgres/northwind_test.go # tests/postgres/sample_test.go # tests/postgres/update_test.go # tests/sqlite/insert_test.go # tests/sqlite/main_test.go # tests/sqlite/sample_test.go # tests/sqlite/update_test.go
This commit is contained in:
commit
4bb9775134
97 changed files with 2306 additions and 537 deletions
|
|
@ -3,10 +3,12 @@ package mysql
|
|||
import (
|
||||
"context"
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
. "github.com/go-jet/jet/v2/mysql"
|
||||
"github.com/go-jet/jet/v2/qrm"
|
||||
"github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/model"
|
||||
. "github.com/go-jet/jet/v2/tests/.gentestdata/mysql/test_sample/table"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"math/rand"
|
||||
"testing"
|
||||
|
|
@ -300,7 +302,7 @@ func TestInsertOnDuplicateKeyUpdateNEW(t *testing.T) {
|
|||
ID: randId,
|
||||
URL: "https://www.yahoo.com",
|
||||
Name: "Yahoo",
|
||||
Description: testutils.StringPtr("web portal and search engine"),
|
||||
Description: ptr.Of("web portal and search engine"),
|
||||
},
|
||||
}).AS_NEW().
|
||||
ON_DUPLICATE_KEY_UPDATE(
|
||||
|
|
@ -337,7 +339,7 @@ ON DUPLICATE KEY UPDATE id = (link.id + ?),
|
|||
ID: randId + 11,
|
||||
URL: "https://www.yahoo.com",
|
||||
Name: "Yahoo",
|
||||
Description: testutils.StringPtr("web portal and search engine"),
|
||||
Description: ptr.Of("web portal and search engine"),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue