diff --git a/manifests/query.pp b/manifests/query.pp
index ef3e013..c51c4b0 100644
--- a/manifests/query.pp
+++ b/manifests/query.pp
@@ -1,6 +1,6 @@
 define mysql::query (
-  $mysql_db,
   $mysql_query,
+  $mysql_db             = undef,
   $mysql_user           = 'root',
   $mysql_password       = '',
   $mysql_host           = 'localhost',
@@ -18,8 +18,26 @@
     require => Service['mysql'],
   }
 
+
+  $arg_mysql_user = $mysql_user ? {
+    ''      => '',
+    default => "-u ${mysql_user}",
+  }
+
+  $arg_mysql_host = $mysql_host ? {
+  ''      => '',
+  default => "-h ${mysql_host}",
+  }
+
+  $arg_mysql_password = $mysql_password ? {
+    ''      => '',
+    default => "--password=\"${mysql_password}\"",
+  }
+
   exec { "mysqlquery-${name}":
-      command     => "mysql < ${mysql_query_filepath}/mysqlquery-${name}.sql",
+      command     => "mysql --defaults-file=/root/.my.cnf \
+                      ${arg_mysql_user} ${arg_mysql_password} ${arg_mysql_host} \
+                      < ${mysql_query_filepath}/mysqlquery-${name}.sql",
       require     => File["mysqlquery-${name}.sql"],
       refreshonly => true,
       subscribe   => File["mysqlquery-${name}.sql"],
diff --git a/templates/query.erb b/templates/query.erb
index cb1f189..ad202a5 100644
--- a/templates/query.erb
+++ b/templates/query.erb
@@ -1,5 +1,7 @@
 # File managed by Puppet
 
-USE <%= mysql_db %> ;
-<%= mysql_query %> ;
+<% if @mysql_db %>
+    USE <%= mysql_db %>;
+<% end %>
 
+<%= mysql_query %> ;