Put migration for view into separate file to properly work with MS SQL …

…#2
OHDSI · Oct 23, 2018 · 535e0d0 · 535e0d0
1 parent 91a1050
commit 535e0d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 50 deletions.
diff --git a/...ain/resources/db/migration/oracle/V2.6.0.20181010185036__schema-user-import-scheduler.sql b/...ain/resources/db/migration/oracle/V2.6.0.20181010185036__schema-user-import-scheduler.sql
@@ -45,28 +45,4 @@ INSERT INTO ${ohdsiSchema}.sec_role_permission(role_id, permission_id)
     'user:import:job:*:get',
     'user:import:job:*:delete',
     'user:import:job:*:history:get')
-  AND sr.name IN ('admin');
-
-CREATE OR REPLACE VIEW ${ohdsiSchema}.user_import_job_history
-  AS
-    SELECT
-      job.job_execution_id as id,
-      job.start_time as start_time,
-      job.end_time as end_time,
-      job.status as status,
-      job.exit_code as exit_code,
-      job.exit_message as exit_message,
-      name_param.STRING_VAL as job_name,
-      provider_param.STRING_VAL as provider_type,
-      author_param.STRING_VAL as author
-    FROM
-      ${ohdsiSchema}.BATCH_JOB_EXECUTION job
-      JOIN ${ohdsiSchema}.BATCH_JOB_INSTANCE instance ON instance.JOB_INSTANCE_ID = job.JOB_INSTANCE_ID
-      JOIN ${ohdsiSchema}.batch_job_execution_params name_param
-        ON job.job_execution_id = name_param.job_execution_id AND name_param.KEY_NAME = 'jobName'
-      JOIN ${ohdsiSchema}.BATCH_JOB_EXECUTION_PARAMS provider_param
-        ON job.JOB_EXECUTION_ID = provider_param.JOB_EXECUTION_ID AND provider_param.KEY_NAME = 'provider'
-      JOIN ohdsi.BATCH_JOB_EXECUTION_PARAMS author_param
-        ON job.JOB_EXECUTION_ID = author_param.JOB_EXECUTION_ID AND author_param.KEY_NAME = 'jobAuthor'
-    WHERE
-      instance.JOB_NAME = 'usersImport';
+  AND sr.name IN ('admin');
diff --git a/.../resources/db/migration/sqlserver/V2.6.0.20181010185036__schema-user-import-scheduler.sql b/.../resources/db/migration/sqlserver/V2.6.0.20181010185036__schema-user-import-scheduler.sql
@@ -41,28 +41,4 @@ INSERT INTO ${ohdsiSchema}.sec_role_permission(role_id, permission_id)
     'user:import:job:*:get',
     'user:import:job:*:delete',
     'user:import:job:*:history:get')
-  AND sr.name IN ('admin');
-
-CREATE VIEW ${ohdsiSchema}.user_import_job_history
-  AS
-    SELECT
-      job.job_execution_id as id,
-      job.start_time as start_time,
-      job.end_time as end_time,
-      job.status as status,
-      job.exit_code as exit_code,
-      job.exit_message as exit_message,
-      name_param.STRING_VAL as job_name,
-      provider_param.STRING_VAL as provider_type,
-      author_param.STRING_VAL as author
-    FROM
-      ${ohdsiSchema}.BATCH_JOB_EXECUTION job
-      JOIN ${ohdsiSchema}.BATCH_JOB_INSTANCE instance ON instance.JOB_INSTANCE_ID = job.JOB_INSTANCE_ID
-      JOIN ${ohdsiSchema}.batch_job_execution_params name_param
-        ON job.job_execution_id = name_param.job_execution_id AND name_param.KEY_NAME = 'jobName'
-      JOIN ${ohdsiSchema}.BATCH_JOB_EXECUTION_PARAMS provider_param
-        ON job.JOB_EXECUTION_ID = provider_param.JOB_EXECUTION_ID AND provider_param.KEY_NAME = 'provider'
-      JOIN ${ohdsiSchema}.BATCH_JOB_EXECUTION_PARAMS author_param
-        ON job.JOB_EXECUTION_ID = author_param.JOB_EXECUTION_ID AND author_param.KEY_NAME = 'jobAuthor'
-    WHERE
-      instance.JOB_NAME = 'usersImport'
+  AND sr.name IN ('admin');