activerecord-sqlserver-adapter 2.3.3 → 2.3.4

data/CHANGELOG

@@ -1,6 +1,19 @@
 
 MASTER
 
+
+* 2.3.4
+
+* For tables that named with schema(ex. rails.users), they could not get length of column.
+  column of varchar(40) gets length => nil. Ticket #27 & #15 [Ken Tachiya]
+
+* Altered limited_update_conditions regex conditions, the .* would greedily fail 
+  if the where_sql had WHERE in a table or field, etc. [Ransom Briggs]
+
+* Changing test to allow ENV['ARUNIT_DB_NAME'] as the database name for the test units. 
+  Matches up with AR conventions. [Ransom Briggs]
+
+
 2.3.3
   
 * Revert #ad83df82 and again cache column information at the connection's instance. The 

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -159,7 +159,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '2.3.3'.freeze
+      VERSION                     = '2.3.4'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2000,2005,2008].freeze
       LIMITABLE_TYPES             = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
@@ -522,7 +522,7 @@ module ActiveRecord
       end
       
       def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
-        match_data = where_sql.match(/(.*)WHERE/)
+        match_data = where_sql.match(/^(.*?[\]\) ])WHERE[\[\( ]/)
         limit = match_data[1]
         where_sql.sub!(limit,'')
         "WHERE #{quoted_primary_key} IN (SELECT #{limit} #{quoted_primary_key} FROM #{quoted_table_name} #{where_sql})"
@@ -1042,7 +1042,7 @@ module ActiveRecord
           columns.NUMERIC_PRECISION as numeric_precision,
           CASE
             WHEN columns.DATA_TYPE IN ('nchar','nvarchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
-            ELSE COL_LENGTH(columns.TABLE_NAME, columns.COLUMN_NAME) 
+            ELSE COL_LENGTH(columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME, columns.COLUMN_NAME)
           END as length,
           CASE
             WHEN columns.IS_NULLABLE = 'YES' THEN 1

data/test/cases/adapter_test_sqlserver.rb

@@ -128,6 +128,15 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
       assert !@connection.send(:insert_sql?,'UPDATE...')
       assert !@connection.send(:insert_sql?,'SELECT...')
     end
+    
+    context 'for #limited_update_conditions' do
+    
+      should 'only match up to the first WHERE' do
+        where_sql = "TOP 1 WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id"
+        assert_equal "WHERE bar IN (SELECT TOP 1  bar FROM foo WHERE ([posts].author_id = 1 and [posts].columnWHEREname = 2)  ORDER BY posts.id)", @connection.limited_update_conditions(where_sql, 'foo', 'bar')
+      end
+    
+    end
         
     context 'for #sql_for_association_limiting?' do
       

data/test/cases/execute_procedure_test_sqlserver.rb

@@ -16,7 +16,7 @@ class ExecuteProcedureTestSqlserver < ActiveRecord::TestCase
     tables = @klass.execute_procedure :sp_tables, 'sql_server_chronics'
     table_info = tables.first
     assert_equal 1, tables.size
-    assert_equal 'activerecord_unittest', table_info[:TABLE_QUALIFIER], "Table Info: #{table_info.inspect}"
+    assert_equal (ENV['ARUNIT_DB_NAME'] || 'activerecord_unittest'), table_info[:TABLE_QUALIFIER], "Table Info: #{table_info.inspect}"
     assert_equal 'TABLE', table_info[:TABLE_TYPE], "Table Info: #{table_info.inspect}"
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 -05:00
+date: 2010-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: []