From aea2c65b306e4f64d0f3a7a21df2f11c64a74d78 Mon Sep 17 00:00:00 2001 From: Ilan Uzan Date: Sat, 27 Sep 2025 19:04:11 +0200 Subject: [PATCH 1/2] fix: remove redundant directory --- .../DefaultSchemaEnum/request.json | 105 ------------------ .../DefaultSchemaEnum/request.message | 13 --- .../SchemaScopedEnum/request.json | 85 -------------- .../SchemaScopedEnum/request.message | 10 -- 4 files changed, 213 deletions(-) delete mode 100644 CodegenTests/test-requests/DefaultSchemaEnum/request.json delete mode 100644 CodegenTests/test-requests/DefaultSchemaEnum/request.message delete mode 100644 CodegenTests/test-requests/SchemaScopedEnum/request.json delete mode 100644 CodegenTests/test-requests/SchemaScopedEnum/request.message diff --git a/CodegenTests/test-requests/DefaultSchemaEnum/request.json b/CodegenTests/test-requests/DefaultSchemaEnum/request.json deleted file mode 100644 index 8a29ddad..00000000 --- a/CodegenTests/test-requests/DefaultSchemaEnum/request.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "settings": { - "version": "2", - "engine": "mysql", - "schema": [ - "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql" - ], - "queries": [ - "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sql" - ], - "codegen": { - "out": "./CodegenTests/test-requests/DefaultSchemaEnum", - "plugin": "csharp", - "options": "eyJkZWJ1Z1JlcXVlc3QiOnRydWV9", - "process": { - "cmd": "./dist/LocalRunner" - } - } - }, - "catalog": { - "defaultSchema": "public", - "schemas": [ - { - "name": "public", - "tables": [ - { - "rel": { - "name": "dummy_table" - }, - "columns": [ - { - "name": "dummy_column", - "length": 1, - "table": { - "name": "dummy_table" - }, - "type": { - "name": "dummy_table_dummy_column" - } - } - ] - } - ], - "enums": [ - { - "name": "dummy_table_dummy_column", - "vals": [ - "x", - "y" - ] - } - ] - } - ] - }, - "queries": [ - { - "text": "SELECT dummy_column FROM dummy_table LIMIT 1", - "name": "TestOne", - "cmd": ":one", - "columns": [ - { - "name": "dummy_column", - "length": 1, - "table": { - "name": "dummy_table" - }, - "type": { - "name": "dummy_table_dummy_column" - }, - "originalName": "dummy_column" - } - ], - "filename": "query.sql" - }, - { - "text": "INSERT INTO dummy_table (dummy_column) VALUES (?)", - "name": "TestInsert", - "cmd": ":exec", - "parameters": [ - { - "number": 1, - "column": { - "name": "dummy_column", - "length": 1, - "table": { - "schema": "public", - "name": "dummy_table" - }, - "type": { - "name": "dummy_table_dummy_column" - }, - "originalName": "dummy_column" - } - } - ], - "filename": "query.sql", - "insert_into_table": { - "name": "dummy_table" - } - } - ], - "sqlc_version": "v1.30.0", - "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6bnVsbCwiZGVidWdSZXF1ZXN0IjpmYWxzZX0=" -} \ No newline at end of file diff --git a/CodegenTests/test-requests/DefaultSchemaEnum/request.message b/CodegenTests/test-requests/DefaultSchemaEnum/request.message deleted file mode 100644 index f7f2466c..00000000 --- a/CodegenTests/test-requests/DefaultSchemaEnum/request.message +++ /dev/null @@ -1,13 +0,0 @@ - -ø -2mysqlBunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"Aunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe -../CodegenTests/test-requests/DefaultSchemaEnumcsharp{"debugRequest":true}* -./dist/LocalRunner‚public"xpublicL -  dummy_table; - dummy_column0R  dummy_tablebdummy_table_dummy_column" -dummy_table_dummy_columnxy“ -,SELECT dummy_column FROM dummy_table LIMIT 1TestOne:one"I - dummy_column0R  dummy_tablebdummy_table_dummy_columnz dummy_column: query.sql· -1INSERT INTO dummy_table (dummy_column) VALUES (?) -TestInsert:exec*UQ - dummy_column0Rpublic dummy_tablebdummy_table_dummy_columnz dummy_column: query.sqlB  dummy_table"v1.30.0*³{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false} \ No newline at end of file diff --git a/CodegenTests/test-requests/SchemaScopedEnum/request.json b/CodegenTests/test-requests/SchemaScopedEnum/request.json deleted file mode 100644 index 56609255..00000000 --- a/CodegenTests/test-requests/SchemaScopedEnum/request.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "settings": { - "version": "2", - "engine": "mysql", - "schema": [ - "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql" - ], - "queries": [ - "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sql" - ], - "codegen": { - "out": "./CodegenTests/test-requests/SchemaScopedEnum", - "plugin": "csharp", - "options": "eyJkZWJ1Z1JlcXVlc3QiOnRydWV9", - "process": { - "cmd": "./dist/LocalRunner" - } - } - }, - "catalog": { - "defaultSchema": "public", - "schemas": [ - { - "name": "public", - "enums": [ - { - "name": "dummy_table_dummy_column", - "vals": [ - "x", - "y" - ] - } - ] - }, - { - "name": "dummy_schema", - "tables": [ - { - "rel": { - "schema": "dummy_schema", - "name": "dummy_table" - }, - "columns": [ - { - "name": "dummy_column", - "length": 1, - "table": { - "schema": "dummy_schema", - "name": "dummy_table" - }, - "type": { - "name": "dummy_table_dummy_column" - } - } - ] - } - ] - } - ] - }, - "queries": [ - { - "text": "SELECT dummy_column FROM dummy_schema.dummy_table LIMIT 1", - "name": "Test", - "cmd": ":one", - "columns": [ - { - "name": "dummy_column", - "length": 1, - "table": { - "schema": "dummy_schema", - "name": "dummy_table" - }, - "type": { - "name": "dummy_table_dummy_column" - }, - "originalName": "dummy_column" - } - ], - "filename": "query.sql" - } - ], - "sqlc_version": "v1.30.0", - "plugin_options": "eyJvdmVycmlkZURyaXZlclZlcnNpb24iOiIiLCJnZW5lcmF0ZUNzcHJvaiI6dHJ1ZSwidGFyZ2V0RnJhbWV3b3JrIjoibmV0OC4wIiwibmFtZXNwYWNlTmFtZSI6IiIsInVzZURhcHBlciI6ZmFsc2UsIm92ZXJyaWRlRGFwcGVyVmVyc2lvbiI6IiIsIm92ZXJyaWRlcyI6bnVsbCwiZGVidWdSZXF1ZXN0IjpmYWxzZX0=" -} \ No newline at end of file diff --git a/CodegenTests/test-requests/SchemaScopedEnum/request.message b/CodegenTests/test-requests/SchemaScopedEnum/request.message deleted file mode 100644 index 7c87be05..00000000 --- a/CodegenTests/test-requests/SchemaScopedEnum/request.message +++ /dev/null @@ -1,10 +0,0 @@ - -õ -2mysqlAunit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"@unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd --./CodegenTests/test-requests/SchemaScopedEnumcsharp{"debugRequest":true}* -./dist/LocalRunner®public"*public" -dummy_table_dummy_columnxy"x dummy_schemah - dummy_schema dummy_tableI - dummy_column0R dummy_schema dummy_tablebdummy_table_dummy_column« -9SELECT dummy_column FROM dummy_schema.dummy_table LIMIT 1Test:one"W - dummy_column0R dummy_schema dummy_tablebdummy_table_dummy_columnz dummy_column: query.sql"v1.30.0*³{"overrideDriverVersion":"","generateCsproj":true,"targetFramework":"net8.0","namespaceName":"","useDapper":false,"overrideDapperVersion":"","overrides":null,"debugRequest":false} \ No newline at end of file From 237bc841d85abc496d35e397f1f507ceb7ac45dc Mon Sep 17 00:00:00 2001 From: Ilan Uzan Date: Sat, 27 Sep 2025 19:08:05 +0200 Subject: [PATCH 2/2] fix: sqlc.unit.test.yaml output path --- sqlc.unit.test.yaml | 4 ++-- .../test-requests/DefaultSchemaEnum/request.json | 6 +++--- .../test-requests/DefaultSchemaEnum/request.message | 6 +++--- .../test-requests/SchemaScopedEnum/request.json | 6 +++--- .../test-requests/SchemaScopedEnum/request.message | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sqlc.unit.test.yaml b/sqlc.unit.test.yaml index aea66263..ba3e6ae6 100644 --- a/sqlc.unit.test.yaml +++ b/sqlc.unit.test.yaml @@ -9,7 +9,7 @@ sql: engine: "mysql" codegen: - plugin: csharp - out: ./CodegenTests/test-requests/DefaultSchemaEnum + out: ./unit-tests/CodegenTests/test-requests/DefaultSchemaEnum options: debugRequest: true @@ -18,6 +18,6 @@ sql: engine: "mysql" codegen: - plugin: csharp - out: ./CodegenTests/test-requests/SchemaScopedEnum + out: ./unit-tests/CodegenTests/test-requests/SchemaScopedEnum options: debugRequest: true diff --git a/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.json b/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.json index 7cf007aa..a284ef5a 100644 --- a/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.json +++ b/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.json @@ -3,13 +3,13 @@ "version": "2", "engine": "mysql", "schema": [ - "CodegenTests/test-requests/DefaultSchemaEnum/schema.sql" + "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql" ], "queries": [ - "CodegenTests/test-requests/DefaultSchemaEnum/query.sql" + "unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sql" ], "codegen": { - "out": "./CodegenTests/test-requests/DefaultSchemaEnum", + "out": "./unit-tests/CodegenTests/test-requests/DefaultSchemaEnum", "plugin": "csharp", "options": "eyJkZWJ1Z1JlcXVlc3QiOnRydWV9", "process": { diff --git a/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.message b/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.message index d56158b3..8f53eb77 100644 --- a/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.message +++ b/unit-tests/CodegenTests/test-requests/DefaultSchemaEnum/request.message @@ -1,7 +1,7 @@ -â -2mysql7CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"6CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbe -../CodegenTests/test-requests/DefaultSchemaEnumcsharp{"debugRequest":true}* +ƒ +2mysqlBunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/schema.sql"Aunit-tests/CodegenTests/test-requests/DefaultSchemaEnum/query.sqlbp +9./unit-tests/CodegenTests/test-requests/DefaultSchemaEnumcsharp{"debugRequest":true}* ./dist/LocalRunner‚public"xpublicL  dummy_table; dummy_column0R  dummy_tablebdummy_table_dummy_column" diff --git a/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.json b/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.json index 7b2a146d..263f668e 100644 --- a/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.json +++ b/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.json @@ -3,13 +3,13 @@ "version": "2", "engine": "mysql", "schema": [ - "./CodegenTests/test-requests/SchemaScopedEnum/schema.sql" + "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql" ], "queries": [ - "./CodegenTests/test-requests/SchemaScopedEnum/query.sql" + "unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sql" ], "codegen": { - "out": "./CodegenTests/test-requests/SchemaScopedEnum", + "out": "./unit-tests/CodegenTests/test-requests/SchemaScopedEnum", "plugin": "csharp", "options": "eyJkZWJ1Z1JlcXVlc3QiOnRydWV9", "process": { diff --git a/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.message b/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.message index 766cd0c5..4ecfb22f 100644 --- a/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.message +++ b/unit-tests/CodegenTests/test-requests/SchemaScopedEnum/request.message @@ -1,7 +1,7 @@ -ã -2mysql8./CodegenTests/test-requests/SchemaScopedEnum/schema.sql"7./CodegenTests/test-requests/SchemaScopedEnum/query.sqlbd --./CodegenTests/test-requests/SchemaScopedEnumcsharp{"debugRequest":true}* +€ +2mysqlAunit-tests/CodegenTests/test-requests/SchemaScopedEnum/schema.sql"@unit-tests/CodegenTests/test-requests/SchemaScopedEnum/query.sqlbo +8./unit-tests/CodegenTests/test-requests/SchemaScopedEnumcsharp{"debugRequest":true}* ./dist/LocalRunner®public"*public" dummy_table_dummy_columnxy"x dummy_schemah  dummy_schema dummy_tableI