From 2d8fa5c259ed965e45eb72c240d05103845a50f5 Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Fri, 22 Jun 2012 01:34:33 -0300 Subject: [PATCH] - Add migration script - Rename some tables --- .../wisemapping/model/Collaborator.hbm.xml | 74 +++++++++---------- .../src/main/webapp/jsp/iframeWrapper.jsp | 10 ++- .../src/test/sql/hsql/create-schemas.sql | 6 +- .../src/test/sql/hsql/drop-schemas.sql | 2 +- wise-webapp/src/test/sql/hsql/test-data.sql | 4 +- .../src/test/sql/mysql/create-schemas.sql | 6 +- .../src/test/sql/mysql/drop-schemas.sql | 2 +- wise-webapp/src/test/sql/mysql/test-data.sql | 4 +- .../src/test/sql/mysql/v2.0-to-v3.0.sql | 19 +++++ 9 files changed, 74 insertions(+), 53 deletions(-) create mode 100644 wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml index 74298b56..932df665 100755 --- a/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml +++ b/wise-webapp/src/main/resources/com/wisemapping/model/Collaborator.hbm.xml @@ -1,38 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp index 4656f2e3..a234b578 100644 --- a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp +++ b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp @@ -14,10 +14,12 @@ var iframeWindow = $('dialogContentIframe').contentWindow; var delay = iframeWindow.submitDialogForm(); - if (MooDialog.Request.active && !delay) { - MooDialog.Request.active.close(); - } else { - MooDialog.Request.active.close.delay(3000,MooDialog.Request.active); + if (MooDialog.Request.active) { + if (!delay) { + MooDialog.Request.active.close(); + } else { + MooDialog.Request.active.close.delay(3000, MooDialog.Request.active); + } } }); diff --git a/wise-webapp/src/test/sql/hsql/create-schemas.sql b/wise-webapp/src/test/sql/hsql/create-schemas.sql index 00d75300..e2267742 100644 --- a/wise-webapp/src/test/sql/hsql/create-schemas.sql +++ b/wise-webapp/src/test/sql/hsql/create-schemas.sql @@ -1,4 +1,4 @@ -CREATE TABLE COLABORATOR ( +CREATE TABLE COLLABORATOR ( id INTEGER NOT NULL IDENTITY, email varchar(255) NOT NULL, creation_date date); @@ -13,7 +13,7 @@ password varchar(255) NOT NULL, activationCode BIGINT NOT NULL, activation_date DATE, allowSendEmail CHAR(1) NOT NULL, -FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id) +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ); CREATE TABLE MINDMAP ( @@ -49,7 +49,7 @@ colaborator_id INTEGER NOT NULL, properties_id INTEGER NOT NULL, mindmap_id INTEGER NOT NULL, role_id INTEGER NOT NULL, -FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id), +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id), FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id), FOREIGN KEY(properties_id) REFERENCES COLLABORATION_PROPERTIES(id) ); diff --git a/wise-webapp/src/test/sql/hsql/drop-schemas.sql b/wise-webapp/src/test/sql/hsql/drop-schemas.sql index b417e876..2c3416c1 100644 --- a/wise-webapp/src/test/sql/hsql/drop-schemas.sql +++ b/wise-webapp/src/test/sql/hsql/drop-schemas.sql @@ -4,7 +4,7 @@ DROP TABLE COLLABORATION_PROPERTIES; DROP TABLE MINDMAP_HISTORY; DROP TABLE MINDMAP; DROP TABLE USER; -DROP TABLE COLABORATOR; +DROP TABLE COLLABORATOR; DROP TABLE USER_LOGIN; COMMIT; SHUTDOWN; \ No newline at end of file diff --git a/wise-webapp/src/test/sql/hsql/test-data.sql b/wise-webapp/src/test/sql/hsql/test-data.sql index 670fcf2e..e54506ee 100644 --- a/wise-webapp/src/test/sql/hsql/test-data.sql +++ b/wise-webapp/src/test/sql/hsql/test-data.sql @@ -1,8 +1,8 @@ -INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURDATE()); +INSERT INTO COLLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURDATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) values(1,'wise-test','Test','User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURDATE(),1); -INSERT INTO COLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURDATE()); +INSERT INTO COLLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURDATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) values(2,'wise-admin','Admin','User', 'admin',1237,CURDATE(),1); diff --git a/wise-webapp/src/test/sql/mysql/create-schemas.sql b/wise-webapp/src/test/sql/mysql/create-schemas.sql index c1677ca6..45c3fa57 100644 --- a/wise-webapp/src/test/sql/mysql/create-schemas.sql +++ b/wise-webapp/src/test/sql/mysql/create-schemas.sql @@ -1,4 +1,4 @@ -CREATE TABLE COLABORATOR ( +CREATE TABLE COLLABORATOR ( id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, email varchar(255) CHARACTER SET utf8 NOT NULL UNIQUE, creation_date date @@ -14,7 +14,7 @@ password varchar(255) CHARACTER SET utf8 NOT NULL, activationCode BIGINT(20) NOT NULL, activation_date date, allowSendEmail char(1) CHARACTER SET utf8 NOT NULL default 0, -FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id) +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id) ) CHARACTER SET utf8 ; CREATE TABLE MINDMAP ( @@ -52,7 +52,7 @@ colaborator_id INTEGER NOT NULL, properties_id INTEGER NOT NULL, mindmap_id INTEGER NOT NULL, role_id INTEGER NOT NULL, -FOREIGN KEY(colaborator_id) REFERENCES COLABORATOR(id), +FOREIGN KEY(colaborator_id) REFERENCES COLLABORATOR(id), FOREIGN KEY(mindmap_id) REFERENCES MINDMAP(id) FOREIGN KEY(properties_id) REFERENCES COLLABORATION_PROPERTIES(id), ) CHARACTER SET utf8 ; diff --git a/wise-webapp/src/test/sql/mysql/drop-schemas.sql b/wise-webapp/src/test/sql/mysql/drop-schemas.sql index 4a89f2c0..862cc003 100644 --- a/wise-webapp/src/test/sql/mysql/drop-schemas.sql +++ b/wise-webapp/src/test/sql/mysql/drop-schemas.sql @@ -4,6 +4,6 @@ DROP TABLE COLLABORATION_PROPERTIES; DROP TABLE MINDMAP_HISTORY; DROP TABLE MINDMAP; DROP TABLE USER; -DROP TABLE COLABORATOR; +DROP TABLE COLLABORATOR; DROP TABLE USER_LOGIN; COMMIT; \ No newline at end of file diff --git a/wise-webapp/src/test/sql/mysql/test-data.sql b/wise-webapp/src/test/sql/mysql/test-data.sql index 180fe350..5713a375 100644 --- a/wise-webapp/src/test/sql/mysql/test-data.sql +++ b/wise-webapp/src/test/sql/mysql/test-data.sql @@ -1,8 +1,8 @@ -INSERT INTO COLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURRENT_DATE()); +INSERT INTO COLLABORATOR(id,email,creation_date) values (1,'test@wisemapping.org',CURRENT_DATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) values(1,'wise-test','Test','User', 'ENC:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3',1237,CURRENT_DATE(),1); -INSERT INTO COLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURRENT_DATE()); +INSERT INTO COLLABORATOR(id,email,creation_date) values (2,'admin@wisemapping.org',CURRENT_DATE()); INSERT INTO USER (colaborator_id,username,firstname, lastname, password, activationCode,activation_date,allowSendEmail) values(2,'wise-admin','Admin','User', 'admin',1237,CURRENT_DATE(),1); diff --git a/wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql b/wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql new file mode 100644 index 00000000..b4f4324a --- /dev/null +++ b/wise-webapp/src/test/sql/mysql/v2.0-to-v3.0.sql @@ -0,0 +1,19 @@ +CREATE TABLE COLLABORATION_PROPERTIES( +id INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, +starred BOOL NOT NULL default 0, +mindmap_properties varchar(512) CHARACTER SET utf8 +) CHARACTER SET utf8; + +drop table `wisemapping`.`MINDMAP_NATIVE` +ALTER TABLE `wisemapping`.`mindmap_colaborator` RENAME TO `wisemapping`.`COLLABORATION` ; +ALTER TABLE `wisemapping`.`colaborator` RENAME TO `wisemapping`.`collaborator` ; + +ALTER TABLE `wisemapping`.`mindmap` DROP COLUMN `editor_properties` , DROP COLUMN `mindMapNative_id` ; + +ALTER TABLE `wisemapping`.`mindmap` CHANGE COLUMN `owner_id` `creator_id` INT(11) NOT NULL +, DROP INDEX `owner_id` +, ADD INDEX `owner_id` (`creator_id` ASC) ; + +ALTER TABLE `wisemapping`.`collaboration` ADD COLUMN `properties_id` INT(11) NULL DEFAULT NULL AFTER `role_id` ; + +#INSERT INTO `wisemapping`.`collaborator` (`id`, `email`, `creation_date`) VALUES (8081, 'fake@wisemapping.com', '2007-10-09');