movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-18 23:50:07 +03:00
Code Activity

nixos/mysql: fix support for non-specified database schema

Browse source 
and increase test coverage to catch this
This commit is contained in:
Florian Jacob 2019-04-01 20:01:29 +02:00
parent 4d4b67b65e
commit 77978c1518
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/databases/mysql.nix
View file

@ -360,7 +360,7 @@ in
echo "Creating initial database: ${database.name}" echo "Creating initial database: ${database.name}"
( echo 'create database `${database.name}`;' ( echo 'create database `${database.name}`;'
${optionalString (database ? "schema") '' ${optionalString (database.schema != null) ''
echo 'use `${database.name}`;' echo 'use `${database.name}`;'
if [ -f "${database.schema}" ] if [ -f "${database.schema}" ]

10
nixos/tests/mysql.nix
View file

@ -10,7 +10,10 @@ import ./make-test.nix ({ pkgs, ...} : {
{ {
services.mysql.enable = true; 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; services.mysql.package = pkgs.mysql;
}; };
@ -36,11 +39,12 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll; startAll;
$mysql->waitForUnit("mysql"); $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->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; 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; 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");
''; '';
}) })