GUACAMOLE-363: Minor fixes in schema files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/9d38306e Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/9d38306e Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/9d38306e Branch: refs/heads/master Commit: 9d38306e30795bcf41e91b5c7b5a1069f6839d8d Parents: 66c4b86 Author: Nick Couchman <[email protected]> Authored: Sun Aug 27 16:32:35 2017 -0400 Committer: Nick Couchman <[email protected]> Committed: Thu Sep 28 07:00:52 2017 -0400 ---------------------------------------------------------------------- .../guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql | 6 ------ .../schema/002-create-admin-user.sql | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/9d38306e/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql index 92525dd..95382ef 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/001-create-schema.sql @@ -18,12 +18,6 @@ */ /** - * Create the guacamole schema. - */ -CREATE SCHEMA [dbo] -GO - -/** * List for permission data type. */ CREATE RULE [dbo].[guacamole_permission_list] http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/9d38306e/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql index 408d7ca..c6e6d9b 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/002-create-admin-user.sql @@ -33,7 +33,7 @@ FROM ( JOIN [dbo].[guacamole_user] ON permissions.username = [dbo].[guacamole_user].[username] JOIN [dbo].[guacamole_user] affected ON permissions.affected_username = affected.username; -INSERT INTO [dbo].[system_permission] +INSERT INTO [dbo].[guacamole_system_permission] SELECT user_id, permission FROM ( SELECT 'guacadmin' AS username, 'CREATE_CONNECTION' AS permission
