Fix mysql

Author: kwan

openid-connect-server-webapp/src/main/resources/db/clients.sql

@@ -1,14 +1,9 @@
---
--- Turn off autocommit and start a transaction so that we can use the temp tables
---
 
-SET AUTOCOMMIT FALSE;
 
-START TRANSACTION;
 
---
--- Insert client information into the temporary tables. To add clients to the HSQL database, edit things here.
--- 
+SET AUTOCOMMIT=0;
+
+START TRANSACTION;
 
 INSERT INTO client_details_TEMP (client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection) VALUES
 ('client', 'secret', 'Test Client', false, null, 3600, 600, true);
@@ -18,7 +13,7 @@ INSERT INTO client_scope_TEMP (owner_id, scope) VALUES
 ('client', 'profile'),
 ('client', 'email'),
 ('client', 'address'),
-('client', 'phone'),
+('client', 'phone2'),
 ('client', 'offline_access');
 
 INSERT INTO client_redirect_uri_TEMP (owner_id, redirect_uri) VALUES
@@ -30,40 +25,24 @@ INSERT INTO client_grant_type_TEMP (owner_id, grant_type) VALUES
 ('client', 'urn:ietf:params:oauth:grant_type:redelegate'),
 ('client', 'implicit'),
 ('client', 'refresh_token');
-
---
--- Merge the temporary clients safely into the database. This is a two-step process to keep clients from being created on every startup with a persistent store.
---
-
-MERGE INTO client_details 
- USING (SELECT client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection FROM client_details_TEMP) AS vals(client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection)
- ON vals.client_id = client_details.client_id
- WHEN NOT MATCHED THEN 
- INSERT (client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection) VALUES(client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection);
-
-MERGE INTO client_scope 
- USING (SELECT id, scope FROM client_scope_TEMP, client_details WHERE client_details.client_id = client_scope_TEMP.owner_id) AS vals(id, scope)
- ON vals.id = client_scope.owner_id AND vals.scope = client_scope.scope
- WHEN NOT MATCHED THEN 
- INSERT (owner_id, scope) values (vals.id, vals.scope);
-
-MERGE INTO client_redirect_uri 
- USING (SELECT id, redirect_uri FROM client_redirect_uri_TEMP, client_details WHERE client_details.client_id = client_redirect_uri_TEMP.owner_id) AS vals(id, redirect_uri)
- ON vals.id = client_redirect_uri.owner_id AND vals.redirect_uri = client_redirect_uri.redirect_uri
- WHEN NOT MATCHED THEN 
- INSERT (owner_id, redirect_uri) values (vals.id, vals.redirect_uri);
-
-MERGE INTO client_grant_type 
- USING (SELECT id, grant_type FROM client_grant_type_TEMP, client_details WHERE client_details.client_id = client_grant_type_TEMP.owner_id) AS vals(id, grant_type)
- ON vals.id = client_grant_type.owner_id AND vals.grant_type = client_grant_type.grant_type
- WHEN NOT MATCHED THEN 
- INSERT (owner_id, grant_type) values (vals.id, vals.grant_type);
- 
--- 
--- Close the transaction and turn autocommit back on
--- 
+
+
+INSERT INTO client_details (client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection) select client_id, client_secret, client_name, dynamically_registered, refresh_token_validity_seconds, access_token_validity_seconds, id_token_validity_seconds, allow_introspection from client_details_TEMP
+ON DUPLICATE KEY UPDATE client_details.client_id=VALUES(client_id);
+
+
+INSERT INTO client_scope (owner_id, scope) SELECT id , scope FROM client_scope_TEMP, client_details WHERE client_details.client_id = client_scope_TEMP.owner_id
+ON DUPLICATE KEY UPDATE client_scope.owner_id = VALUES(owner_id) , client_scope.scope = VALUES(scope);
+
+
+INSERT INTO client_redirect_uri (owner_id, redirect_uri) SELECT id, redirect_uri FROM client_redirect_uri_TEMP, client_details WHERE client_details.client_id = client_redirect_uri_TEMP.owner_id
+ON DUPLICATE KEY UPDATE client_redirect_uri.owner_id =VALUES(owner_id) , client_redirect_uri.redirect_uri = VALUES(redirect_uri);
+
+
+INSERT INTO client_grant_type (owner_id, grant_type) SELECT id, grant_type FROM client_grant_type_TEMP, client_details WHERE client_details.client_id = client_grant_type_TEMP.owner_id
+ON DUPLICATE KEY UPDATE client_grant_type.owner_id=VALUES(owner_id) , client_grant_type.grant_type = VALUES(grant_type);
+
 
 COMMIT;
 
-SET AUTOCOMMIT TRUE;
-
+SET AUTOCOMMIT=1;

openid-connect-server-webapp/src/main/resources/db/scopes.sql

@@ -1,14 +1,10 @@
---
--- Turn off autocommit and start a transaction so that we can use the temp tables
---
 
-SET AUTOCOMMIT FALSE;
+
+SET AUTOCOMMIT=0;
 
 START TRANSACTION;
 
---
--- Insert scope information into the temporary tables.
--- 
+
 
 INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES
  ('openid', 'log in using your identity', 'user', false, true, false, null),
@@ -18,16 +14,9 @@ INSERT INTO system_scope_TEMP (scope, description, icon, restricted, default_sco
  ('phone', 'telephone number', 'bell', false, true, false, null),
  ('offline_access', 'offline access', 'time', false, false, false, null);
 
---
--- Merge the temporary scopes safely into the database. This is a two-step process to keep scopes from being created on every startup with a persistent store.
---
-
-MERGE INTO system_scope
-USING (SELECT scope, description, icon, restricted, default_scope, structured, structured_param_description FROM system_scope_TEMP) AS vals(scope, description, icon, restricted, default_scope, structured, structured_param_description)
-ON vals.scope = system_scope.scope
-WHEN NOT MATCHED THEN
- INSERT (scope, description, icon, restricted, default_scope, structured, structured_param_description) VALUES(vals.scope, vals.description, vals.icon, vals.restricted, vals.default_scope, vals.structured, vals.structured_param_description);
+INSERT INTO system_scope (scope, description, icon, restricted, default_scope, structured, structured_param_description) SELECT scope, description, icon, restricted, default_scope, structured, structured_param_description FROM system_scope_TEMP
+ON DUPLICATE KEY UPDATE system_scope.scope=VALUES(scope);
 
 COMMIT;
 
-SET AUTOCOMMIT TRUE;
+SET AUTOCOMMIT=1;

openid-connect-server-webapp/src/main/resources/db/tables/loading_temp_tables.sql

@@ -14,62 +14,62 @@ CREATE TEMPORARY TABLE IF NOT EXISTS users_TEMP (
  enabled boolean not null);
 
 CREATE TEMPORARY TABLE IF NOT EXISTS user_info_TEMP (
-sub VARCHAR(256) not null primary key,
-preferred_username VARCHAR(256),
-name VARCHAR(256),
-given_name VARCHAR(256),
-family_name VARCHAR(256),
-middle_name VARCHAR(256),
-nickname VARCHAR(256),
-profile VARCHAR(256),
-picture VARCHAR(256),
-website VARCHAR(256),
-email VARCHAR(256),
+sub VARCHAR(255) not null primary key,
+preferred_username VARCHAR(255),
+name VARCHAR(255),
+given_name VARCHAR(255),
+family_name VARCHAR(255),
+middle_name VARCHAR(255),
+nickname VARCHAR(255),
+profile VARCHAR(255),
+picture VARCHAR(255),
+website VARCHAR(255),
+email VARCHAR(255),
 email_verified BOOLEAN,
-gender VARCHAR(256),
-zone_info VARCHAR(256),
-locale VARCHAR(256),
-phone_number VARCHAR(256),
-address_id VARCHAR(256),
-updated_time VARCHAR(256),
-birthdate VARCHAR(256)
+gender VARCHAR(255),
+zone_info VARCHAR(255),
+locale VARCHAR(255),
+phone_number VARCHAR(255),
+address_id VARCHAR(255),
+updated_time VARCHAR(255),
+birthdate VARCHAR(255)
 );
 
 CREATE TEMPORARY TABLE IF NOT EXISTS client_details_TEMP (
-client_description VARCHAR(256),
+client_description VARCHAR(255),
 dynamically_registered BOOLEAN,
 id_token_validity_seconds BIGINT,
 
-client_id VARCHAR(256),
+client_id VARCHAR(255),
 client_secret VARCHAR(2048),
 access_token_validity_seconds BIGINT,
 refresh_token_validity_seconds BIGINT,
 allow_introspection BOOLEAN,
 
-client_name VARCHAR(256)
+client_name VARCHAR(255)
 );
 
 CREATE TEMPORARY TABLE IF NOT EXISTS client_scope_TEMP (
-owner_id VARCHAR(256),
+owner_id VARCHAR(255),
 scope VARCHAR(2048)
 );
 
 CREATE TEMPORARY TABLE IF NOT EXISTS client_redirect_uri_TEMP (
-owner_id VARCHAR(256),
+owner_id VARCHAR(255),
 redirect_uri VARCHAR(2048) 
 );
 
 CREATE TEMPORARY TABLE IF NOT EXISTS client_grant_type_TEMP (
-owner_id VARCHAR(256),
+owner_id VARCHAR(255),
 grant_type VARCHAR(2000)
 );
 
 CREATE TEMPORARY TABLE IF NOT EXISTS system_scope_TEMP (
-scope VARCHAR(256),
+scope VARCHAR(255),
 description VARCHAR(4096),
-icon VARCHAR(256),
+icon VARCHAR(255),
 restricted BOOLEAN,
 default_scope BOOLEAN,
 structured BOOLEAN,
-structured_param_description VARCHAR(256)
+structured_param_description VARCHAR(255)
 );