Skip to content

Commit 6d9d236

Browse files
committed
chore: fix build
1 parent 4493bba commit 6d9d236

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+44
-43
lines changed

dialect/mssqldialect/dialect.go

+1
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ func (*Dialect) AppendBool(b []byte, v bool) []byte {
128128
}
129129

130130
func (d *Dialect) AppendString(b []byte, s string) []byte {
131+
// 'N' prefix means the string uses unicode encoding.
131132
b = append(b, 'N')
132133
return d.BaseDialect.AppendString(b, s)
133134
}

internal/dbtest/query_hook_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func testQueryHook(t *testing.T, dbName string, db *bun.DB) {
2626
) context.Context {
2727
require.Equal(t, "SELECT", event.Operation())
2828
require.Equal(
29-
t, "SELECT * FROM (SELECT 1 AS c) AS t WHERE ('foo' = 'bar')", string(event.Query))
29+
t, "SELECT * FROM (SELECT 1 AS c) AS t WHERE (1 = 2)", string(event.Query))
3030

3131
b, err := event.IQuery.AppendQuery(schema.NewNopFormatter(), nil)
3232
require.NoError(t, err)
@@ -37,7 +37,7 @@ func testQueryHook(t *testing.T, dbName string, db *bun.DB) {
3737

3838
_, err := db.NewSelect().
3939
TableExpr("(SELECT 1 AS c) AS t").
40-
Where("? = ?", "foo", "bar").
40+
Where("? = ?", 1, 2).
4141
Exec(ctx)
4242
require.NoError(t, err)
4343
hook.require(t)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VALUES (42, 'hello')
1+
VALUES (42, N'hello')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VALUES (42, 'hello'), (43, 'world')
1+
VALUES (42, N'hello'), (43, N'world')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SELECT "model"."id", "model"."str" FROM "models" AS "model" WHERE ("model"."id", "model"."str") IN ((1, 'hello'), (2, 'world'))
1+
SELECT "model"."id", "model"."str" FROM "models" AS "model" WHERE ("model"."id", "model"."str") IN ((1, N'hello'), (2, N'world'))
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("id") VALUES ('embed')
1+
INSERT INTO "models" ("id") VALUES (N'embed')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str", "extra") OUTPUT INSERTED."id" VALUES ('hello', 'custom'), ('foo', 'custom')
1+
INSERT INTO "models" ("str", "extra") OUTPUT INSERTED."id" VALUES (N'hello', N'custom'), (N'foo', N'custom')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = '' WHERE (id = 42)
1+
UPDATE "models" SET "str" = N'' WHERE (id = 42)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = '' WHERE (id = 42)
1+
UPDATE "models" SET "str" = N'' WHERE (id = 42)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE (id = 3)
1+
UPDATE "models" SET "str" = N'hello' WHERE (id = 3)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE (id = 3)
1+
UPDATE "models" SET "str" = N'hello' WHERE (id = 3)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE (id = 3)
1+
UPDATE "models" SET "str" = N'hello' WHERE (id = 3)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE (id = 3)
1+
UPDATE "models" SET "str" = N'hello' WHERE (id = 3)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (NULL, 'A', 'world'), (NULL, 'B', 'test')) AS t ("id", "name", "value")) MERGE "models" AS "model" USING _data ON "model".name = _data.name WHEN MATCHED THEN UPDATE SET value = _data.value WHEN NOT MATCHED THEN INSERT ("name", "value") VALUES (_data.name, _data.value) OUTPUT $action;
1+
WITH "_data" AS (SELECT * FROM (VALUES (NULL, N'A', N'world'), (NULL, N'B', N'test')) AS t ("id", "name", "value")) MERGE "models" AS "model" USING _data ON "model".name = _data.name WHEN MATCHED THEN UPDATE SET value = _data.value WHEN NOT MATCHED THEN INSERT ("name", "value") VALUES (_data.name, _data.value) OUTPUT $action;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (NULL, 'A', 'world'), (NULL, 'B', 'test')) AS t ("id", "name", "value")) MERGE "models" AS "model" USING _data ON "model".name = _data.name WHEN MATCHED THEN DELETE WHEN NOT MATCHED THEN INSERT (name, value) VALUES (_data.name, _data.value) OUTPUT $action;
1+
WITH "_data" AS (SELECT * FROM (VALUES (NULL, N'A', N'world'), (NULL, N'B', N'test')) AS t ("id", "name", "value")) MERGE "models" AS "model" USING _data ON "model".name = _data.name WHEN MATCHED THEN DELETE WHEN NOT MATCHED THEN INSERT (name, value) VALUES (_data.name, _data.value) OUTPUT $action;
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (42, 'hello', 0), (43, 'world', 1)) AS t ("id", "str", _order)) SELECT "model"."id", "model"."str" FROM "models" AS "model" WHERE (model.id = _data.id) ORDER BY _data._order
1+
WITH "_data" AS (SELECT * FROM (VALUES (42, N'hello', 0), (43, N'world', 1)) AS t ("id", "str", _order)) SELECT "model"."id", "model"."str" FROM "models" AS "model" WHERE (model.id = _data.id) ORDER BY _data._order
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SELECT "model"."id", "model"."str" FROM "models" AS "model", (VALUES (42, 'hello', 0), (43, 'world', 1)) AS ("id", "str", _order) WHERE (model.id = _data.id) ORDER BY _data._order
1+
SELECT "model"."id", "model"."str" FROM "models" AS "model", (VALUES (42, N'hello', 0), (43, N'world', 1)) AS ("id", "str", _order) WHERE (model.id = _data.id) ORDER BY _data._order
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello')
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello'), ('world')
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello'), (N'world')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello'), ('world')
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello'), (N'world')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello'), ('world') ON CONFLICT DO NOTHING
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello'), (N'world') ON CONFLICT DO NOTHING
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello'), ('world') ON CONFLICT DO UPDATE SET model.str = EXCLUDED.str WHERE (model.str IS NULL)
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello'), (N'world') ON CONFLICT DO UPDATE SET model.str = EXCLUDED.str WHERE (model.str IS NULL)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("id", "str") VALUES (42, 'hello')
1+
INSERT INTO "models" ("id", "str") VALUES (42, N'hello')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "src" AS (SELECT * FROM (VALUES (42, 'hello'), (43, 'world')) AS t ("id", "str")) INSERT INTO dest SELECT * FROM src
1+
WITH "src" AS (SELECT * FROM (VALUES (42, N'hello'), (43, N'world')) AS t ("id", "str")) INSERT INTO dest SELECT * FROM src
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = '' WHERE ("id" = NULL)
1+
UPDATE "models" SET "str" = N'' WHERE ("id" = NULL)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE ("id" = 42)
1+
UPDATE "models" SET "str" = N'hello' WHERE ("id" = 42)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (42, 'hello'), (43, 'world')) AS t ("id", "str")) UPDATE "models" SET model.str = _data.str FROM "_data" WHERE (model.id = _data.id)
1+
WITH "_data" AS (SELECT * FROM (VALUES (42, N'hello'), (43, N'world')) AS t ("id", "str")) UPDATE "models" SET model.str = _data.str FROM "_data" WHERE (model.id = _data.id)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = 'hello' WHERE (id = 42)
1+
UPDATE "models" SET "str" = N'hello' WHERE (id = 42)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "src" AS (SELECT * FROM (VALUES (42, 'hello'), (43, 'world')) AS t ("id", "str")) UPDATE "dest" SET dest.str = src.str FROM "src" WHERE (dest.id = src.id)
1+
WITH "src" AS (SELECT * FROM (VALUES (42, N'hello'), (43, N'world')) AS t ("id", "str")) UPDATE "dest" SET dest.str = src.str FROM "src" WHERE (dest.id = src.id)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('')
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
REPLACE INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('')
1+
REPLACE INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello'), ('world') ON DUPLICATE KEY UPDATE SET str = upper(str)
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello'), (N'world') ON DUPLICATE KEY UPDATE SET str = upper(str)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str", "foo") OUTPUT INSERTED."id" VALUES ('', 'bar')
1+
INSERT INTO "models" ("str", "foo") OUTPUT INSERTED."id" VALUES (N'', N'bar')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "models" SET "str" = '', foo = 'bar' WHERE ("id" = NULL)
1+
UPDATE "models" SET "str" = N'', foo = N'bar' WHERE ("id" = NULL)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (42, 'hello', 'skip'), (43, 'world', 'skip')) AS t ("id", "str1", "str2")) UPDATE "models" SET "str1" = _data."str1" FROM _data WHERE ("models"."id" = _data."id")
1+
WITH "_data" AS (SELECT * FROM (VALUES (42, N'hello', N'skip'), (43, N'world', N'skip')) AS t ("id", "str1", "str2")) UPDATE "models" SET "str1" = _data."str1" FROM _data WHERE ("models"."id" = _data."id")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
UPDATE "users" SET name = 'Hello' WHERE (id = NULL)
1+
UPDATE "users" SET name = N'Hello' WHERE (id = NULL)
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "users" ("name") OUTPUT INSERTED."id" VALUES ('Hello') ON CONFLICT DO UPDATE SET name = 'Hello'
1+
INSERT INTO "users" ("name") OUTPUT INSERTED."id" VALUES (N'Hello') ON CONFLICT DO UPDATE SET name = N'Hello'
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (42, 'hello', 'world'), (43, 'foo', 'bar')) AS t ("id", "str1", "str2")) UPDATE "models" SET "str2" = _data."str2" FROM _data WHERE ("models"."id" = _data."id")
1+
WITH "_data" AS (SELECT * FROM (VALUES (42, N'hello', N'world'), (43, N'foo', N'bar')) AS t ("id", "str1", "str2")) UPDATE "models" SET "str2" = _data."str2" FROM _data WHERE ("models"."id" = _data."id")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('custom'), ('custom')
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'custom'), (N'custom')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WITH "_data" AS (SELECT * FROM (VALUES (42, 'custom'), (43, 'custom')) AS t ("id", "str")) UPDATE "models" SET "str" = _data."str" FROM _data WHERE ("models"."id" = _data."id")
1+
WITH "_data" AS (SELECT * FROM (VALUES (42, N'custom'), (43, N'custom')) AS t ("id", "str")) UPDATE "models" SET "str" = _data."str" FROM _data WHERE ("models"."id" = _data."id")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello') ON CONFLICT (id) DO UPDATE SET "str" = EXCLUDED."str"
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello') ON CONFLICT (id) DO UPDATE SET "str" = EXCLUDED."str"
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") VALUES ('')
1+
INSERT INTO "models" ("str") VALUES (N'')
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES ('hello') ON DUPLICATE KEY UPDATE "str" = VALUES("str")
1+
INSERT INTO "models" ("str") OUTPUT INSERTED."id" VALUES (N'hello') ON DUPLICATE KEY UPDATE "str" = VALUES("str")

0 commit comments

Comments
 (0)