Skip to content

Commit 65c6681

Browse files
committed
Fix a type left in #views_real_column_name. Also cache #view_information lookups.
1 parent 6fca872 commit 65c6681

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.3"
3+
s.version = "2.2.4"
44
s.date = "2008-11-25"
55
s.summary = "SQL Server 2000 & 2005 Adapter For Rails."
66
s.email = "ken@metaskills.net"

CHANGELOG

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

66

7+
* 2.2.4 (December 5th, 2008)
8+
9+
* Fix a type left in #views_real_column_name. Also cache #view_information lookups. [Ken Collins]
10+
11+
712
* 2.2.3 (December 5th, 2008)
813

914
* Changing back to using real table name in column_definitions. Makes sure views get back only the columns

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 4 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.3'.freeze
153+
VERSION = '2.2.4'.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
@@ -458,7 +458,8 @@ def views(name = nil)
458458

459459
def view_information(table_name)
460460
table_name = unqualify_table_name(table_name)
461-
select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'"
461+
@sqlserver_view_information_cache[table_name] ||=
462+
select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'"
462463
end
463464

464465
def view_table_name(table_name)
@@ -857,6 +858,7 @@ def remove_sqlserver_columns_cache_for(table_name)
857858
def initialize_sqlserver_caches(reset_columns=true)
858859
@sqlserver_columns_cache = {} if reset_columns
859860
@sqlserver_views_cache = nil
861+
@sqlserver_view_information_cache = {}
860862
end
861863

862864
def column_definitions(table_name)

0 commit comments

Comments
 (0)