testing different configurations via github action matrix - file-per-query config (#50)

Author: SockworkOrange

.github/workflows/main.yml

@@ -39,16 +39,17 @@ jobs:
             MySqlConnectorExample
             NpgsqlExample
 
-
+  
   ci:
     name: CI
     runs-on: ${{ matrix.os }}
     if: ${{ always() }}
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        architecture: [ "x64", "arm64" ]
+        os: [ 'ubuntu-latest' ]
+        architecture: [ 'x64', 'arm64' ]
         dotnet-version: [ '8.0.x' ]
+        file-per-query: [ 'true', 'false' ]
 
     steps:
       - uses: actions/checkout@v4
@@ -84,32 +85,41 @@ jobs:
           ./scripts/wasm/copy_to_dist.sh 
           ./scripts/wasm/update_sha.sh
           
+      - name: Verify pushed Dockerfile is synced
+        run: |
+          ./scripts/generate_dockerfile.sh /tmp/Dockerfile
+          diff /tmp/Dockerfile Dockerfile
+          
       - uses: sqlc-dev/setup-sqlc@v4
         with:
           sqlc-version: '1.25.0'
 
+      - name: Updating configuration
+        env:
+          FILE_PER_QUERY: ${{ matrix.file-per-query }}
+        run: ./scripts/update_config.sh $FILE_PER_QUERY
+        
       - name: Verify pushed generated code is synced
+        if: matrix.file-per-query == 'false'
         run: sqlc -f sqlc.wasm.yaml diff
-        
-      - name: Verify pushed Dockerfile is synced
-        run: |
-          ./scripts/generate_dockerfile.sh /tmp/Dockerfile
-          diff /tmp/Dockerfile Dockerfile
-        
+      
       - name: Sqlc generate using Wasm plugin
-        run: sqlc -f sqlc.wasm.yaml generate
-        
-      - uses: hoverkraft-tech/[email protected]
+        run: |
+          rm MySqlConnectorExample/*.cs NpgsqlExample/*.cs
+          sqlc -f sqlc.wasm.yaml generate
+
+      - name: Docker compose
+        if: matrix.file-per-query == 'false'
+        uses: hoverkraft-tech/[email protected]
         with:
-         services: |
-           mysqldb
-           postgresdb
-           plugin-tests
-           
+          services: |
+            mysqldb
+            postgresdb
+            plugin-tests
+            
       - name: Test generated code
-        run: |
-           chmod +x ./scripts/run_tests.sh
-           ./scripts/run_tests.sh
+        if: matrix.file-per-query == 'false'
+        run: ./scripts/run_tests.sh
 
       - name: upload wasm plugin as artifact
         uses: actions/upload-artifact@v2
@@ -119,7 +129,7 @@ jobs:
           path: dist/plugin.wasm
 
   release:
-    name: Release test
+    name: Release
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[release]')
     needs: [ci]

Makefile

@@ -19,10 +19,10 @@ run-tests:
 
 # process type plugin
 dotnet-build-process: protobuf-generate dotnet-format
-	dotnet build SqlcGenCsharpProcess -c Release
+	dotnet build ProcessRunner -c Release
 
 dotnet-publish-process: dotnet-build-process
-	dotnet publish SqlcGenCsharpProcess -c release --output dist/
+	dotnet publish ProcessRunner -c release --output dist/
 
 sqlc-generate-process: dotnet-publish-process
 	sqlc -f sqlc.process.yaml generate

scripts/update_config.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+file_per_query=$1
+yq -i ".sql[0].codegen[0].options.filePerQuery = ${file_per_query}" sqlc.wasm.yaml
+yq -i ".sql[1].codegen[0].options.filePerQuery = ${file_per_query}" sqlc.wasm.yaml

sqlc.process.yaml

@@ -2,7 +2,7 @@ version: "2"
 plugins:
 - name: csharp
   process:
-    cmd: ./dist/SqlcGenCsharpProcess
+    cmd: ./dist/ProcessRunner
 sql:
 - schema: "examples/authors/postgresql/schema.sql"
   queries: "examples/authors/postgresql/query.sql"

sqlc.wasm.yaml

@@ -13,9 +13,9 @@ sql:
         out: NpgsqlExample
         options:
           driver: Npgsql
+          filePerQuery: BOOL_TO_REPLACE
           #      targetFramework: netstandard2.0
           #      generateCsproj: true
-          #      filePerQuery: false
   - schema: "examples/authors/mysql/schema.sql"
     queries: "examples/authors/mysql/query.sql"
     engine: "mysql"
@@ -24,6 +24,6 @@ sql:
         out: MySqlConnectorExample
         options:
           driver: MySqlConnector
+          filePerQuery: BOOL_TO_REPLACE
           #      targetFramework: netstandard2.0
           #      generateCsproj: true
-          #      filePerQuery: false