From e171b6d86eedc6fedba31db91131a42c497e3934 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 18 Nov 2009 21:56:47 +0000
Subject: [PATCH] Added option to specify directories as a path for MySQL
 database schemas.

By using this approach we no longer have to specify schemas like this:

schema = "${myDatabaseSchemaDrvFun}/prefix/to/the/sqlfile.sql";

but like this:

schema = myDataBaseSchemaDrv;

which is in some cases more convenient.


svn path=/nixos/branches/upstart-0.6/; revision=18450
---
 modules/services/databases/mysql.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/modules/services/databases/mysql.nix b/modules/services/databases/mysql.nix
index 50d00c0e5bab..e3c92adee5aa 100644
--- a/modules/services/databases/mysql.nix
+++ b/modules/services/databases/mysql.nix
@@ -124,7 +124,14 @@ in
                     echo "Creating initial database: ${database.name}"
                     ( echo "create database ${database.name};"
                       echo "use ${database.name};"
-                      cat ${database.schema} ) | ${mysql}/bin/mysql -u root -N
+		      if [ -f "${database.schema}" ]
+		      then
+                          cat ${database.schema}
+		      elif [ -d "${database.schema}" ]
+		      then
+		          cat ${database.schema}/mysql-databases/*.sql
+		      fi
+		    ) | ${mysql}/bin/mysql -u root -N
                 fi
               '') cfg.initialDatabases}            
 	  '';