From f153e9b30c4fd259f5c706a192a6506976600292 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 31 Mar 2023 21:52:09 +0900 Subject: [PATCH 1/2] chore(test): remove unused mysql conf file --- prql-compiler/tests/integration-rdbms/conf/my.cnf | 2 -- prql-compiler/tests/integration-rdbms/docker-compose.yml | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 prql-compiler/tests/integration-rdbms/conf/my.cnf diff --git a/prql-compiler/tests/integration-rdbms/conf/my.cnf b/prql-compiler/tests/integration-rdbms/conf/my.cnf deleted file mode 100644 index 34a97baaa0bb..000000000000 --- a/prql-compiler/tests/integration-rdbms/conf/my.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[mysqld] -secure-file-priv = "" diff --git a/prql-compiler/tests/integration-rdbms/docker-compose.yml b/prql-compiler/tests/integration-rdbms/docker-compose.yml index 60d855759c01..d256dba98f37 100644 --- a/prql-compiler/tests/integration-rdbms/docker-compose.yml +++ b/prql-compiler/tests/integration-rdbms/docker-compose.yml @@ -18,9 +18,7 @@ services: environment: MYSQL_DATABASE: dummy MYSQL_ROOT_PASSWORD: root - volumes: - - ./conf/my.cnf:/etc/mysql/conf.d/my.cnf:ro - - ../integration/data/chinook:/tmp/chinook:ro + volumes: *vol # db2: # image: 'icr.io/db2_community/db2' # ports: From 26a2d3cdc07337d9de84811954f46372a4261964 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 31 Mar 2023 22:22:48 +0900 Subject: [PATCH 2/2] fix: pass `--secure-file-priv=""` via compose file --- prql-compiler/tests/integration-rdbms/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/prql-compiler/tests/integration-rdbms/docker-compose.yml b/prql-compiler/tests/integration-rdbms/docker-compose.yml index d256dba98f37..dd0e533d916c 100644 --- a/prql-compiler/tests/integration-rdbms/docker-compose.yml +++ b/prql-compiler/tests/integration-rdbms/docker-compose.yml @@ -18,6 +18,7 @@ services: environment: MYSQL_DATABASE: dummy MYSQL_ROOT_PASSWORD: root + command: --secure-file-priv="" volumes: *vol # db2: # image: 'icr.io/db2_community/db2'