From 7c8ed94601cb052ffae730c9851681e99d25b7fe Mon Sep 17 00:00:00 2001 From: Joshua Bradley Date: Fri, 7 Jun 2013 16:51:51 -0500 Subject: [PATCH] Update SQL scripts to use Files view instead of table DNN 7.1 removed the Folder column from the Files table, but the view still has it --- .../DataProviders/SqlDataProvider/03.00.13.SqlDataProvider | 4 ++-- .../DataProviders/SqlDataProvider/03.00.19.SqlDataProvider | 6 +++--- .../DataProviders/SqlDataProvider/03.00.24.SqlDataProvider | 6 +++--- .../DataProviders/SqlDataProvider/04.00.05.SqlDataProvider | 6 +++--- .../DataProviders/SqlDataProvider/04.03.09.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/04.05.01.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/05.01.04.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/05.01.06.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/05.01.08.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/05.03.03.SqlDataProvider | 2 +- .../DataProviders/SqlDataProvider/05.03.07.SqlDataProvider | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Providers/DataProviders/SqlDataProvider/03.00.13.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/03.00.13.SqlDataProvider index 0ef7670b..d4851aea 100644 --- a/Providers/DataProviders/SqlDataProvider/03.00.13.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/03.00.13.SqlDataProvider @@ -207,7 +207,7 @@ select from {databaseOwner}[{objectQualifier}engageams_vItems] i join {databaseOwner}[{objectQualifier}EngageAMSDocumentVersion] dv on (i.ItemVersionID = dv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) GO @@ -257,7 +257,7 @@ from {databaseOwner}[{objectQualifier}engageams_vitems] i join {databaseOwner}[{objectQualifier}EngageAMSMediaVersion] mv on (i.ItemVersionID = mv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) GO diff --git a/Providers/DataProviders/SqlDataProvider/03.00.19.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/03.00.19.SqlDataProvider index 545b948c..90ef7556 100644 --- a/Providers/DataProviders/SqlDataProvider/03.00.19.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/03.00.19.SqlDataProvider @@ -58,7 +58,7 @@ FROM {databaseOwner}[{objectQualifier}EngageAMSItem] i join {databaseOwner}[{objectQualifier}EngageAMSItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) @@ -196,7 +196,7 @@ from {databaseOwner}[{objectQualifier}engageams_vItems] i join {databaseOwner}[{objectQualifier}EngageAMSDocumentVersion] dv on (i.ItemVersionID = dv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) @@ -225,7 +225,7 @@ from {databaseOwner}[{objectQualifier}engageams_vitems] i join {databaseOwner}[{objectQualifier}EngageAMSMediaVersion] mv on (i.ItemVersionID = mv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) diff --git a/Providers/DataProviders/SqlDataProvider/03.00.24.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/03.00.24.SqlDataProvider index 71e9d5fe..0bdf365b 100644 --- a/Providers/DataProviders/SqlDataProvider/03.00.24.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/03.00.24.SqlDataProvider @@ -31,7 +31,7 @@ FROM {databaseOwner}[{objectQualifier}EngageAMSItem] i join {databaseOwner}[{objectQualifier}EngageAMSItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO SET ANSI_NULLS OFF @@ -194,7 +194,7 @@ from {databaseOwner}[{objectQualifier}engageams_vItems] i join {databaseOwner}[{objectQualifier}EngageAMSDocumentVersion] dv on (i.ItemVersionID = dv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) @@ -223,7 +223,7 @@ from {databaseOwner}[{objectQualifier}engageams_vitems] i join {databaseOwner}[{objectQualifier}EngageAMSMediaVersion] mv on (i.ItemVersionID = mv.ItemVersionID) join {databaseOwner}[{objectQualifier}EngageAMSItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) diff --git a/Providers/DataProviders/SqlDataProvider/04.00.05.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/04.00.05.SqlDataProvider index d126868b..5a4b4724 100644 --- a/Providers/DataProviders/SqlDataProvider/04.00.05.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/04.00.05.SqlDataProvider @@ -313,7 +313,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO @@ -395,7 +395,7 @@ from {databaseOwner}[{objectQualifier}Publish_vwItems] i join {databaseOwner}[{objectQualifier}Publish_DocumentVersion] dv on (i.ItemVersionID = dv.ItemVersionID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on dv.FileName = 'fileid=' + convert(varchar, fl.FileID) GO @@ -442,7 +442,7 @@ from {databaseOwner}[{objectQualifier}Publish_vwItems] i join {databaseOwner}[{objectQualifier}Publish_MediaVersion] mv on (i.ItemVersionID = mv.ItemVersionID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemVersionID = iv.ItemVersionID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on mv.FileName = 'fileid=' + convert(varchar, fl.FileID) GO diff --git a/Providers/DataProviders/SqlDataProvider/04.03.09.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/04.03.09.SqlDataProvider index 4431e2f6..62dfaaea 100644 --- a/Providers/DataProviders/SqlDataProvider/04.03.09.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/04.03.09.SqlDataProvider @@ -655,7 +655,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO diff --git a/Providers/DataProviders/SqlDataProvider/04.05.01.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/04.05.01.SqlDataProvider index ec010b17..67137940 100644 --- a/Providers/DataProviders/SqlDataProvider/04.05.01.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/04.05.01.SqlDataProvider @@ -71,7 +71,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1) diff --git a/Providers/DataProviders/SqlDataProvider/05.01.04.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/05.01.04.SqlDataProvider index c612433d..44584322 100644 --- a/Providers/DataProviders/SqlDataProvider/05.01.04.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/05.01.04.SqlDataProvider @@ -122,7 +122,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1) diff --git a/Providers/DataProviders/SqlDataProvider/05.01.06.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/05.01.06.SqlDataProvider index 328acf41..55203d99 100644 --- a/Providers/DataProviders/SqlDataProvider/05.01.06.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/05.01.06.SqlDataProvider @@ -124,7 +124,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1) diff --git a/Providers/DataProviders/SqlDataProvider/05.01.08.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/05.01.08.SqlDataProvider index dd07a6e5..2a0c6288 100644 --- a/Providers/DataProviders/SqlDataProvider/05.01.08.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/05.01.08.SqlDataProvider @@ -144,7 +144,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1) diff --git a/Providers/DataProviders/SqlDataProvider/05.03.03.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/05.03.03.SqlDataProvider index 7d340e0a..29723b49 100644 --- a/Providers/DataProviders/SqlDataProvider/05.03.03.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/05.03.03.SqlDataProvider @@ -32,7 +32,7 @@ FROM {databaseOwner}[{objectQualifier}Publish_Item] i join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1) diff --git a/Providers/DataProviders/SqlDataProvider/05.03.07.SqlDataProvider b/Providers/DataProviders/SqlDataProvider/05.03.07.SqlDataProvider index 640ca3d1..1e81d2b0 100644 --- a/Providers/DataProviders/SqlDataProvider/05.03.07.SqlDataProvider +++ b/Providers/DataProviders/SqlDataProvider/05.03.07.SqlDataProvider @@ -20,7 +20,7 @@ FROM join {databaseOwner}[{objectQualifier}Publish_ItemType] it on (i.ItemTypeID = it.ItemTypeID) join {databaseOwner}[{objectQualifier}Publish_ItemVersion] iv on (i.ItemID = iv.ItemID) left outer join {databaseOwner}[{objectQualifier}Publish_ItemVersionSettings] ivs on (iv.ItemVersionId = ivs.ItemVersionId and ivs.controlname ='lblAuthorName' and ivs.PropertyName ='Text') - left outer join {databaseOwner}[{objectQualifier}Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) + left outer join {databaseOwner}[{objectQualifier}vw_Files] fl on iv.Thumbnail = 'fileid=' + convert(varchar, fl.FileID) GO if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Publish_vwParentItems]') and OBJECTPROPERTY(id, N'IsView') = 1)