Skip to content

Commit a9e506b

Browse files
committed
Merge branch 'master' of git://github.com/metaskills/rails-sqlserver-adapter into metaskills/master
2 parents f747086 + bc2d9b5 commit a9e506b

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,6 @@ def columns(table_name, name = nil)
441441
WHEN columns.DATA_TYPE IN ('text', 'image') AND COL_LENGTH(columns.TABLE_NAME, columns.COLUMN_NAME) = 16 THEN 2147483647
442442
ELSE COL_LENGTH(columns.TABLE_NAME, columns.COLUMN_NAME)
443443
END as length,
444-
CASE
445-
WHEN constraint_column_usage.constraint_name IS NULL THEN NULL
446-
ELSE 1
447-
END is_primary_key,
448444
CASE
449445
WHEN columns.IS_NULLABLE = 'YES' THEN 1
450446
ELSE NULL
@@ -454,14 +450,6 @@ def columns(table_name, name = nil)
454450
ELSE 1
455451
END is_identity
456452
FROM #{db_name}INFORMATION_SCHEMA.COLUMNS columns
457-
LEFT OUTER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS primary_key_constraints ON (
458-
primary_key_constraints.table_name = columns.table_name
459-
AND primary_key_constraints.constraint_type = 'PRIMARY KEY'
460-
)
461-
LEFT OUTER JOIN INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE constraint_column_usage ON (
462-
constraint_column_usage.table_name = primary_key_constraints.table_name
463-
AND constraint_column_usage.column_name = columns.column_name
464-
)
465453
WHERE columns.TABLE_NAME = '#{table_name}'
466454
ORDER BY columns.ordinal_position
467455
}.gsub(/[ \t\r\n]+/,' ')

0 commit comments

Comments
 (0)