From bb6e8bc1c74e5aab7978fe8c2ca70c84a929f924 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 27 Sep 2018 20:15:23 -0700 Subject: [PATCH] GUACAMOLE-220: Correct documentation of update script. The UNIQUE constraint is being added once the column is expected to be unique, not necessarily because it should safely point to entries of a particular table. --- .../schema/upgrade/upgrade-pre-1.0.0.sql | 2 +- .../schema/upgrade/upgrade-pre-1.0.0.sql | 2 +- .../schema/upgrade/upgrade-pre-1.0.0.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-1.0.0.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-1.0.0.sql index 8332d7ff7..0fccb6110 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-1.0.0.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/schema/upgrade/upgrade-pre-1.0.0.sql @@ -145,7 +145,7 @@ UPDATE guacamole_user SET entity_id = ( -- The entity_id column should now be safely non-NULL ALTER TABLE guacamole_user MODIFY entity_id int(11) NOT NULL; --- The entity_id column should now safely point to guacamole_entity entries +-- The entity_id column should now be unique for each user ALTER TABLE guacamole_user ADD CONSTRAINT guacamole_user_single_entity UNIQUE (entity_id); diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-1.0.0.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-1.0.0.sql index dd341dccd..83dfa8632 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-1.0.0.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/schema/upgrade/upgrade-pre-1.0.0.sql @@ -155,7 +155,7 @@ UPDATE guacamole_user SET entity_id = ( ALTER TABLE guacamole_user ALTER COLUMN entity_id SET NOT NULL; --- The entity_id column should now safely point to guacamole_entity entries +-- The entity_id column should now be unique for each user ALTER TABLE guacamole_user ADD CONSTRAINT guacamole_user_single_entity UNIQUE (entity_id); diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/upgrade/upgrade-pre-1.0.0.sql b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/upgrade/upgrade-pre-1.0.0.sql index 6e9133a59..7b4fc88e3 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/upgrade/upgrade-pre-1.0.0.sql +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/schema/upgrade/upgrade-pre-1.0.0.sql @@ -202,7 +202,7 @@ GO ALTER TABLE [guacamole_user] ALTER COLUMN [entity_id] [int] NOT NULL; --- The entity_id column should now safely point to guacamole_entity entries +-- The entity_id column should now be unique for each user ALTER TABLE [guacamole_user] ADD CONSTRAINT [AK_guacamole_user_single_entity] UNIQUE ([entity_id]);