rails-sqlserver-2000-2005-adapter 2.2.3 → 2.2.4

data/CHANGELOG

@@ -4,6 +4,11 @@ MASTER
 * 
 
 
+* 2.2.4 (December 5th, 2008)
+
+* Fix a type left in #views_real_column_name. Also cache #view_information lookups. [Ken Collins]
+
+
 * 2.2.3 (December 5th, 2008)
 
 * Changing back to using real table name in column_definitions. Makes sure views get back only the columns 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -150,7 +150,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.3'.freeze
+      VERSION                 = '2.2.4'.freeze
       DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS      = [2000,2005].freeze
       LIMITABLE_TYPES         = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -458,7 +458,8 @@ module ActiveRecord
       
       def view_information(table_name)
         table_name = unqualify_table_name(table_name)
-        select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'"
+        @sqlserver_view_information_cache[table_name] ||= 
+          select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'"
       end
       
       def view_table_name(table_name)
@@ -830,7 +831,7 @@ module ActiveRecord
       
       def views_real_column_name(table_name,column_name)
         view_definition = view_information(table_name)['VIEW_DEFINITION']
-        match_data = view_definition.match(/([\w-]*)\s+as\s+pretend_null/im)
+        match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
         match_data ? match_data[1] : column_name
       end
       
@@ -857,6 +858,7 @@ module ActiveRecord
       def initialize_sqlserver_caches(reset_columns=true)
         @sqlserver_columns_cache = {} if reset_columns
         @sqlserver_views_cache = nil
+        @sqlserver_view_information_cache = {}
       end
       
       def column_definitions(table_name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors: 
 - Ken Collins