From c371cbf042a5d2c24758128068bf9d0e7f2f0ab5 Mon Sep 17 00:00:00 2001 From: Eden Kirin Date: Sun, 23 Jun 2024 18:39:35 +0200 Subject: [PATCH] CLeanup postgres tests --- app/repository/smartfilter/handlers_test.go | 83 +++++++++++---------- 1 file changed, 42 insertions(+), 41 deletions(-) diff --git a/app/repository/smartfilter/handlers_test.go b/app/repository/smartfilter/handlers_test.go index bd27014..80d3b8e 100644 --- a/app/repository/smartfilter/handlers_test.go +++ b/app/repository/smartfilter/handlers_test.go @@ -18,7 +18,8 @@ func NewMockDB() (*gorm.DB, sqlmock.Sqlmock) { } gormDB, err := gorm.Open(postgres.New(postgres.Config{ - Conn: db, + WithoutQuotingCheck: true, + Conn: db, }), &gorm.Config{}) if err != nil { @@ -70,7 +71,7 @@ func TestHandleOperatorEQ(t *testing.T) { boolValue: &boolTrue, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = true ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = true ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorEQ bool false", @@ -79,7 +80,7 @@ func TestHandleOperatorEQ(t *testing.T) { boolValue: &boolFalse, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = false ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = false ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorEQ int64", @@ -88,7 +89,7 @@ func TestHandleOperatorEQ(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorEQ uint64", @@ -97,7 +98,7 @@ func TestHandleOperatorEQ(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorEQ float", @@ -106,7 +107,7 @@ func TestHandleOperatorEQ(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorEQ string", @@ -115,7 +116,7 @@ func TestHandleOperatorEQ(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field = 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field = 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -143,7 +144,7 @@ func TestHandleOperatorNE(t *testing.T) { boolValue: &boolTrue, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != true ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != true ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNE bool false", @@ -152,7 +153,7 @@ func TestHandleOperatorNE(t *testing.T) { boolValue: &boolFalse, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != false ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != false ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNE int64", @@ -161,7 +162,7 @@ func TestHandleOperatorNE(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNE uint64", @@ -170,7 +171,7 @@ func TestHandleOperatorNE(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNE float", @@ -179,7 +180,7 @@ func TestHandleOperatorNE(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNE string", @@ -188,7 +189,7 @@ func TestHandleOperatorNE(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field != 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field != 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -216,7 +217,7 @@ func TestHandleOperatorLIKE(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field LIKE '%Some Value%' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field LIKE '%Some Value%' ORDER BY my_models.id LIMIT 1", }, } @@ -244,7 +245,7 @@ func TestHandleOperatorILIKE(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field ILIKE '%Some Value%' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field ILIKE '%Some Value%' ORDER BY my_models.id LIMIT 1", }, } @@ -272,7 +273,7 @@ func TestHandleOperatorGT(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field > -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field > -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGT uint64", @@ -281,7 +282,7 @@ func TestHandleOperatorGT(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field > 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field > 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGT float", @@ -290,7 +291,7 @@ func TestHandleOperatorGT(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field > -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field > -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGT string", @@ -299,7 +300,7 @@ func TestHandleOperatorGT(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field > 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field > 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -327,7 +328,7 @@ func TestHandleOperatorGE(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field >= -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field >= -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGE uint64", @@ -336,7 +337,7 @@ func TestHandleOperatorGE(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field >= 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field >= 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGE float", @@ -345,7 +346,7 @@ func TestHandleOperatorGE(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field >= -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field >= -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorGE string", @@ -354,7 +355,7 @@ func TestHandleOperatorGE(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field >= 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field >= 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -382,7 +383,7 @@ func TestHandleOperatorLT(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field < -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field < -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLT uint64", @@ -391,7 +392,7 @@ func TestHandleOperatorLT(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field < 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field < 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLT float", @@ -400,7 +401,7 @@ func TestHandleOperatorLT(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field < -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field < -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLT string", @@ -409,7 +410,7 @@ func TestHandleOperatorLT(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field < 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field < 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -437,7 +438,7 @@ func TestHandleOperatorLE(t *testing.T) { intValue: &int64Value, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field <= -123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field <= -123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLE uint64", @@ -446,7 +447,7 @@ func TestHandleOperatorLE(t *testing.T) { uintValue: &uint64Value, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field <= 123456 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field <= 123456 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLE float", @@ -455,7 +456,7 @@ func TestHandleOperatorLE(t *testing.T) { floatValue: &floatValue, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field <= -123456.789 ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field <= -123456.789 ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorLE string", @@ -464,7 +465,7 @@ func TestHandleOperatorLE(t *testing.T) { strValue: &strValue, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field <= 'Some Value' ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field <= 'Some Value' ORDER BY my_models.id LIMIT 1", }, } @@ -492,7 +493,7 @@ func TestHandleOperatorIN(t *testing.T) { boolValues: &boolValues, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field IN (true,false) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field IN (true,false) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorIN int64", @@ -501,7 +502,7 @@ func TestHandleOperatorIN(t *testing.T) { intValues: &int64Values, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field IN (-123456,1,123456) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field IN (-123456,1,123456) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorIN uint64", @@ -510,7 +511,7 @@ func TestHandleOperatorIN(t *testing.T) { uintValues: &uint64Values, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field IN (123456,1234567,1234568) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field IN (123456,1234567,1234568) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorIN float", @@ -519,7 +520,7 @@ func TestHandleOperatorIN(t *testing.T) { floatValues: &floatValues, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field IN (-123456.789,-1,123456.789) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field IN (-123456.789,-1,123456.789) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorIN string", @@ -528,7 +529,7 @@ func TestHandleOperatorIN(t *testing.T) { strValues: &strValues, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field IN ('First Value','Second Value','Third Value') ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field IN ('First Value','Second Value','Third Value') ORDER BY my_models.id LIMIT 1", }, } @@ -556,7 +557,7 @@ func TestHandleOperatorNOT_IN(t *testing.T) { boolValues: &boolValues, valueKind: reflect.Bool, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field NOT IN (true,false) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field NOT IN (true,false) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNOT_IN int64", @@ -565,7 +566,7 @@ func TestHandleOperatorNOT_IN(t *testing.T) { intValues: &int64Values, valueKind: reflect.Int64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field NOT IN (-123456,1,123456) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field NOT IN (-123456,1,123456) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNOT_IN uint64", @@ -574,7 +575,7 @@ func TestHandleOperatorNOT_IN(t *testing.T) { uintValues: &uint64Values, valueKind: reflect.Uint64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field NOT IN (123456,1234567,1234568) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field NOT IN (123456,1234567,1234568) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNOT_IN float", @@ -583,7 +584,7 @@ func TestHandleOperatorNOT_IN(t *testing.T) { floatValues: &floatValues, valueKind: reflect.Float64, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field NOT IN (-123456.789,-1,123456.789) ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field NOT IN (-123456.789,-1,123456.789) ORDER BY my_models.id LIMIT 1", }, { name: "handleOperatorNOT_IN string", @@ -592,7 +593,7 @@ func TestHandleOperatorNOT_IN(t *testing.T) { strValues: &strValues, valueKind: reflect.String, }, - expected: "SELECT * FROM \"my_models\" WHERE my_table.my_field NOT IN ('First Value','Second Value','Third Value') ORDER BY \"my_models\".\"id\" LIMIT 1", + expected: "SELECT * FROM my_models WHERE my_table.my_field NOT IN ('First Value','Second Value','Third Value') ORDER BY my_models.id LIMIT 1", }, }