diff options
author | Florian Jacob <fjacob@lavabit.com> | 2019-04-01 20:01:29 +0200 |
---|---|---|
committer | Florian Jacob <fjacob@lavabit.com> | 2019-04-01 20:01:29 +0200 |
commit | 77978c1518f3f2808947696f1b80e0eb8bd8ff9c (patch) | |
tree | f892ecd6a8c342aa10c232aa50cc3fc3eca76feb /nixos | |
parent | 4d4b67b65e831159430a036f64d323e3cc007701 (diff) | |
download | nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar.gz nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar.bz2 nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar.lz nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar.xz nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.tar.zst nixpkgs-77978c1518f3f2808947696f1b80e0eb8bd8ff9c.zip |
nixos/mysql: fix support for non-specified database schema
and increase test coverage to catch this
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 2 | ||||
-rw-r--r-- | nixos/tests/mysql.nix | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 89291d4438f..12dbc07dcf0 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -360,7 +360,7 @@ in echo "Creating initial database: ${database.name}" ( echo 'create database `${database.name}`;' - ${optionalString (database ? "schema") '' + ${optionalString (database.schema != null) '' echo 'use `${database.name}`;' if [ -f "${database.schema}" ] diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index fedc7f0ab1f..97a4dee7f99 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -10,7 +10,10 @@ import ./make-test.nix ({ pkgs, ...} : { { services.mysql.enable = true; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; services.mysql.package = pkgs.mysql; }; @@ -36,11 +39,12 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $mysql->waitForUnit("mysql"); - $mysql->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); + $mysql->succeed("echo 'use empty_testdb;' | mysql -u root"); + $mysql->succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4"); $mariadb->waitForUnit("mysql"); $mariadb->succeed("echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser"); $mariadb->succeed("echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser"); - $mariadb->succeed("echo 'use testdb; select test_id from tests' | sudo -u testuser mysql -u testuser -N | grep 42"); + $mariadb->succeed("echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42"); ''; }) |