From 79872b9012011738bb173d0a89a46159ba7ca13b Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Tue, 26 Feb 2013 21:13:49 -0800
Subject: [PATCH] Ticket #269: Fixed password initialization in create user
 script, and removed hard-coded database names in XML mapping files.

---
 ...acamole-auth-mysql-create-default-user.sql |  2 +-
 .../mysql/dao/ConnectionHistoryMapper.xml     | 22 +++++++--------
 .../net/auth/mysql/dao/ConnectionMapper.xml   | 22 +++++++--------
 .../mysql/dao/ConnectionParameterMapper.xml   | 22 +++++++--------
 .../mysql/dao/ConnectionPermissionMapper.xml  | 16 +++++------
 .../auth/mysql/dao/SystemPermissionMapper.xml | 16 +++++------
 .../net/auth/mysql/dao/UserMapper.xml         | 28 +++++++++----------
 .../auth/mysql/dao/UserPermissionMapper.xml   | 16 +++++------
 8 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-create-default-user.sql b/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-create-default-user.sql
index 15e9fa555..54de10def 100644
--- a/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-create-default-user.sql
+++ b/extensions/guacamole-auth-mysql/schema/guacamole-auth-mysql-create-default-user.sql
@@ -1,7 +1,7 @@
 
 -- Create default user "guacadmin" with password "guacadmin"
 insert into guacamole_user values(1, 'guacadmin',
-    x'AE97B20D5B24B2F18BE7921E3C0CF6109696391D7D5A6BE24BD267E49F0D7E42',  -- 'guacadmin'
+    x'CA458A7D494E3BE824F5E1E175A1556C0F8EEF2C2D7DF3633BEC4A29C4411960',  -- 'guacadmin'
     x'FE24ADC5E11E2B25288D1704ABE67A79E342ECC26064CE69C5B3177795A82264');
 
 -- Grant this user create permissions
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.xml
index 2a956575e..bb8866d64 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionHistoryMapper.xml
@@ -100,7 +100,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection_history
+    from guacamole_connection_history
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -116,7 +116,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection_history
+    from guacamole_connection_history
     where history_id = #{history_id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -125,7 +125,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_history
+    delete from guacamole_connection_history
     where history_id = #{history_id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionHistoryExample" >
@@ -134,7 +134,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_history
+    delete from guacamole_connection_history
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -145,7 +145,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_history (history_id, user_id, connection_id, 
+    insert into guacamole_connection_history (history_id, user_id, connection_id, 
       start_date, end_date)
     values (#{history_id,jdbcType=INTEGER}, #{user_id,jdbcType=INTEGER}, #{connection_id,jdbcType=INTEGER}, 
       #{start_date,jdbcType=TIMESTAMP}, #{end_date,jdbcType=TIMESTAMP})
@@ -156,7 +156,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_history
+    insert into guacamole_connection_history
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="history_id != null" >
         history_id,
@@ -198,7 +198,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_connection_history
+    select count(*) from guacamole_connection_history
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -209,7 +209,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_history
+    update guacamole_connection_history
     <set >
       <if test="record.history_id != null" >
         history_id = #{record.history_id,jdbcType=INTEGER},
@@ -237,7 +237,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_history
+    update guacamole_connection_history
     set history_id = #{record.history_id,jdbcType=INTEGER},
       user_id = #{record.user_id,jdbcType=INTEGER},
       connection_id = #{record.connection_id,jdbcType=INTEGER},
@@ -253,7 +253,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_history
+    update guacamole_connection_history
     <set >
       <if test="user_id != null" >
         user_id = #{user_id,jdbcType=INTEGER},
@@ -276,7 +276,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_history
+    update guacamole_connection_history
     set user_id = #{user_id,jdbcType=INTEGER},
       connection_id = #{connection_id,jdbcType=INTEGER},
       start_date = #{start_date,jdbcType=TIMESTAMP},
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
index 548d05b57..5e07c94c7 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionMapper.xml
@@ -98,7 +98,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection
+    from guacamole_connection
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -114,7 +114,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection
+    from guacamole_connection
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -123,7 +123,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection
+    delete from guacamole_connection
     where connection_id = #{connection_id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.ConnectionExample">
@@ -132,7 +132,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection
+    delete from guacamole_connection
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -143,7 +143,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection (connection_id, connection_name, protocol
+    insert into guacamole_connection (connection_id, connection_name, protocol
       )
     values (#{connection_id,jdbcType=INTEGER}, #{connection_name,jdbcType=VARCHAR}, #{protocol,jdbcType=VARCHAR}
       )
@@ -157,7 +157,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection
+    insert into guacamole_connection
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="connection_id != null">
         connection_id,
@@ -187,7 +187,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_connection
+    select count(*) from guacamole_connection
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -198,7 +198,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection
+    update guacamole_connection
     <set>
       <if test="record.connection_id != null">
         connection_id = #{record.connection_id,jdbcType=INTEGER},
@@ -220,7 +220,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection
+    update guacamole_connection
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
       connection_name = #{record.connection_name,jdbcType=VARCHAR},
       protocol = #{record.protocol,jdbcType=VARCHAR}
@@ -234,7 +234,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection
+    update guacamole_connection
     <set>
       <if test="connection_name != null">
         connection_name = #{connection_name,jdbcType=VARCHAR},
@@ -251,7 +251,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection
+    update guacamole_connection
     set connection_name = #{connection_name,jdbcType=VARCHAR},
       protocol = #{protocol,jdbcType=VARCHAR}
     where connection_id = #{connection_id,jdbcType=INTEGER}
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.xml
index b609b0f4d..ea84a1212 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionParameterMapper.xml
@@ -98,7 +98,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection_parameter
+    from guacamole_connection_parameter
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -114,7 +114,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection_parameter
+    from guacamole_connection_parameter
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
   </select>
@@ -124,7 +124,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_parameter
+    delete from guacamole_connection_parameter
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
   </delete>
@@ -134,7 +134,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_parameter
+    delete from guacamole_connection_parameter
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -145,7 +145,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_parameter (connection_id, parameter_name, parameter_value
+    insert into guacamole_connection_parameter (connection_id, parameter_name, parameter_value
       )
     values (#{connection_id,jdbcType=INTEGER}, #{parameter_name,jdbcType=VARCHAR}, #{parameter_value,jdbcType=VARCHAR}
       )
@@ -156,7 +156,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_parameter
+    insert into guacamole_connection_parameter
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="connection_id != null">
         connection_id,
@@ -186,7 +186,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_connection_parameter
+    select count(*) from guacamole_connection_parameter
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -197,7 +197,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_parameter
+    update guacamole_connection_parameter
     <set>
       <if test="record.connection_id != null">
         connection_id = #{record.connection_id,jdbcType=INTEGER},
@@ -219,7 +219,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_parameter
+    update guacamole_connection_parameter
     set connection_id = #{record.connection_id,jdbcType=INTEGER},
       parameter_name = #{record.parameter_name,jdbcType=VARCHAR},
       parameter_value = #{record.parameter_value,jdbcType=VARCHAR}
@@ -233,7 +233,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_parameter
+    update guacamole_connection_parameter
     <set>
       <if test="parameter_value != null">
         parameter_value = #{parameter_value,jdbcType=VARCHAR},
@@ -248,7 +248,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_parameter
+    update guacamole_connection_parameter
     set parameter_value = #{parameter_value,jdbcType=VARCHAR}
     where connection_id = #{connection_id,jdbcType=INTEGER}
       and parameter_name = #{parameter_name,jdbcType=VARCHAR}
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.xml
index 3e7afd7ff..0d4c2ae28 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/ConnectionPermissionMapper.xml
@@ -98,7 +98,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_connection_permission
+    from guacamole_connection_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -112,7 +112,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_permission
+    delete from guacamole_connection_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and connection_id = #{connection_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
@@ -123,7 +123,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_connection_permission
+    delete from guacamole_connection_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -134,7 +134,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_permission (user_id, connection_id, permission
+    insert into guacamole_connection_permission (user_id, connection_id, permission
       )
     values (#{user_id,jdbcType=INTEGER}, #{connection_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR}
       )
@@ -145,7 +145,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_connection_permission
+    insert into guacamole_connection_permission
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="user_id != null">
         user_id,
@@ -175,7 +175,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_connection_permission
+    select count(*) from guacamole_connection_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -186,7 +186,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_permission
+    update guacamole_connection_permission
     <set>
       <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
@@ -208,7 +208,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_connection_permission
+    update guacamole_connection_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       connection_id = #{record.connection_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml
index 8de2c4992..4818b4527 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/SystemPermissionMapper.xml
@@ -97,7 +97,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_system_permission
+    from guacamole_system_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -111,7 +111,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_system_permission
+    delete from guacamole_system_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
   </delete>
@@ -121,7 +121,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_system_permission
+    delete from guacamole_system_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -132,7 +132,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_system_permission (user_id, permission)
+    insert into guacamole_system_permission (user_id, permission)
     values (#{user_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR})
   </insert>
   <insert id="insertSelective" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.SystemPermissionKey">
@@ -141,7 +141,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_system_permission
+    insert into guacamole_system_permission
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="user_id != null">
         user_id,
@@ -165,7 +165,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_system_permission
+    select count(*) from guacamole_system_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -176,7 +176,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_system_permission
+    update guacamole_system_permission
     <set>
       <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
@@ -195,7 +195,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_system_permission
+    update guacamole_system_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}
     <if test="_parameter != null">
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
index 9c5255aea..74e01b9f5 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserMapper.xml
@@ -116,7 +116,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from guacamole.guacamole_user
+    from guacamole_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -135,7 +135,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_user
+    from guacamole_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -153,7 +153,7 @@
     <include refid="Base_Column_List" />
     ,
     <include refid="Blob_Column_List" />
-    from guacamole.guacamole_user
+    from guacamole_user
     where user_id = #{user_id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
@@ -162,7 +162,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_user
+    delete from guacamole_user
     where user_id = #{user_id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="net.sourceforge.guacamole.net.auth.mysql.model.UserExample">
@@ -171,7 +171,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_user
+    delete from guacamole_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -182,7 +182,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_user (user_id, username, password_hash, 
+    insert into guacamole_user (user_id, username, password_hash, 
       password_salt)
     values (#{user_id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{password_hash,jdbcType=BINARY}, 
       #{password_salt,jdbcType=BINARY})
@@ -196,7 +196,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_user
+    insert into guacamole_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="user_id != null">
         user_id,
@@ -232,7 +232,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_user
+    select count(*) from guacamole_user
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -243,7 +243,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     <set>
       <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
@@ -268,7 +268,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR},
       password_hash = #{record.password_hash,jdbcType=BINARY},
@@ -283,7 +283,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     set user_id = #{record.user_id,jdbcType=INTEGER},
       username = #{record.username,jdbcType=VARCHAR}
     <if test="_parameter != null">
@@ -296,7 +296,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     <set>
       <if test="username != null">
         username = #{username,jdbcType=VARCHAR},
@@ -316,7 +316,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     set username = #{username,jdbcType=VARCHAR},
       password_hash = #{password_hash,jdbcType=BINARY},
       password_salt = #{password_salt,jdbcType=BINARY}
@@ -328,7 +328,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user
+    update guacamole_user
     set username = #{username,jdbcType=VARCHAR}
     where user_id = #{user_id,jdbcType=INTEGER}
   </update>
diff --git a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.xml b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.xml
index e8836b833..bd4b12ec6 100644
--- a/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.xml
+++ b/extensions/guacamole-auth-mysql/src/main/resources/net/sourceforge/guacamole/net/auth/mysql/dao/UserPermissionMapper.xml
@@ -98,7 +98,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from guacamole.guacamole_user_permission
+    from guacamole_user_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -112,7 +112,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_user_permission
+    delete from guacamole_user_permission
     where user_id = #{user_id,jdbcType=INTEGER}
       and affected_user_id = #{affected_user_id,jdbcType=INTEGER}
       and permission = #{permission,jdbcType=CHAR}
@@ -123,7 +123,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    delete from guacamole.guacamole_user_permission
+    delete from guacamole_user_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -134,7 +134,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_user_permission (user_id, affected_user_id, permission
+    insert into guacamole_user_permission (user_id, affected_user_id, permission
       )
     values (#{user_id,jdbcType=INTEGER}, #{affected_user_id,jdbcType=INTEGER}, #{permission,jdbcType=CHAR}
       )
@@ -145,7 +145,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    insert into guacamole.guacamole_user_permission
+    insert into guacamole_user_permission
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="user_id != null">
         user_id,
@@ -175,7 +175,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    select count(*) from guacamole.guacamole_user_permission
+    select count(*) from guacamole_user_permission
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
@@ -186,7 +186,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user_permission
+    update guacamole_user_permission
     <set>
       <if test="record.user_id != null">
         user_id = #{record.user_id,jdbcType=INTEGER},
@@ -208,7 +208,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Feb 19 23:09:22 PST 2013.
     -->
-    update guacamole.guacamole_user_permission
+    update guacamole_user_permission
     set user_id = #{record.user_id,jdbcType=INTEGER},
       affected_user_id = #{record.affected_user_id,jdbcType=INTEGER},
       permission = #{record.permission,jdbcType=CHAR}