From 0db0c40d6bbeb4d57927194e7fe9cc04e35d4ca9 Mon Sep 17 00:00:00 2001
From: James A Sutherland <>
Date: Sun, 28 Aug 2022 19:06:07 -0500
Subject: [PATCH] Try using QUOTE function instead of replace hack

---
 .github/workflows/dotnet-core.yml             | 19 +++++++++++--------
 .../Aggregation/MySqlAggregateHelper.cs       |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 9f796f44..fe236a37 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -42,7 +42,9 @@ jobs:
 
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2
+      if: false
     - name: Prep for MySQL bisection
+      if: false
       run: |
         export PATH=/usr/lib/ccache:$PATH
         git clone https://github.com/mysql/mysql-server.git
@@ -53,20 +55,21 @@ jobs:
         make -sj`nproc`
     - name: Setup upterm session
       uses: lhotari/action-upterm@v1
-      if: contains(github.ref,'refs/tags/')
+      if: false
 
     - name: MySQL
       run: |
         sed -i'' -e 's|</TestDatabases>|<TestDatabase><DatabaseType>PostgreSql</DatabaseType><ConnectionString>User ID=postgres;Password=pgpass4291;Host=127.0.0.1;Port=5432</ConnectionString></TestDatabase></TestDatabases>|' Tests/FAnsiTests/TestDatabases.xml
         sed -i'' -e 's/Pwd=;SslMode=None/Pwd=root;AllowPublicKeyRetrieval=true/' Tests/FAnsiTests/TestDatabases.xml
+        sudo systemctl start mysql.service
 
-        sudo curl -o /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc 'https://mariadb.org/mariadb_release_signing_key.asc'
-        sudo sh -c "echo 'deb https://mirrors.xtom.com/mariadb/repo/10.9/ubuntu focal main' >>/etc/apt/sources.list"
-        sudo apt-get update
-        sudo apt-get install mariadb-server
-        sudo mysql -uroot <<EOM
-        ALTER USER 'root'@'localhost' IDENTIFIED BY 'root';
-        EOM
+        #sudo curl -o /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc 'https://mariadb.org/mariadb_release_signing_key.asc'
+        #sudo sh -c "echo 'deb https://mirrors.xtom.com/mariadb/repo/10.9/ubuntu focal main' >>/etc/apt/sources.list"
+        #sudo apt-get update
+        #sudo apt-get install mariadb-server
+        #sudo mysql -uroot <<EOM
+        #ALTER USER 'root'@'localhost' IDENTIFIED BY 'root';
+        #EOM
     - name: Test
       if: contains(github.ref,'refs/tags/')
       run: dotnet --logger "console;verbosity=minimal" --nologo
diff --git a/Implementations/FAnsi.Implementations.MySql/Aggregation/MySqlAggregateHelper.cs b/Implementations/FAnsi.Implementations.MySql/Aggregation/MySqlAggregateHelper.cs
index 4a78a8fa..d6ec4aa9 100644
--- a/Implementations/FAnsi.Implementations.MySql/Aggregation/MySqlAggregateHelper.cs
+++ b/Implementations/FAnsi.Implementations.MySql/Aggregation/MySqlAggregateHelper.cs
@@ -288,7 +288,7 @@ order by
 SELECT
   GROUP_CONCAT(
     CONCAT(
-      '{0}(case when {1} = \'', REPLACE(pivotValues.piv,'\'','\\\''), '\' then {2} else null end) AS `', pivotValues.piv,'`'
+      '{0}(case when {1} = ', QUOTE(pivotValues.piv), ' then {2} else null end) AS `', pivotValues.piv,'`'
     )
   ) INTO @columnsSelectCases
 FROM