Skip to content

Commit 981087b

Browse files
committed
Use object identifier more often.
1 parent 8243ee5 commit 981087b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ def initialize_native_database_types
189189
def column_definitions(table_name)
190190
identifier = SQLServer::Utils.extract_identifiers(table_name)
191191
database = "#{identifier.database_quoted}." if identifier.database_quoted
192-
table_name = identifier.quoted
193192
sql = %{
194193
SELECT DISTINCT
195194
#{lowercase_schema_reflection_sql('columns.TABLE_NAME')} AS table_name,
@@ -338,13 +337,13 @@ def view_table_name(table_name)
338337
end
339338

340339
def view_information(table_name)
341-
table_name = SQLServer::Utils.extract_identifiers(table_name).object
342-
view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'", 'SCHEMA'
340+
identifier = SQLServer::Utils.extract_identifiers(table_name)
341+
view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{identifier.object}'", 'SCHEMA'
343342
if view_info
344343
view_info = view_info.with_indifferent_access
345344
if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
346345
view_info[:VIEW_DEFINITION] = begin
347-
select_values("EXEC sp_helptext #{quote_table_name(table_name)}", 'SCHEMA').join
346+
select_values("EXEC sp_helptext #{identifier.object_quoted}", 'SCHEMA').join
348347
rescue
349348
warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
350349
nil

test/schema/sqlserver_specific_schema.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
REFERENCES [sst_has_pks] ([id])
8383
ADDFKSQL
8484

85+
8586
# Views
8687

8788
execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'sst_customers_view') DROP VIEW sst_customers_view"

0 commit comments

Comments
 (0)