diff --git a/PROMS/SQL/PROMS2010.SQL b/PROMS/SQL/PROMS2010.SQL index 4fb0a5a8..d41b90a5 100644 --- a/PROMS/SQL/PROMS2010.SQL +++ b/PROMS/SQL/PROMS2010.SQL @@ -9435,8 +9435,8 @@ ELSE PRINT 'TableFunction Creation: vefn_SplitROSearch Error on Creation' GO /****** Object: StoredProcedure [vesp_CleanUpItems] ******/ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_CleanUpItems]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1) - DROP FUNCTION [vesp_CleanUpItems]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_CleanUpItems]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_CleanUpItems]; GO /* @@ -9478,8 +9478,8 @@ BEGIN CATCH -- Catch Block END CATCH GO -- Display the status of Proc creation -IF (@@Error = 0) PRINT 'ScalarFunction Creation: vesp_CleanUpItems Succeeded' -ELSE PRINT 'ScalarFunction Creation: vesp_CleanUpItems Error on Creation' +IF (@@Error = 0) PRINT 'Procedure Creation: vesp_CleanUpItems Succeeded' +ELSE PRINT 'Procedure Creation: vesp_CleanUpItems Error on Creation' GO /****** Object: StoredProcedure [vesp_ListChildren] ******/ @@ -9526,8 +9526,8 @@ ELSE PRINT 'Procedure Creation: vesp_ListChildren Error on Creation' GO /****** Object: StoredProcedure [vesp_ListContentPath] ******/ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListContentPath]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1) - DROP FUNCTION [vesp_ListContentPath]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListContentPath]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_ListContentPath]; GO -- vesp_ListContentPath 148 @@ -9562,8 +9562,8 @@ order by ZZ.BaseID,ZZ.Level Desc, Item Desc end GO -- Display the status of Proc creation -IF (@@Error = 0) PRINT 'ScalarFunction Creation: vesp_ListContentPath Succeeded' -ELSE PRINT 'ScalarFunction Creation: vesp_ListContentPath Error on Creation' +IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ListContentPath Succeeded' +ELSE PRINT 'Procedure Creation: vesp_ListContentPath Error on Creation' GO /****** Object: StoredProcedure [vesp_ListContentsByItemID] ******/ @@ -9757,8 +9757,8 @@ ELSE PRINT 'Procedure Creation: vesp_ListItemsAndContent Error on Creation' GO /****** Object: StoredProcedure [vesp_ListTables] ******/ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1) - DROP FUNCTION [vesp_ListTables]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_ListTables]; GO create procedure [dbo].[vesp_ListTables] as @@ -9786,13 +9786,13 @@ order by o.name,c.colid end GO -- Display the status of Proc creation -IF (@@Error = 0) PRINT 'ScalarFunction Creation: vesp_ListTables Succeeded' -ELSE PRINT 'ScalarFunction Creation: vesp_ListTables Error on Creation' +IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ListTables Succeeded' +ELSE PRINT 'Procedure Creation: vesp_ListTables Error on Creation' GO /****** Object: StoredProcedure [vesp_ListTables2] ******/ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables2]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1) - DROP FUNCTION [vesp_ListTables2]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables2]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_ListTables2]; GO create procedure [dbo].[vesp_ListTables2] as @@ -9832,13 +9832,13 @@ order by o.name,c.colid end GO -- Display the status of Proc creation -IF (@@Error = 0) PRINT 'ScalarFunction Creation: vesp_ListTables2 Succeeded' -ELSE PRINT 'ScalarFunction Creation: vesp_ListTables2 Error on Creation' +IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ListTables2 Succeeded' +ELSE PRINT 'Procedure Creation: vesp_ListTables2 Error on Creation' GO /****** Object: StoredProcedure [vesp_ListTables3] ******/ -IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables3]') AND OBJECTPROPERTY(id,N'IsScalarFunction') = 1) - DROP FUNCTION [vesp_ListTables3]; +IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[vesp_ListTables3]') AND OBJECTPROPERTY(id,N'IsProcedure') = 1) + DROP PROCEDURE [vesp_ListTables3]; GO CREATE procedure [dbo].[vesp_ListTables3] as @@ -9882,8 +9882,8 @@ order by o.name,c.column_id end GO -- Display the status of Proc creation -IF (@@Error = 0) PRINT 'ScalarFunction Creation: vesp_ListTables3 Succeeded' -ELSE PRINT 'ScalarFunction Creation: vesp_ListTables3 Error on Creation' +IF (@@Error = 0) PRINT 'Procedure Creation: vesp_ListTables3 Succeeded' +ELSE PRINT 'Procedure Creation: vesp_ListTables3 Error on Creation' GO /****** Object: StoredProcedure [vesp_ResetFolderManualOrder] ******/