Moving PtrOf to package internal/ptr
This commit is contained in:
parent
99be328e9d
commit
c2703558d7
13 changed files with 148 additions and 136 deletions
|
|
@ -2,6 +2,7 @@ package sqlite
|
|||
|
||||
import (
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
. "github.com/go-jet/jet/v2/sqlite"
|
||||
"github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/test_sample/model"
|
||||
. "github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/test_sample/table"
|
||||
|
|
@ -153,43 +154,43 @@ func TestAllTypesInsert(t *testing.T) {
|
|||
|
||||
var toInsert = model.AllTypes{
|
||||
Boolean: false,
|
||||
BooleanPtr: testutils.PtrOf(true),
|
||||
BooleanPtr: ptr.Of(true),
|
||||
TinyInt: 1,
|
||||
SmallInt: 3,
|
||||
MediumInt: 5,
|
||||
Integer: 7,
|
||||
BigInt: 9,
|
||||
TinyIntPtr: testutils.PtrOf(int8(11)),
|
||||
SmallIntPtr: testutils.PtrOf(int16(33)),
|
||||
MediumIntPtr: testutils.PtrOf(int32(55)),
|
||||
IntegerPtr: testutils.PtrOf(int32(77)),
|
||||
BigIntPtr: testutils.PtrOf(int64(99)),
|
||||
TinyIntPtr: ptr.Of(int8(11)),
|
||||
SmallIntPtr: ptr.Of(int16(33)),
|
||||
MediumIntPtr: ptr.Of(int32(55)),
|
||||
IntegerPtr: ptr.Of(int32(77)),
|
||||
BigIntPtr: ptr.Of(int64(99)),
|
||||
Decimal: 11.22,
|
||||
DecimalPtr: testutils.PtrOf(33.44),
|
||||
DecimalPtr: ptr.Of(33.44),
|
||||
Numeric: 55.66,
|
||||
NumericPtr: testutils.PtrOf(77.88),
|
||||
NumericPtr: ptr.Of(77.88),
|
||||
Float: 99.00,
|
||||
FloatPtr: testutils.PtrOf(11.22),
|
||||
FloatPtr: ptr.Of(11.22),
|
||||
Double: 33.44,
|
||||
DoublePtr: testutils.PtrOf(55.66),
|
||||
DoublePtr: ptr.Of(55.66),
|
||||
Real: 77.88,
|
||||
RealPtr: testutils.PtrOf(float32(99.00)),
|
||||
RealPtr: ptr.Of(float32(99.00)),
|
||||
Time: time.Date(1, 1, 1, 1, 1, 1, 10, time.UTC),
|
||||
TimePtr: testutils.PtrOf(time.Date(2, 2, 2, 2, 2, 2, 200, time.UTC)),
|
||||
TimePtr: ptr.Of(time.Date(2, 2, 2, 2, 2, 2, 200, time.UTC)),
|
||||
Date: time.Now(),
|
||||
DatePtr: testutils.PtrOf(time.Now()),
|
||||
DatePtr: ptr.Of(time.Now()),
|
||||
DateTime: time.Now(),
|
||||
DateTimePtr: testutils.PtrOf(time.Now()),
|
||||
DateTimePtr: ptr.Of(time.Now()),
|
||||
Timestamp: time.Now(),
|
||||
TimestampPtr: testutils.PtrOf(time.Now()),
|
||||
TimestampPtr: ptr.Of(time.Now()),
|
||||
Char: "abcd",
|
||||
CharPtr: testutils.PtrOf("absd"),
|
||||
CharPtr: ptr.Of("absd"),
|
||||
VarChar: "abcd",
|
||||
VarCharPtr: testutils.PtrOf("absd"),
|
||||
VarCharPtr: ptr.Of("absd"),
|
||||
Blob: []byte("large file"),
|
||||
BlobPtr: testutils.PtrOf([]byte("very large file")),
|
||||
BlobPtr: ptr.Of([]byte("very large file")),
|
||||
Text: "some text",
|
||||
TextPtr: testutils.PtrOf("text"),
|
||||
TextPtr: ptr.Of("text"),
|
||||
}
|
||||
|
||||
func TestUUID(t *testing.T) {
|
||||
|
|
@ -659,7 +660,7 @@ func TestExactDecimals(t *testing.T) {
|
|||
|
||||
// not overwritten
|
||||
Numeric: "6.7",
|
||||
NumericPtr: testutils.PtrOf("7.7"),
|
||||
NumericPtr: ptr.Of("7.7"),
|
||||
},
|
||||
Decimal: decimal.RequireFromString("91.23"),
|
||||
DecimalPtr: decimal.RequireFromString("45.67"),
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package sqlite
|
|||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
"math/rand"
|
||||
|
||||
"testing"
|
||||
|
|
@ -49,7 +50,7 @@ VALUES (?, ?, ?, ?),
|
|||
ID: 101,
|
||||
URL: "http://www.google.com",
|
||||
Name: "Google",
|
||||
Description: testutils.PtrOf("Search engine"),
|
||||
Description: ptr.Of("Search engine"),
|
||||
})
|
||||
testutils.AssertDeepEqual(t, insertedLinks[2], model.Link{
|
||||
ID: 102,
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package sqlite
|
|||
import (
|
||||
"database/sql"
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
"github.com/stretchr/testify/require"
|
||||
"testing"
|
||||
|
||||
|
|
@ -54,7 +55,7 @@ WHERE people.people_id = ?;
|
|||
).MODEL(
|
||||
model.People{
|
||||
PeopleName: "Dario",
|
||||
PeopleHeightCm: testutils.PtrOf(190.0),
|
||||
PeopleHeightCm: ptr.Of(190.0),
|
||||
},
|
||||
).RETURNING(
|
||||
People.AllColumns,
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package sqlite
|
|||
|
||||
import (
|
||||
"context"
|
||||
"github.com/go-jet/jet/v2/internal/utils/ptr"
|
||||
model2 "github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/chinook/model"
|
||||
"github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/chinook/table"
|
||||
"strings"
|
||||
|
|
@ -846,15 +847,15 @@ func TestSimpleView(t *testing.T) {
|
|||
|
||||
require.Equal(t, len(dest), 10)
|
||||
require.Equal(t, dest[2], model.CustomerList{
|
||||
ID: testutils.PtrOf(int32(3)),
|
||||
Name: testutils.PtrOf("LINDA WILLIAMS"),
|
||||
Address: testutils.PtrOf("692 Joliet Street"),
|
||||
ZipCode: testutils.PtrOf("83579"),
|
||||
Phone: testutils.PtrOf(" "),
|
||||
City: testutils.PtrOf("Athenai"),
|
||||
Country: testutils.PtrOf("Greece"),
|
||||
Notes: testutils.PtrOf("active"),
|
||||
Sid: testutils.PtrOf(int32(1)),
|
||||
ID: ptr.Of(int32(3)),
|
||||
Name: ptr.Of("LINDA WILLIAMS"),
|
||||
Address: ptr.Of("692 Joliet Street"),
|
||||
ZipCode: ptr.Of("83579"),
|
||||
Phone: ptr.Of(" "),
|
||||
City: ptr.Of("Athenai"),
|
||||
Country: ptr.Of("Greece"),
|
||||
Notes: ptr.Of("active"),
|
||||
Sid: ptr.Of(int32(1)),
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue