Merge branch 'sqlkata:main' into main

Author: cemahseri

.github/workflows/ci.yml

@@ -1,7 +1,8 @@
 on:
   push:
-    branches:
-      - main
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
 env:
   # Stop wasting time caching packages
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -10,28 +11,70 @@ env:
 
   # MYSQL DB
   DB_MYSQL_DATABASE: test_sqlkata
-  DB_MYSQL_USER: root
-  DB_MYSQL_PASSWORD: "root"
-  DB_MYSQL_HOST: localhost
+
+  # MS SQL
+  DB_MSSQL_HOST: localhost
+  DB_MSSQL_USER: sa
+  DB_MSSQL_DATABASE: test_sqlkata
+
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    # Define a service container for SQL Server
+    # services:
+    #   mssql:
+    #     image: mcr.microsoft.com/mssql/server:2022-latest
+    #     env:
+    #       MSSQL_SA_PASSWORD: "${{ secrets.MSSQL_SA_PASSWORD }}"
+    #       ACCEPT_EULA: 'Y'
+    #       MSSQL_PID: Express
+    #     ports:
+    #       - 1433:1433 # Map the port
+    #     # Wait for the service to be ready before running steps
+    #     options: >-
+    #       --health-cmd "sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q 'SELECT 1'"
+    #       --health-interval 10s
+    #       --health-timeout 5s
+    #       --health-retries 20
+
+    timeout-minutes: 20
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Restore dependencies
+        run: dotnet restore
       - name: Build
-        run: dotnet build --configuration Release
+        run: dotnet build --no-restore
       - name: Start MySql
         run: |
           sudo /etc/init.d/mysql start
-          mysqladmin -u ${{ env.DB_MYSQL_USER }} -p${{ env.DB_MYSQL_PASSWORD }} password ''
-          mysql -e 'CREATE DATABASE ${{ env.DB_MYSQL_DATABASE }};' -u${{ env.DB_MYSQL_USER }}
-          mysql -e 'CREATE TABLE cars(id int primary key auto_increment);' -u${{ env.DB_MYSQL_USER }} ${{ env.DB_MYSQL_DATABASE }}
-          mysql -e 'SHOW TABLES;' -u${{ env.DB_MYSQL_USER }} ${{ env.DB_MYSQL_DATABASE }}
-      - name: Test
-        run: dotnet test --configuration Release --no-build
+          mysqladmin -u root -proot password "${{ secrets.MYSQL_ROOT_PASSWORD }}"
+          mysql -uroot -p"${{ secrets.MYSQL_ROOT_PASSWORD }}" -e 'CREATE DATABASE ${{ env.DB_MYSQL_DATABASE }};'
+          mysql -uroot -p"${{ secrets.MYSQL_ROOT_PASSWORD }}" -e 'CREATE TABLE cars(id int primary key auto_increment);' ${{ env.DB_MYSQL_DATABASE }}
+          mysql -uroot -p"${{ secrets.MYSQL_ROOT_PASSWORD }}" -e 'SHOW TABLES;' ${{ env.DB_MYSQL_DATABASE }}
+
+      # - name: Install sqlcmd tools
+      #   run: |
+      #     sudo apt-get update
+      #     sudo apt-get install -y curl apt-transport-https gnupg
+      #     curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
+      #     echo "deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/$(lsb_release -rs)/prod $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/microsoft.list
+      #     sudo apt-get update
+      #     sudo apt-get install -y mssql-tools unixodbc-dev
+      #     echo '/opt/mssql-tools/bin' | sudo tee -a $GITHUB_PATH
+
+      # - name: Run SQL commands (example)
+      #   run: |
+      #     sqlcmd -S localhost,1433 -U SA -P "${{ secrets.MSSQL_SA_PASSWORD }}" -Q "SELECT @@VERSION"
+
+      - name: Run Test
+        run: dotnet test --no-build --verbosity normal
         env:
-          SQLKATA_MYSQL_HOST: ${{ env.DB_MYSQL_HOST }}
-          SQLKATA_MYSQL_USER: ${{ env.DB_MYSQL_USER }}
+          SQLKATA_MYSQL_HOST: localhost
+          SQLKATA_MYSQL_USER: root
           SQLKATA_MYSQL_DB: ${{ env.DB_MYSQL_DATABASE }}
+          SQLKATA_MYSQL_PASSWORD: "${{ secrets.MYSQL_ROOT_PASSWORD }}"

QueryBuilder.Tests/MySqlExecutionTest.cs

@@ -213,12 +213,12 @@ public void BasicSelectFilter()
                 // 2020
                 {"2020-01-01", 10},
                 {"2020-05-01", 20},
-                
+
                 // 2021
                 {"2021-01-01", 40},
                 {"2021-02-01", 10},
                 {"2021-04-01", -10},
-                
+
                 // 2022
                 {"2022-01-01", 80},
                 {"2022-02-01", -30},
@@ -251,10 +251,11 @@ public void BasicSelectFilter()
 
         QueryFactory DB()
         {
-            var host = System.Environment.GetEnvironmentVariable("SQLKATA_MYSQL_HOST");
-            var user = System.Environment.GetEnvironmentVariable("SQLKATA_MYSQL_USER");
-            var dbName = System.Environment.GetEnvironmentVariable("SQLKATA_MYSQL_DB");
-            var cs = $"server={host};user={user};database={dbName}";
+            var host = Environment.GetEnvironmentVariable("SQLKATA_MYSQL_HOST");
+            var user = Environment.GetEnvironmentVariable("SQLKATA_MYSQL_USER");
+            var dbName = Environment.GetEnvironmentVariable("SQLKATA_MYSQL_DB");
+            var dbPass = Environment.GetEnvironmentVariable("SQLKATA_MYSQL_PASSWORD");
+            var cs = $"Server={host};User={user};Database={dbName};Password={dbPass}";
 
             var connection = new MySqlConnection(cs);
 
@@ -266,4 +267,4 @@ QueryFactory DB()
 
 
     }
-}
+}

QueryBuilder.Tests/QueryBuilder.Tests.csproj

@@ -11,7 +11,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk"
                           Version="17.12.0" />
         <PackageReference Include="MySql.Data"
-                          Version="8.0.30" />
+                          Version="9.4.0" />
         <PackageReference Include="xunit"
                           Version="2.9.3" />
         <PackageReference Include="xunit.runner.visualstudio"
@@ -21,4 +21,4 @@
         <ProjectReference Include="..\QueryBuilder\QueryBuilder.csproj" />
         <ProjectReference Include="..\SqlKata.Execution\SqlKata.Execution.csproj" />
     </ItemGroup>
-</Project>
+</Project>