Skip to content

Commit 2c6c794

Browse files
committed
Remove unwanted input databases in creation of catalog views.
1 parent 7cf1bf7 commit 2c6c794

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

sql/sqlserver/catalog/CreateCatalogTableViews.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ AS BEGIN
6464
USE [?];
6565
SELECT
6666
''create view '' + QUOTENAME( REPLACE(''?'', ''SkyNode_'', '''') + ''_'' + name) +
67-
'' AS SELECT * FROM '' + QUOTENAME(''?'') + ''.dbo.'' + QUOTENAME(name) + '' '' AS cmd
67+
'' AS SELECT * FROM '' + QUOTENAME(''?'') + ''.'' + schema_name + ''.'' + QUOTENAME(name) + '' '' AS cmd
6868
FROM (
69-
SELECT name
70-
FROM sys.tables
69+
SELECT name, SCHEMA_NAME(schema_id) as schema_name
70+
FROM sys.tables
7171
UNION ALL
72-
SELECT name
72+
SELECT name, SCHEMA_NAME(schema_id) as schema_name
7373
FROM sys.views
7474
) AS q
75-
WHERE ''?'' like ''skynode_%''
75+
WHERE ''?'' like ''skynode_%'' AND ''?'' != ''SkyNode_g'' AND ''?'' NOT LIKE ''%_STAT'' AND ''?'' NOT LIKE ''SkyNode_Test%''
7676
ORDER BY cmd
7777
'
7878
INSERT INTO #AllTables
@@ -81,14 +81,14 @@ AS BEGIN
8181
-----------------------------------------------------------------------------------------------------
8282
-- Create now the views one-by-one with a cursor
8383

84-
DECLARE cur2 Cursor For SELECT * FROM #AllTables
84+
DECLARE cur2 Cursor For SELECT * FROM #AllTables ORDER BY cmd
8585
OPEN cur2
8686
FETCH NEXT FROM cur2 INTO @sql
8787
WHILE @@FETCH_status = 0
8888
BEGIN
8989
BEGIN TRY
90-
PRINT(@sql)
91-
EXECUTE @sql
90+
--PRINT(@sql)
91+
EXECUTE(@sql)
9292
END TRY
9393
BEGIN CATCH
9494
PRINT 'Error: ' + @sql
@@ -105,6 +105,6 @@ GO
105105
--------------------------------------------------------------------------------------------------------------------------------------------
106106
-- Create all views to all skynode tables (and views)
107107

108-
--EXECUTE spDropAllViews
108+
EXECUTE spDropAllViews
109109

110-
EXECUTE spCreateSkynodeViews
110+
EXECUTE spCreateSkynodeViews

0 commit comments

Comments
 (0)