Skip to content

Commit e319916

Browse files
committed
Update #indexes to use unqualified table name. Fixes cases where users may decide to use table name prefixes like 'dbo.'. Move to version 2.2.13
1 parent bd09d0f commit e319916

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

2000-2005-adapter.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = "2000-2005-adapter"
3-
s.version = "2.2.12"
3+
s.version = "2.2.13"
44
s.date = "2009-02-08"
55
s.summary = "SQL Server 2000 & 2005 Adapter For Rails."
66
s.email = "ken@metaskills.net"

CHANGELOG

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ MASTER
44
*
55

66

7+
* 2.2.13 * (February 10th, 2009)
8+
9+
* Update #indexes to use unqualified table name. Fixes cases where users may decide to use table
10+
name prefixes like 'dbo.'. [Ken Collins]
11+
12+
713
* 2.2.12 * (February 8th, 2009)
814

915
* Update table_exists? to work with qualified table names that may include an user prefix. [Ken Collins]

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def simplified_datetime
150150
class SQLServerAdapter < AbstractAdapter
151151

152152
ADAPTER_NAME = 'SQLServer'.freeze
153-
VERSION = '2.2.12'.freeze
153+
VERSION = '2.2.13'.freeze
154154
DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
155155
SUPPORTED_VERSIONS = [2000,2005].freeze
156156
LIMITABLE_TYPES = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -501,7 +501,8 @@ def table_exists?(table_name)
501501
end
502502

503503
def indexes(table_name, name = nil)
504-
select("EXEC sp_helpindex #{quote_table_name(table_name)}",name).inject([]) do |indexes,index|
504+
unquoted_table_name = unqualify_table_name(table_name)
505+
select("EXEC sp_helpindex #{quote_table_name(unquoted_table_name)}",name).inject([]) do |indexes,index|
505506
if index['index_description'] =~ /primary key/
506507
indexes
507508
else

0 commit comments

Comments
 (0)