activerecord-sqlserver-adapter 2.2.18 → 2.2.19

data/CHANGELOG

@@ -1,6 +1,13 @@
 
 MASTER
 
+* 2.2.19 * (June 19th, 2009)
+
+* Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella]
+
+* Changing add_limit! in ActiveRecord::Base for SQLServer so that it passes through any scoped :order 
+  parameters. Resolves ticket #35 [Murray Steele]
+
 
 * 2.2.18 * (June 5th, 2009)
 

data/README.rdoc

@@ -134,13 +134,13 @@ It should be noted that this version of the adapter was developed using both the
 
   $ gem install dbi --version 0.4.1
   $ gem install dbd-odbc --version 0.2.4
-  $ gem install rails-sqlserver-2000-2005-adapter -s http://gems.github.com
+  $ gem install activerecord-sqlserver-adapter
 
 Optionally configure your gem dependencies in your rails environment.rb file.
 
   config.gem 'dbi', :version => '0.4.1'
   config.gem 'dbd-odbc', :version => '0.2.4', :lib => 'dbd/ODBC'
-  config.gem 'rails-sqlserver-2000-2005-adapter', :source => 'http://gems.github.com'
+  config.gem 'activerecord-sqlserver-adapter',    :version => 'x.x.xx'
 
 Here are some external links for libraries and/or tutorials on how to install any other additional components to use this adapter. If you know of a good one that we can include here, just let us know.
 
@@ -150,10 +150,9 @@ Here are some external links for libraries and/or tutorials on how to install an
 
 == Contributing
 
-If you’d like to contribute a feature or bugfix, thanks! To make sure your fix/feature has a high chance of being added, please read the following guidelines. First, ask on the Google list, IRC, or post a ticket in Lighthouse. Second, make sure there are tests! We will not accept any patch that is not tested. Please read the RUNNING_UNIT_TESTS file for the details of how to run the unit tests.
+If you’d like to contribute a feature or bugfix, thanks! To make sure your fix/feature has a high chance of being added, please read the following guidelines. First, ask on the Google list, IRC, or post a ticket on github issues. Second, make sure there are tests! We will not accept any patch that is not tested. Please read the RUNNING_UNIT_TESTS file for the details of how to run the unit tests.
 
 * Github: http://github.com/rails-sqlserver
-* Lighthouse: http://rails-sqlserver.lighthouseapp.com/projects/20277-sql-server-05-adapter/tickets
 * Google Group: http://groups.google.com/group/rails-sqlserver-adapter
 * IRC Room: #rails-sqlserver on irc.freenode.net
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'rake/testtask'
 require 'echoe'
 
-Echoe.new('activerecord-sqlserver-adapter','2.2.18') do |p|
+Echoe.new('activerecord-sqlserver-adapter','2.2.19') do |p|
   p.summary               = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   p.description           = "SQL Server 2000, 2005 and 2008 Adapter For Rails."
   p.author                = ["Ken Collins","Murray Steele","Shawn Balestracci","Joe Rafaniello","Tom Ward"]

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -183,7 +183,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.18'.freeze
+      VERSION                 = '2.2.19'.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
@@ -309,7 +309,7 @@ module ActiveRecord
       end
       
       def quote_column_name(column_name)
-        column_name.to_s.split('.').map{ |name| "[#{name}]" }.join('.')
+        column_name.to_s.split('.').map{ |name| name =~ /^\[.*\]$/ ? name : "[#{name}]" }.join('.')
       end
       
       def quote_table_name(table_name)

data/lib/core_ext/active_record.rb

@@ -9,6 +9,7 @@ module ActiveRecord
         class << klass
           alias_method_chain :reset_column_information, :sqlserver_cache_support
           alias_method_chain :add_order!, :sqlserver_unique_checking
+          alias_method_chain :add_limit!, :sqlserver_order_checking
         end
       end
       
@@ -45,6 +46,23 @@ module ActiveRecord
         
         private
         
+        def add_limit_with_sqlserver_order_checking!(sql, options, scope = :auto)
+          if connection.respond_to?(:sqlserver?)
+            scope = scope(:find) if :auto == scope
+            if scope
+              options = options.dup
+              scoped_order = scope[:order]
+              order = options[:order]
+              if order && scoped_order
+                options[:order] = add_order_with_sqlserver_unique_checking!('', order, scope).gsub(/^ ORDER BY /,'')
+              elsif scoped_order
+                options[:order] = scoped_order
+              end
+            end
+          end
+          add_limit_without_sqlserver_order_checking!(sql, options, scope)
+        end
+        
         def add_order_with_sqlserver_unique_checking!(sql, order, scope = :auto)
           if connection.respond_to?(:sqlserver?)
             order_sql = ''

data/test/cases/adapter_test_sqlserver.rb

@@ -159,6 +159,28 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
       end
 
     end
+
+    context "for add_limit! within a scoped method call" do
+      setup do
+        @connection.stubs(:select_value).with(regexp_matches(/TotalRows/)).returns '100000000'
+      end
+
+      should 'not add any ordering if the scope doesn\'t have an order' do
+        assert_equal 'SELECT * FROM (SELECT TOP 10 * FROM (SELECT TOP 40 * FROM [developers]) AS tmp1) AS tmp2', add_limit!('SELECT * FROM [developers]', {:offset => 30, :limit => 10}, {})
+      end
+
+      should 'still add the default ordering if the scope doesn\'t have an order but the raw order option is there' do
+        assert_equal 'SELECT * FROM (SELECT TOP 10 * FROM (SELECT TOP 40 * FROM [developers]) AS tmp1 ORDER BY [name] DESC) AS tmp2 ORDER BY [name]', add_limit!('SELECT * FROM [developers]', {:offset => 30, :limit => 10, :order => 'name'}, {})
+      end
+
+      should 'add scoped order options to the offset and limit sql' do
+        assert_equal 'SELECT * FROM (SELECT TOP 10 * FROM (SELECT TOP 40 * FROM [developers]) AS tmp1 ORDER BY [id] DESC) AS tmp2 ORDER BY [id]', add_limit!('SELECT * FROM [developers]', {:offset => 30, :limit => 10}, {:order => 'id'})
+      end
+
+      should 'combine scoped order with raw order options in the offset and limit sql' do
+        assert_equal 'SELECT * FROM (SELECT TOP 10 * FROM (SELECT TOP 40 * FROM [developers]) AS tmp1 ORDER BY [name] DESC, [id] DESC) AS tmp2 ORDER BY [name], [id]', add_limit!('SELECT * FROM [developers]', {:offset => 30, :limit => 10, :order => 'name'}, {:order => 'id'})
+      end
+    end
     
     context 'dealing with various orders SQL snippets' do
       
@@ -350,6 +372,11 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
       assert_equal '[foo].[bar]', @connection.quote_column_name('foo.bar')
     end
     
+    should 'not quote already quoted column names with brackets' do
+      assert_equal '[foo]', @connection.quote_column_name('[foo]')
+      assert_equal '[foo].[bar]', @connection.quote_column_name('[foo].[bar]')
+    end
+    
     should 'quote table names like columns' do
       assert_equal '[foo].[bar]', @connection.quote_column_name('foo.bar')
       assert_equal '[foo].[bar].[baz]', @connection.quote_column_name('foo.bar.baz')
@@ -659,6 +686,11 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
     sql
   end
   
+  def add_limit!(sql, options, scope = :auto)
+    ActiveRecord::Base.send :add_limit!, sql, options, scope
+    sql
+  end
+
   def order_to_min_set(order)
     @connection.send :order_to_min_set, order
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.18
+  version: 2.2.19
 platform: ruby
 authors: 
 - Ken Collins, Murray Steele, Shawn Balestracci, Joe Rafaniello, Tom Ward
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -04:00
+date: 2009-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,8 +85,6 @@ files:
 - test/schema/sqlserver_specific_schema.rb
 has_rdoc: true
 homepage: http://github.com/rails-sqlserver
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -112,9 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: arsqlserver
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: SQL Server 2000, 2005 and 2008 Adapter For Rails.
 test_files: []