From bf64f18ea70a44bf6d9eb7ceafb74756aea2cc9d Mon Sep 17 00:00:00 2001 From: Stefan Majewsky Date: Sat, 20 Jun 2026 20:41:07 +0200 Subject: bump gg to 0.10.0, use gg/assert --- plan_test.go | 330 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 165 insertions(+), 165 deletions(-) (limited to 'plan_test.go') diff --git a/plan_test.go b/plan_test.go index 6c42f7a..ae9e2cc 100644 --- a/plan_test.go +++ b/plan_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "go.xyrillian.de/oblast/internal/testhelpers/assert" + "go.xyrillian.de/gg/assert" ) func TestPlanFieldTraversal(t *testing.T) { @@ -46,10 +46,10 @@ func TestPlanFieldTraversal(t *testing.T) { t.Error(err) } assert.Equal(t, plan.TableName, "log_entries") - assert.DeepEqual(t, plan.AllColumnNames, []string{"id", "Message", "created_at", "updated_at", "deleted_at"}) - assert.DeepEqual(t, plan.PrimaryKeyColumnNames, []string{"id"}) - assert.DeepEqual(t, plan.AutoColumnNames, []string{"id"}) - assert.DeepEqual(t, plan.IndexByColumnName, map[string][]int{ + assert.Equal(t, plan.AllColumnNames, []string{"id", "Message", "created_at", "updated_at", "deleted_at"}) + assert.Equal(t, plan.PrimaryKeyColumnNames, []string{"id"}) + assert.Equal(t, plan.AutoColumnNames, []string{"id"}) + assert.Equal(t, plan.IndexByColumnName, map[string][]int{ "id": {0}, "Message": {1}, "created_at": {4, 0}, @@ -77,20 +77,20 @@ func TestQueryConstructionBasic(t *testing.T) { assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.LastInsertIdIsUnsigned, false) assert.Equal(t, plan.Select.Query, "SELECT `ID`, `Description`, `CreatedAt` FROM `basic_records` WHERE ") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, "INSERT INTO `basic_records` (`Description`, `CreatedAt`) VALUES (?, ?)") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "UPDATE `basic_records` SET `Description` = ?, `CreatedAt` = ? WHERE `ID` = ?") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "DELETE FROM `basic_records` WHERE `ID` = ?") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("PostgresDialect", func(t *testing.T) { @@ -100,20 +100,20 @@ func TestQueryConstructionBasic(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, true) assert.Equal(t, plan.Select.Query, `SELECT "ID", "Description", "CreatedAt" FROM "basic_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "basic_records" ("Description", "CreatedAt") VALUES ($1, $2) RETURNING "ID"`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "basic_records" SET "Description" = $1, "CreatedAt" = $2 WHERE "ID" = $3`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "basic_records" WHERE "ID" = $1`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("SqliteDialect", func(t *testing.T) { @@ -124,20 +124,20 @@ func TestQueryConstructionBasic(t *testing.T) { assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.LastInsertIdIsUnsigned, false) assert.Equal(t, plan.Select.Query, `SELECT "ID", "Description", "CreatedAt" FROM "basic_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "basic_records" ("Description", "CreatedAt") VALUES (?, ?)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "basic_records" SET "Description" = ?, "CreatedAt" = ? WHERE "ID" = ?`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "basic_records" WHERE "ID" = ?`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) } @@ -158,20 +158,20 @@ func TestQueryConstructionWithOnlyPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, "SELECT `foo_id`, `bar_id` FROM `foo_bar_relations` WHERE ") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, "INSERT INTO `foo_bar_relations` (`foo_id`, `bar_id`) VALUES (?, ?)") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "INSERT INTO `foo_bar_relations` (`foo_id`, `bar_id`) VALUES (?, ?) ON DUPLICATE KEY UPDATE `foo_id` = VALUES(`foo_id`)") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "DELETE FROM `foo_bar_relations` WHERE `foo_id` = ? AND `bar_id` = ?") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("PostgresDialect", func(t *testing.T) { @@ -181,20 +181,20 @@ func TestQueryConstructionWithOnlyPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "foo_id", "bar_id" FROM "foo_bar_relations" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES ($1, $2)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES ($1, $2) ON CONFLICT ("foo_id", "bar_id") DO NOTHING`) - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "foo_bar_relations" WHERE "foo_id" = $1 AND "bar_id" = $2`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("SqliteDialect", func(t *testing.T) { @@ -204,20 +204,20 @@ func TestQueryConstructionWithOnlyPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "foo_id", "bar_id" FROM "foo_bar_relations" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES (?, ?)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES (?, ?) ON CONFLICT ("foo_id", "bar_id") DO NOTHING`) - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "foo_bar_relations" WHERE "foo_id" = ? AND "bar_id" = ?`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) } @@ -237,20 +237,20 @@ func TestQueryConstructionWithoutPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, "SELECT `foo_id`, `bar_id` FROM `foo_bar_relations` WHERE ") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, "INSERT INTO `foo_bar_relations` (`foo_id`, `bar_id`) VALUES (?, ?)") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, nil) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("PostgresDialect", func(t *testing.T) { @@ -260,20 +260,20 @@ func TestQueryConstructionWithoutPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "foo_id", "bar_id" FROM "foo_bar_relations" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES ($1, $2)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, nil) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("SqliteDialect", func(t *testing.T) { @@ -283,20 +283,20 @@ func TestQueryConstructionWithoutPrimaryKey(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "foo_id", "bar_id" FROM "foo_bar_relations" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "foo_bar_relations" ("foo_id", "bar_id") VALUES (?, ?)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, nil) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) } @@ -315,20 +315,20 @@ func TestQueryConstructionImpossible(t *testing.T) { } assert.Equal(t, plan.Select.Query, "") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, nil) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, nil) assert.Equal(t, plan.Insert.Query, "") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, nil) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, nil) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, nil) + assert.Equal(t, plan.Delete.ScanIndexes, nil) } } @@ -355,20 +355,20 @@ func TestQueryConstructionWithMultiplePrimaryKeyColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, "SELECT `group_id`, `name`, `created_at` FROM `complex_records` WHERE ") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, "INSERT INTO `complex_records` (`group_id`, `name`, `created_at`) VALUES (?, ?, ?)") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, "INSERT INTO `complex_records` (`group_id`, `name`, `created_at`) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE `created_at` = VALUES(`created_at`)") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "UPDATE `complex_records` SET `created_at` = ? WHERE `group_id` = ? AND `name` = ?") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "DELETE FROM `complex_records` WHERE `group_id` = ? AND `name` = ?") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("PostgresDialect", func(t *testing.T) { @@ -378,20 +378,20 @@ func TestQueryConstructionWithMultiplePrimaryKeyColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "group_id", "name", "created_at" FROM "complex_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "complex_records" ("group_id", "name", "created_at") VALUES ($1, $2, $3)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, `INSERT INTO "complex_records" ("group_id", "name", "created_at") VALUES ($1, $2, $3) ON CONFLICT ("group_id", "name") DO UPDATE SET "created_at" = EXCLUDED."created_at"`) - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "complex_records" SET "created_at" = $1 WHERE "group_id" = $2 AND "name" = $3`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "complex_records" WHERE "group_id" = $1 AND "name" = $2`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("SqliteDialect", func(t *testing.T) { @@ -401,20 +401,20 @@ func TestQueryConstructionWithMultiplePrimaryKeyColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, false) assert.Equal(t, plan.Select.Query, `SELECT "group_id", "name", "created_at" FROM "complex_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "complex_records" ("group_id", "name", "created_at") VALUES (?, ?, ?)`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, nil) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Insert.ScanIndexes, nil) assert.Equal(t, plan.Upsert.Query, `INSERT INTO "complex_records" ("group_id", "name", "created_at") VALUES (?, ?, ?) ON CONFLICT ("group_id", "name") DO UPDATE SET "created_at" = EXCLUDED."created_at"`) - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "complex_records" SET "created_at" = ? WHERE "group_id" = ? AND "name" = ?`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{2}, {0}, {1}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "complex_records" WHERE "group_id" = ? AND "name" = ?`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}, {1}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) } @@ -436,20 +436,20 @@ func TestQueryConstructionWithMultipleAutoColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, true) assert.Equal(t, plan.Select.Query, "SELECT `id`, `name`, `created_at` FROM `autogenerated_records` WHERE ") - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, "INSERT INTO `autogenerated_records` (`name`) VALUES (?) RETURNING `id`, `created_at`") - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, "UPDATE `autogenerated_records` SET `name` = ?, `created_at` = ? WHERE `id` = ?") - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, "DELETE FROM `autogenerated_records` WHERE `id` = ?") - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("PostgresDialect", func(t *testing.T) { @@ -459,20 +459,20 @@ func TestQueryConstructionWithMultipleAutoColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, true) assert.Equal(t, plan.Select.Query, `SELECT "id", "name", "created_at" FROM "autogenerated_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "autogenerated_records" ("name") VALUES ($1) RETURNING "id", "created_at"`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "autogenerated_records" SET "name" = $1, "created_at" = $2 WHERE "id" = $3`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "autogenerated_records" WHERE "id" = $1`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) t.Run("SqliteDialect", func(t *testing.T) { @@ -482,20 +482,20 @@ func TestQueryConstructionWithMultipleAutoColumns(t *testing.T) { } assert.Equal(t, plan.InsertUsesQueryRow, true) assert.Equal(t, plan.Select.Query, `SELECT "id", "name", "created_at" FROM "autogenerated_records" WHERE `) - assert.DeepEqual(t, plan.Select.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) + assert.Equal(t, plan.Select.ArgumentIndexes, nil) + assert.Equal(t, plan.Select.ScanIndexes, [][]int{{0}, {1}, {2}}) assert.Equal(t, plan.Insert.Query, `INSERT INTO "autogenerated_records" ("name") VALUES (?) RETURNING "id", "created_at"`) - assert.DeepEqual(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) - assert.DeepEqual(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) + assert.Equal(t, plan.Insert.ArgumentIndexes, [][]int{{1}}) + assert.Equal(t, plan.Insert.ScanIndexes, [][]int{{0}, {2}}) assert.Equal(t, plan.Upsert.Query, "") - assert.DeepEqual(t, plan.Upsert.ArgumentIndexes, nil) - assert.DeepEqual(t, plan.Upsert.ScanIndexes, nil) + assert.Equal(t, plan.Upsert.ArgumentIndexes, nil) + assert.Equal(t, plan.Upsert.ScanIndexes, nil) assert.Equal(t, plan.Update.Query, `UPDATE "autogenerated_records" SET "name" = ?, "created_at" = ? WHERE "id" = ?`) - assert.DeepEqual(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) - assert.DeepEqual(t, plan.Update.ScanIndexes, nil) + assert.Equal(t, plan.Update.ArgumentIndexes, [][]int{{1}, {2}, {0}}) + assert.Equal(t, plan.Update.ScanIndexes, nil) assert.Equal(t, plan.Delete.Query, `DELETE FROM "autogenerated_records" WHERE "id" = ?`) - assert.DeepEqual(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) - assert.DeepEqual(t, plan.Delete.ScanIndexes, nil) + assert.Equal(t, plan.Delete.ArgumentIndexes, [][]int{{0}}) + assert.Equal(t, plan.Delete.ScanIndexes, nil) }) } -- cgit v1.3.1