Skip to content

Commit 30aad6c

Browse files
author
Vladyslav Danylov
committed
Always put schema on first place to keep consistency.
1 parent d57de03 commit 30aad6c

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

‎DataFresh/Resources/PrepareDataFresh.sql‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ GO
2424

2525
CREATE TABLE [dbo].[df_ChangeTracking]
2626
(
27-
[TABLENAME] sysname,
28-
[TABLESCHEMA] sysname
27+
[TABLESCHEMA] sysname,
28+
[TABLENAME] sysname
2929
)
3030
GO
3131

@@ -35,43 +35,43 @@ CREATE PROCEDURE dbo.[df_ChangedTableDataRefresh]
3535
)
3636
AS
3737

38-
DECLARE @sql NVARCHAR(4000)
39-
DECLARE @TableName VARCHAR(255)
38+
DECLARE @sql NVARCHAR(4000)
4039
DECLARE @TableSchema VARCHAR(255)
40+
DECLARE @TableName VARCHAR(255)
4141

42-
SELECT DISTINCT TableName, TableSchema INTO #ChangedTables FROM df_ChangeTracking
42+
SELECT DISTINCT TableSchema, TableName INTO #ChangedTables FROM df_ChangeTracking
4343

4444
TRUNCATE TABLE df_ChangeTracking
4545

4646
DECLARE Table_Cursor INSENSITIVE SCROLL CURSOR FOR
47-
SELECT [tablename], [tableschema] from #ChangedTables
47+
SELECT [tableschema], [tablename] from #ChangedTables
4848
UNION
49-
SELECT DISTINCT
50-
OBJECT_NAME(fkeyid) AS Referenced_Table_Name,
51-
OBJECT_SCHEMA_NAME(fkeyid) AS Referenced_Table_Schema
49+
SELECT DISTINCT
50+
OBJECT_SCHEMA_NAME(fkeyid) AS Referenced_Table_Schema,
51+
OBJECT_NAME(fkeyid) AS Referenced_Table_Name
5252
FROM
5353
sysreferences sr
5454
INNER JOIN #ChangedTables ct ON sr.rkeyid = OBJECT_ID(ct.tablename)
5555

5656
OPEN Table_Cursor
5757

5858
-- Deactivate Constrains for tables referencing changed tables
59-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
59+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
6060

6161
WHILE (@@Fetch_Status = 0)
6262
BEGIN
6363
SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] NOCHECK CONSTRAINT ALL'
6464
EXEC sp_executesql @sql
6565

66-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
66+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
6767
END
6868

6969
-- Delete All data from Changed Tables and Refill
7070
DECLARE ChangedTable_Cursor CURSOR FOR
71-
SELECT [tablename], [tableschema] FROM #ChangedTables WHERE tablename not in('df_ChangeTracking', 'dr_DeltaVersion')
71+
SELECT [tableschema], [tablename] FROM #ChangedTables WHERE tablename not in('df_ChangeTracking', 'dr_DeltaVersion')
7272

7373
OPEN ChangedTable_Cursor
74-
FETCH NEXT FROM ChangedTable_Cursor INTO @TableName, @TableSchema
74+
FETCH NEXT FROM ChangedTable_Cursor INTO @TableSchema, @TableName
7575
WHILE (@@Fetch_Status = 0)
7676
BEGIN
7777
PRINT @TableName
@@ -96,19 +96,19 @@ AS
9696
)'
9797
EXEC sp_executesql @sql
9898

99-
FETCH NEXT FROM ChangedTable_Cursor INTO @TableName, @TableSchema
99+
FETCH NEXT FROM ChangedTable_Cursor INTO @TableSchema, @TableName
100100
END
101101
CLOSE ChangedTable_Cursor
102102
DEALLOCATE ChangedTable_Cursor
103103

104104
-- ReEnable Constrants for All Tables
105-
FETCH FIRST FROM Table_Cursor INTO @TableName, @TableSchema
105+
FETCH FIRST FROM Table_Cursor INTO @TableSchema, @TableName
106106
WHILE (@@Fetch_Status = 0)
107107
BEGIN
108108
SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] CHECK CONSTRAINT ALL'
109109
EXEC sp_executesql @sql
110110

111-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
111+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
112112
END
113113
CLOSE Table_Cursor
114114
DEALLOCATE Table_Cursor
@@ -121,19 +121,19 @@ AS
121121
IF NOT EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'[dbo].[df_ChangeTracking]') and OBJECTPROPERTY(id, N'IsUserTable') = 1)
122122
CREATE TABLE [df_ChangeTracking]
123123
(
124-
[TABLENAME] sysname,
125-
[TABLESCHEMA] sysname
124+
[TABLESCHEMA] sysname,
125+
[TABLENAME] sysname
126126
)
127127

128128
DECLARE @sql NVARCHAR(4000)
129-
DECLARE @TableName VARCHAR(255)
130129
DECLARE @TableSchema VARCHAR(255)
130+
DECLARE @TableName VARCHAR(255)
131131

132132
DECLARE Table_Cursor CURSOR FOR
133-
SELECT [table_name], [table_schema] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
133+
SELECT [table_schema], [table_name] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
134134

135135
OPEN Table_Cursor
136-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
136+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
137137

138138
WHILE (@@Fetch_Status = 0)
139139
BEGIN
@@ -144,12 +144,12 @@ AS
144144
SET @sql = N'CREATE TRIGGER [' + @TableSchema + '].[trig_df_ChangeTracking_' + @TableName + '] on [' + @TableSchema + '].[' + @TableName + '] for insert, update, delete
145145
as
146146
SET NOCOUNT ON
147-
INSERT INTO df_ChangeTracking (tablename, tableschema) VALUES (''' + @TableName + ''', ''' + @TableSchema + ''')
147+
INSERT INTO df_ChangeTracking (tableschema, tablename) VALUES (''' + @TableSchema + ''', ''' + @TableName + ''')
148148
SET NOCOUNT OFF'
149149

150150
EXEC sp_executesql @sql
151151

152-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
152+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
153153

154154
END
155155
CLOSE Table_Cursor
@@ -194,34 +194,34 @@ CREATE PROCEDURE dbo.[df_TableDataImport]
194194
AS
195195

196196
DECLARE @sql NVARCHAR(4000)
197-
DECLARE @TableName VARCHAR(255)
198197
DECLARE @TableSchema VARCHAR(255)
198+
DECLARE @TableName VARCHAR(255)
199199

200-
SELECT Table_Name as TableName, Table_Schema as TableSchema INTO #UserTables FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
200+
SELECT Table_Schema as TableSchema, Table_Name as TableName INTO #UserTables FROM Information_Schema.tables WHERE table_type = 'BASE TABLE'
201201

202202
DECLARE Table_Cursor INSENSITIVE SCROLL CURSOR FOR
203-
SELECT [tablename], [tableschema] FROM #UserTables
203+
SELECT [tableschema], [tablename] FROM #UserTables
204204

205205
OPEN Table_Cursor
206206

207207
-- Deactivate Constrains for tables referencing changed tables
208-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
208+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
209209

210210
WHILE (@@Fetch_Status = 0)
211211
BEGIN
212212
SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] NOCHECK CONSTRAINT ALL'
213213
EXEC sp_executesql @sql
214214

215-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
215+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
216216
END
217217

218218
-- Delete All data from Changed Tables and Refill
219219
DECLARE UserTable_Cursor CURSOR FOR
220-
SELECT [tablename], [tableschema] FROM #UserTables WHERE tablename not in ('df_ChangeTracking', 'dr_DeltaVersion') and tableschema <> 'dbo'
220+
SELECT [tableschema], [tablename] FROM #UserTables WHERE tablename not in ('df_ChangeTracking', 'dr_DeltaVersion')
221221

222222
OPEN UserTable_Cursor
223223

224-
FETCH NEXT FROM UserTable_Cursor INTO @TableName, @TableSchema
224+
FETCH NEXT FROM UserTable_Cursor INTO @TableSchema, @TableName
225225
WHILE (@@Fetch_Status = 0)
226226
BEGIN
227227
PRINT @TableSchema + '.' + @TableName
@@ -238,20 +238,20 @@ AS
238238
)'
239239
EXEC sp_executesql @sql
240240

241-
FETCH NEXT FROM UserTable_Cursor INTO @TableName, @TableSchema
241+
FETCH NEXT FROM UserTable_Cursor INTO @TableSchema, @TableName
242242

243243
END
244244
CLOSE UserTable_Cursor
245245
DEALLOCATE UserTable_Cursor
246246

247247
-- ReEnable Constrants for All Tables
248-
FETCH FIRST FROM Table_Cursor INTO @TableName, @TableSchema
248+
FETCH FIRST FROM Table_Cursor INTO @TableSchema, @TableName
249249
WHILE (@@Fetch_Status = 0)
250250
BEGIN
251251
SET @sql = N'Alter Table [' + @TableSchema + '].[' + @TableName + '] CHECK CONSTRAINT ALL'
252252
EXEC sp_executesql @sql
253253

254-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
254+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
255255
END
256256

257257
CLOSE Table_Cursor
@@ -262,14 +262,14 @@ GO
262262
CREATE PROCEDURE dbo.[df_ChangeTrackingTriggerRemove]
263263
AS
264264
DECLARE @sql NVARCHAR(4000)
265-
DECLARE @TableName VARCHAR(255)
266265
DECLARE @TableSchema VARCHAR(255)
266+
DECLARE @TableName VARCHAR(255)
267267

268268
DECLARE Table_Cursor CURSOR FOR
269-
SELECT [table_name], [table_schema] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
269+
SELECT [table_schema], [table_name] FROM information_schema.tables WHERE table_type = 'BASE TABLE'
270270

271271
OPEN Table_Cursor
272-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
272+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
273273

274274
WHILE (@@Fetch_Status = 0)
275275
BEGIN
@@ -278,7 +278,7 @@ AS
278278

279279
EXEC sp_executesql @sql
280280

281-
FETCH NEXT FROM Table_Cursor INTO @TableName, @TableSchema
281+
FETCH NEXT FROM Table_Cursor INTO @TableSchema, @TableName
282282

283283
END
284284
CLOSE Table_Cursor

0 commit comments

Comments
 (0)