Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 50d9133

Browse files
committed
Consistant usage of QuoteName instead oc concatenating in brackets
1 parent 18cb6f6 commit 50d9133

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

‎ExtractDB/Schema.sql

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ BEGIN
144144
FROM #ColumnData
145145
Order by column_id
146146

147-
SET @SQL = @SQL + @FirstColumn + ' [' + @ColumnName + '] '
147+
SET @SQL = @SQL + @FirstColumn + ' ' + QUOTENAME( @ColumnName) + ' '
148148

149149
if @ColIsComputed = 0
150150
BEGIN
@@ -201,7 +201,11 @@ BEGIN
201201
END
202202

203203
SET @SQL = @SQL +
204+
<<<<<<< Updated upstream
204205
ISNULL((SELECT CHAR(9) + ', CONSTRAINT [' + k.name + '] PRIMARY KEY (' +
206+
=======
207+
ISNULL((SELECT CHAR(9) + ', CONSTRAINT ' + QUOTENAME( k.name) + ' PRIMARY KEY (' +
208+
>>>>>>> Stashed changes
205209
(SELECT STUFF((
206210
SELECT ', [' + c.name + '] ' + CASE WHEN ic.is_descending_key = 1 THEN 'DESC' ELSE 'ASC' END
207211
FROM sys.index_columns ic WITH (NOWAIT)
@@ -215,7 +219,7 @@ BEGIN
215219
WHERE k.parent_object_id = @TableObjectId
216220
AND k.[type] = 'PK'), '') + ')' + CHAR(13)
217221

218-
SET @SQL = 'CREATE TABLE ' + @SchemaName + '.' + @TableName + ' (' + @SQL ;
222+
SET @SQL = 'CREATE TABLE ' + QUOTENAME( @SchemaName) + '.' + QUOTENAME( @TableName) + ' (' + @SQL ;
219223

220224
IF @DropAndRecreate = 1
221225
INSERT INTO @Scripts
@@ -228,7 +232,11 @@ BEGIN
228232

229233
'Alter',
230234
@TableName,
235+
<<<<<<< Updated upstream
231236
'DROP TABLE ' + @SchemaName + '.' + @TableName
237+
=======
238+
'DROP TABLE ' + QuoteName( @SchemaName ) + '.' + QUOTENAME( @TableName )
239+
>>>>>>> Stashed changes
232240
)
233241

234242
INSERT INTO @Scripts
@@ -282,7 +290,7 @@ BEGIN
282290
ELSE ''
283291
END AS [IndexType]
284292
,STUFF((
285-
SELECT ', [' + sc.NAME +']' AS "text()"
293+
SELECT ', ' + quotename( sc.NAME ) AS "text()"
286294
FROM syscolumns AS sc
287295
INNER JOIN sys.index_columns AS ic ON ic.object_id = sc.id
288296
AND ic.column_id = sc.colid
@@ -330,7 +338,7 @@ BEGIN
330338
@IndexIncludedColumns = IncludedColumns
331339
FROM @Indices
332340

333-
SET @SQL = 'CREATE ' + @IndexType + ' INDEX ' + @IndexName + ' ON ' + @SchemaName + '.' + @TableName + ' ( ' + @IndexedColumns + ') '
341+
SET @SQL = 'CREATE ' + @IndexType + ' INDEX ' + QUOTENAME(@IndexName) + ' ON ' + QUOTENAME(@SchemaName) + '.' + QUOTENAME(@TableName) + ' ( ' + @IndexedColumns + ') '
334342

335343
if not @IndexIncludedColumns is null
336344
BEGIN
@@ -371,7 +379,7 @@ END
371379
'ALTER TABLE '
372380
+ QUOTENAME(cs.name) + '.' + QUOTENAME(ct.name)
373381
+ ' ADD CONSTRAINT ' + QUOTENAME(fk.name)
374-
+ ' FOREIGN KEY (' + STUFF((SELECT ',' + QUOTENAME(c.name)
382+
+ ' FOREIGN KEY (' + STUFF((SELECT ',' + QUOTENAME(c.name)+' '
375383
-- get all the columns in the constraint table
376384
FROM sys.columns AS c
377385
INNER JOIN sys.foreign_key_columns AS fkc

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /