Merge pull request #26 from topcoder-platform/master

Master

Author: skyhit

.gitignore

@@ -1,4 +1,6 @@
-
+*.iml
+*.ipr
+*.iws
 # /
 /build.properties
 /connfile.sql

common_oltp/02_common_oltp_data_setup.sql

@@ -13527,25 +13527,26 @@ INSERT INTO 'informix'.security_groups(group_id,description,create_user_id) VALU
 INSERT INTO 'informix'.security_groups(group_id,description,create_user_id) VALUES (208, 'Triton', 14882871);
 INSERT INTO 'informix'.security_groups(group_id,description,create_user_id) VALUES (217, 'Liquid Community', 132456);
 INSERT INTO 'informix'.security_groups(group_id,description,create_user_id) VALUES (101, 'VMManager', NULL);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000018, 'Quartz Energy MVA Dev', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000017, 'Kohls Testing Team', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000016, 'Wipro - Future Employees', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000015, 'Cognitive', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000014, 'Hide Challenges', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000013, 'Veterans', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000012, 'QA - Public', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000011, 'TG_CaptialOne_MapMigration', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000010, 'Blockchain', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000009, 'Capital One - EDS', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000008, 'Capital One - Cards', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000007, 'Capital One', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000006, 'SRMX', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000005, 'Wipro - Holmes', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000004, 'Wipro - QAAS', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000003, 'TC - Taskforce', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000002, 'BAE', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000001, 'Topcoder Prod Dev', 8547899, 1);
-INSERT INTO 'informix'.security_groups ('group_id', 'description', 'create_user_id', 'challenge_group_ind') VALUES (20000000, 'Wipro - All', 8547899, 1);
+
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000018, 'Quartz Energy MVA Dev', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000017, 'Kohls Testing Team', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000016, 'Wipro - Future Employees', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000015, 'Cognitive', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000014, 'Hide Challenges', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000013, 'Veterans', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000012, 'QA - Public', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000011, 'TG_CaptialOne_MapMigration', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000010, 'Blockchain', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000009, 'Capital One - EDS', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000008, 'Capital One - Cards', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000007, 'Capital One', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000006, 'SRMX', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000005, 'Wipro - Holmes', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000004, 'Wipro - QAAS', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000003, 'TC - Taskforce', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000002, 'BAE', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000001, 'Topcoder Prod Dev', 8547899, 1);
+INSERT INTO 'informix'.security_groups(group_id,description,create_user_id,challenge_group_ind) VALUES (20000000, 'Wipro - All', 8547899, 1);
 
 
 

tcs_catalog/02_tcs_catalog_data_setup.sql

@@ -1262,7 +1262,7 @@ INSERT INTO 'informix'.project_status_lu(project_status_id,name,description,crea
 INSERT INTO 'informix'.project_status_lu(project_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (8, 'Cancelled - Winner Unresponsive', 'Cancelled - Winner Unresponsive', 'dok', '2007-05-23 15:47:06.000', 'dok', '2007-05-23 15:47:06.000');
 INSERT INTO 'informix'.project_status_lu(project_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (9, 'Cancelled - Client Request', 'Cancelled - Client Request', 156859, '2009-12-10 12:21:12.000', 156859, '2009-12-10 12:21:12.000');
 INSERT INTO 'informix'.project_status_lu(project_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (10, 'Cancelled - Requirements Infeasible', 'Cancelled - Requirements Infeasible', 156859, '2009-12-10 12:21:12.000', 156859, '2009-12-10 12:21:12.000');
-insert into project_status_lu (project_status_id,name,description,create_user,create_date,modify_user,modify_date) values (11, 'Cancelled - Zero Registrations', 'Cancelled - Zero Registrations', 156859, current, 156859, current);
+insert into 'informix'.project_status_lu(project_status_id,name,description,create_user,create_date,modify_user,modify_date) values (11, 'Cancelled - Zero Registrations', 'Cancelled - Zero Registrations', 156859, current, 156859, current);
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (1, 'External Reference ID', 'External Reference ID', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (2, 'Component ID', 'Component ID', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (3, 'Version ID', 'Version ID', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
@@ -1345,11 +1345,11 @@ INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,descriptio
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (81, 'Challenge Originator', 'The originating system for the challenge creation', 'System', CURRENT, 'System', CURRENT);
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (82, 'Private Project Status', 'Private Project Status', 'System', CURRENT, 'System', CURRENT);
 INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (83, 'Product SKU', 'Product SKU', 'System', CURRENT, 'System', CURRENT);
-INSERT INTO "informix".project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (84, 'Environment', 'Environment', 'System', CURRENT, 'System', CURRENT);
-INSERT INTO "informix".project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (85, 'Code Repo', 'Code Repo', 'System', CURRENT, 'System', CURRENT);
-INSERT INTO "informix".project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (86, 'Marathon Match Contest Id', 'Marathon Match Contest Id', 'System', CURRENT, 'System', CURRENT);
-INSERT INTO "informix".project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (87, 'Marathon Match Type', 'Marathon Match Type', 'System', CURRENT, 'System', CURRENT);
-
+INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (84, 'Environment', 'Environment', 'System', CURRENT, 'System', CURRENT);
+INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (85, 'Code Repo', 'Code Repo', 'System', CURRENT, 'System', CURRENT);
+INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (86, 'Marathon Match Contest Id', 'Marathon Match Contest Id', 'System', CURRENT, 'System', CURRENT);
+INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (87, 'Marathon Match Type', 'Marathon Match Type', 'System', CURRENT, 'System', CURRENT);
+INSERT INTO 'informix'.project_info_type_lu(project_info_type_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (88, 'Effort Hours Estimate', 'Effort Hours Estimate', 'System', CURRENT, 'System', CURRENT);
 INSERT INTO 'informix'.phase_status_lu(phase_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (1, 'Scheduled', 'Scheduled', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
 INSERT INTO 'informix'.phase_status_lu(phase_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (2, 'Open', 'Open', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
 INSERT INTO 'informix'.phase_status_lu(phase_status_id,name,description,create_user,create_date,modify_user,modify_date) VALUES (3, 'Closed', 'Closed', 'System', '2006-11-02 20:14:24.000', 'System', '2006-11-02 20:14:24.000');
@@ -3740,6 +3740,9 @@ INSERT INTO 'informix'.file_type_lu(file_type_id, description, sort, image_file,
 VALUES(44, 'HTML', 44, 'f', '-', 'f', 'System', Current, 'System', Current);
 INSERT INTO 'informix'.file_type_lu(file_type_id, description, sort, image_file, extension, bundled_file, create_user, create_date, modify_user, modify_date)
 VALUES(45, 'RP file created with Axure', 45, 'f', '-', 'f', 'System', Current, 'System', Current);
+INSERT INTO 'informix'.file_type_lu(file_type_id, description, sort, image_file, extension, bundled_file, create_user, create_date, modify_user, modify_date)
+VALUES(47, 'Mac OS X Sketch vector graphics', 47, 'f', 'SKETCH', 'f', 'System', Current, 'System', Current);
+
 
 INSERT INTO 'informix'.mime_type_lu(mime_type_id, file_type_id, mime_type_desc) VALUES(1, 1, 'application/msword');
 INSERT INTO 'informix'.mime_type_lu(mime_type_id, file_type_id, mime_type_desc) VALUES(2, 6, 'application/rtf');

time_oltp/01_time_oltp_main_schema.sql

@@ -282,8 +282,9 @@ create table 'informix'.client (
     creation_user VARCHAR(64) not null,
     modification_date DATETIME YEAR TO SECOND not null,
     modification_user VARCHAR(64) not null,
-	cmc_account_id VARCHAR(100),
-	customer_number VARCHAR(100)
+    cmc_account_id VARCHAR(100),
+    customer_number VARCHAR(100),
+    enable_effort_hours SMALLINT
 )
 extent size 16 next size 16
 lock mode row;