[Ils-source] r1295 - in branches/1.6: . db db/mssql src webapp
scribe at crosswire.org
scribe at crosswire.org
Tue Jan 13 14:50:52 MST 2015
Author: scribe
Date: 2015-01-13 14:50:51 -0700 (Tue, 13 Jan 2015)
New Revision: 1295
Added:
branches/1.6/db/mssql/upgrade179.2.sql
branches/1.6/db/mssql/upgrade179.3.sql
Modified:
branches/1.6/
branches/1.6/db/
branches/1.6/db/mssql/upgrade179.1.sql
branches/1.6/src/
branches/1.6/webapp/
Log:
merged in split of upgrade script to help with applying, due to create view not having escaped terminator
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-803,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290
+ /trunk:796-803,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290,1294
Property changes on: branches/1.6/db
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/db:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290
+ /trunk/db:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290,1294
Modified: branches/1.6/db/mssql/upgrade179.1.sql
===================================================================
--- branches/1.6/db/mssql/upgrade179.1.sql 2015-01-13 21:48:36 UTC (rev 1294)
+++ branches/1.6/db/mssql/upgrade179.1.sql 2015-01-13 21:50:51 UTC (rev 1295)
@@ -1,7 +1,2 @@
CREATE VIEW USERCOURSEASSIGNMENTS WITH SCHEMABINDING AS SELECT DISTINCT T2.COMPANYID, T2.USERPRID, COALESCE (T9.COURSID, T1.COURSID) AS COURSID FROM dbo.USERGROUP AS T2 INNER JOIN dbo.COURSEGROUP AS T3 ON T3.COMPANYID = T2.COMPANYID AND T3.ILSGROUPID = T2.ILSGROUPID INNER JOIN dbo.COURSE AS T1 ON T1.COMPANYID = T3.COMPANYID AND T1.COURSID = T3.COURSID LEFT OUTER JOIN dbo.CURRICULUMCOURSE AS T5 ON T5.COMPANYID = T1.COMPANYID AND T5.CURRICULUMID = T1.COURSID AND T1.COURSISCURRICULUM = 'T' LEFT OUTER JOIN dbo.COURSE AS T9 ON T5.COMPANYID IS NOT NULL AND T9.COMPANYID = T5.COMPANYID AND T9.COURSID = T5.COURSID WHERE (T9.COURSID IS NULL) AND (T1.COURSISCURRICULUM IS NULL) AND (T9.COURSID IS NULL) AND (T1.COURSISQUICKVIEW IS NULL OR T1.COURSISQUICKVIEW <> 'T') OR (T9.COURSID IS NULL) AND (T1.COURSISCURRICULUM IS NULL) AND (T9.COURSID IS NOT NULL) AND (T9.COURSISQUICKVIEW IS NULL OR T9.COURSISQUICKVIEW <> 'T') OR (T9.COURSID IS NULL) AND (T1.COURSISCURRICULUM <> 'T') AND (T1.COURSISQUICKVIEW IS NULL OR T1.COURSISQUICKVIEW <> 'T') OR (T9.COURSID IS NOT NULL) AND (T1.COURSISCURRICULUM <> 'T') AND (T9.COURSISQUICKVIEW IS NULL OR T9.COURSISQUICKVIEW <> 'T') OR (T9.COURSID IS NULL) AND (T1.COURSISQUICKVIEW IS NULL OR T1.COURSISQUICKVIEW <> 'T') AND (T1.COURSID <> T9.COURSID) OR (T9.COURSID IS NOT NULL) AND (T9.COURSISQUICKVIEW IS NULL OR T9.COURSISQUICKVIEW <> 'T') AND (T1.COURSID <> T9.COURSID);
-CREATE VIEW COURSEATTEMPTSTATUS WITH SCHEMABINDING AS SELECT CA.COMPANYID, CA.USERPRID, CA.COURSID, CA.COURSATTID, CA.CACOMPLETEDATE, CA.CAEXPIREDON, COALESCE(CA.CASTATUSID, 0) AS CASTATUSID, CASE COALESCE(CA.CASTATUSID, 0) WHEN 3 THEN 1 WHEN 0 THEN 1 ELSE 0 END AS CRS_OPEN, CASE COALESCE(CA.CASTATUSID, 0) WHEN 1 THEN 1 ELSE 0 END AS CRS_COMPLETED, CASE COALESCE(CA.CASTATUSID, 0) WHEN 2 THEN 1 ELSE 0 END AS CRS_FAILED FROM DBO.COURSEATTEMPT CA;
-
-CREATE NONCLUSTERED INDEX CAEXPIREDONINDEX ON COURSEATTEMPT (COMPANYID,CAEXPIREDON) INCLUDE (USERPRID,COURSID,CACOMPLETEDATE,CASTATUSID)
-
-
Copied: branches/1.6/db/mssql/upgrade179.2.sql (from rev 1294, trunk/db/mssql/upgrade179.2.sql)
===================================================================
--- branches/1.6/db/mssql/upgrade179.2.sql (rev 0)
+++ branches/1.6/db/mssql/upgrade179.2.sql 2015-01-13 21:50:51 UTC (rev 1295)
@@ -0,0 +1,2 @@
+CREATE VIEW COURSEATTEMPTSTATUS WITH SCHEMABINDING AS SELECT CA.COMPANYID, CA.USERPRID, CA.COURSID, CA.COURSATTID, CA.CACOMPLETEDATE, CA.CAEXPIREDON, COALESCE(CA.CASTATUSID, 0) AS CASTATUSID, CASE COALESCE(CA.CASTATUSID, 0) WHEN 3 THEN 1 WHEN 0 THEN 1 ELSE 0 END AS CRS_OPEN, CASE COALESCE(CA.CASTATUSID, 0) WHEN 1 THEN 1 ELSE 0 END AS CRS_COMPLETED, CASE COALESCE(CA.CASTATUSID, 0) WHEN 2 THEN 1 ELSE 0 END AS CRS_FAILED FROM DBO.COURSEATTEMPT CA;
+
Copied: branches/1.6/db/mssql/upgrade179.3.sql (from rev 1294, trunk/db/mssql/upgrade179.3.sql)
===================================================================
--- branches/1.6/db/mssql/upgrade179.3.sql (rev 0)
+++ branches/1.6/db/mssql/upgrade179.3.sql 2015-01-13 21:50:51 UTC (rev 1295)
@@ -0,0 +1,2 @@
+CREATE NONCLUSTERED INDEX CAEXPIREDONINDEX ON COURSEATTEMPT (COMPANYID,CAEXPIREDON) INCLUDE (USERPRID,COURSID,CACOMPLETEDATE,CASTATUSID)
+
Property changes on: branches/1.6/src
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/src:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290
+ /trunk/src:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290,1294
Property changes on: branches/1.6/webapp
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/webapp:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290
+ /trunk/webapp:796-803,843-850,861,866,896,929-930,932,935,938,942,944,946,948,950,952,964,966,981,985-986,990-991,1025,1028,1151-1154,1167,1172-1174,1187-1188,1190,1192,1198,1200,1202,1206,1209,1211-1212,1249,1251,1276,1281-1282,1287-1290,1294
More information about the Ils-source
mailing list