git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/mysql: fix support for non-specified database schema

and increase test coverage to catch this

commit77978c1518f3f2808947696f1b80e0eb8bd8ff9c authorFlorian Jacob <fjacob@lavabit.com> dateMon 1 Apr 2019, 20:01 (8 years ago) parent4d4b67b
2 files changed+8−4
nixos/modules/services/databases/mysql.nix+1−1 nixos/tests/mysql.nix+7−3
nixos/modules/services/databases/mysql.nix+1−1
@@ -360,7 +360,7 @@ in
360360 echo "Creating initial database: ${database.name}"
361361 ( echo 'create database `${database.name}`;'
362362
363− ${optionalString (database ? "schema") ''
363+ ${optionalString (database.schema != null) ''
364364 echo 'use `${database.name}`;'
365365
366366 if [ -f "${database.schema}" ]
nixos/tests/mysql.nix+7−3
@@ -10,7 +10,10 @@ import ./make-test.nix ({ pkgs, ...} : {
1010
1111 {
1212 services.mysql.enable = true;
13− services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
13+ services.mysql.initialDatabases = [
14+ { name = "testdb"; schema = ./testdb.sql; }
15+ { name = "empty_testdb"; }
16+ ];
1417 services.mysql.package = pkgs.mysql;
1518 };
1619
@@ -36,11 +39,12 @@ import ./make-test.nix ({ pkgs, ...} : {
3639 startAll;
3740
3841 $mysql->waitForUnit("mysql");
39− $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
42+ $mysql->succeed("echo 'use empty_testdb;' | mysql -u root");
43+ $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4");
4044
4145 $mariadb->waitForUnit("mysql");
4246 $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser");
4347 $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser");
44− $mariadb->succeed("echo 'use testdb; select test_id from tests' | sudo -u testuser mysql -u testuser -N | grep 42");
48+ $mariadb->succeed("echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42");
4549 '';
4650})