rails-sqlserver-2000-2005-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

@@ -1,5 +1,5 @@
 
-== Rails SQL Server 2000 & 2005 & 2008 Adapter
+== Rails SQL Server 2000, 2005 and 2008 Adapter
 
 The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are currently passing all tests and hope to continue to do so moving forward. 
 
@@ -24,13 +24,13 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 
 ==== SQL Server 2008 Support
 
-Because this adapter is primarily coded to SQL Server 2000/2005, it does not take advantage of many of the things in 2008 that would speed up the code. At some point in the future there we be a branch of this code that is specifically targeted for 2008. That adapter version will remove much of the dirty innards of this version that are meant to code around many of their short comings in 2000/2005, the biggest being no limit/offset.
+Because this adapter is primarily coded to SQL Server 2000/2005, it does not take advantage of many of the things in 2008 that would speed up the code. At some point in the future there will be a branch of this code that is specifically targeted for 2008. That adapter version will remove much of the dirty innards of this version that are meant to code around many previous SQL Server 2000/2005 short comings, the biggest being no limit/offset.
 
 
 
 ==== Date/Time Data Type Hinting
 
-Both SQL Server 2000 and 2005 do not have native data types for just 'date' or 'time', it only has 'datetime'. To pass the ActiveRecord tests we implemented two simple class methods that can teach your models to coerce column information to be cast correctly. Simply past a list of symbols to either the <tt>coerce_sqlserver_date</tt> or <tt>coerce_sqlserver_time</tt> methods that correspond to 'datetime' columns that need to be cast correctly.
+Both SQL Server 2000 and 2005 do not include native data types for just 'date' or 'time', it only has 'datetime'. To pass the ActiveRecord tests we implemented two simple class methods that can teach your models to coerce column information to be cast correctly. Simply past a list of symbols to either the <tt>coerce_sqlserver_date</tt> or <tt>coerce_sqlserver_time</tt> methods that correspond to 'datetime' columns that need to be cast correctly.
 
   class Topic < ActiveRecord::Base
     coerce_sqlserver_date :last_read
@@ -130,17 +130,17 @@ It is our goal to match the adapter version with each version of rails. However
 
 First, you will need Ruby DBI and Ruby ODBC. If you are using the adapter under 1.9, then you need at least ruby-odbc version 0.9996. To my knowledge the ADO DBD for DBI is no longer supported. The installation below is not a comprehensive walk thru on how to get all the required moving parts like FreeTDS installed and/or configured. It will also assume gem installations of both the dependent libraries and the adapter itself.
 
-It should be noted that this version of the adapter was developed using both the ancient 0.0.23 version of DBI up to the current stable release of 0.4.1. Note that DBI 0.4.1 is the minimal for ruby 1.9 compatibility. Because later versions of DBI will be changing many things, IT IS HIGHLY RECOMMENDED that you max your install to version 0.4.0 which the examples below show. For the time being we are not supporting DBI versions higher than 0.4.0. The good news is that if you were using a very old DBI with ADO, technically this adapter will still work for you, but be warned your path is getting old and may not be supported for long.
+It should be noted that this version of the adapter was developed using both the ancient 0.0.23 version of DBI up to the current stable release of 0.4.1. Note that DBI 0.4.1 is the minimal for ruby 1.9 compatibility. Because later versions of DBI will be changing many things, IT IS HIGHLY RECOMMENDED that you max your install to version 0.4.1 which the examples below show. For the time being we are not supporting DBI versions higher than 0.4.1. The good news is that if you were using a very old DBI with ADO, technically this adapter will still work for you, but be warned your path is getting old and may not be supported for long.
 
   $ 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.0'
+  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.
 
@@ -152,6 +152,7 @@ Here are some external links for libraries and/or tutorials on how to install an
 
 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.
 
+* 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

@@ -1,52 +1,18 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-
-
-desc 'Create the SQL Server test databases'
-task :create_databases do
-  # Define a user named 'rails' in SQL Server with all privileges granted
-  # Use an empty password for user 'rails', or alternatively use the OSQLPASSWORD environment variable
-  # which allows you to set a default password for the current session.
-  %x( osql -S localhost -U rails -Q "create database activerecord_unittest" -P )
-  %x( osql -S localhost -U rails -Q "create database activerecord_unittest2" -P )
-  %x( osql -S localhost -U rails -d activerecord_unittest -Q "exec sp_grantdbaccess 'rails'" -P )
-  %x( osql -S localhost -U rails -d activerecord_unittest2 -Q "exec sp_grantdbaccess 'rails'" -P ) 
-  %x( osql -S localhost -U rails -d activerecord_unittest -Q "grant BACKUP DATABASE, BACKUP LOG, CREATE DEFAULT, CREATE FUNCTION, CREATE PROCEDURE, CREATE RULE, CREATE TABLE, CREATE VIEW to 'rails';" -P )
-  %x( osql -S localhost -U rails -d activerecord_unittest2 -Q "grant BACKUP DATABASE, BACKUP LOG, CREATE DEFAULT, CREATE FUNCTION, CREATE PROCEDURE, CREATE RULE, CREATE TABLE, CREATE VIEW to 'rails';" -P )
-end
-
-desc 'Drop the SQL Server test databases'
-task :drop_databases do
-  %x( osql -S localhost -U rails -Q "drop database activerecord_unittest" -P )
-  %x( osql -S localhost -U rails -Q "drop database activerecord_unittest2" -P )
-end
-
-desc 'Recreate the SQL Server test databases'
-task :recreate_databases => [:drop_databases, :create_databases]
-
-
-for adapter in %w( sqlserver sqlserver_odbc )
-  
-  Rake::TestTask.new("test_#{adapter}") { |t|
-    t.libs << "test" 
-    t.libs << "test/connections/native_#{adapter}"
-    t.libs << "../../../rails/activerecord/test/"
-    t.test_files = (
-      Dir.glob("test/cases/**/*_test_sqlserver.rb").sort + 
-      Dir.glob("../../../rails/activerecord/test/**/*_test.rb").sort )
-    t.verbose = true
-  }
-
-  namespace adapter do
-    task :test => "test_#{adapter}"
-  end
-  
+require 'echoe'
+
+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"]
+  p.email                 = "ken@metaskills.net"
+  p.url                   = "http://github.com/rails-sqlserver"
+  p.runtime_dependencies  = ["dbi =0.4.1","dbd-odbc =0.2.4"]
+  p.include_gemspec       = false
+  p.ignore_pattern        = ["autotest/*","*.gemspec","lib/rails-sqlserver-2000-2005-adapter.rb"]
+  p.project               = 'arsqlserver'
 end
 
-desc 'Test with unicode types enabled.'
-Rake::TestTask.new(:test_unicode_types) do |t|
-  ENV['ENABLE_DEFAULT_UNICODE_TYPES'] = 'true'
-  test = Rake::Task['test_sqlserver_odbc']
-  test.invoke
-end
+Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load(ext) }

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: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.18
+  version: 2.2.19
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,11 +13,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: SQL Server 2000 & 2005 Adapter For Rails.
+description: SQL Server 2000, 2005 and 2008 Adapter For Rails.
 email: ken@metaskills.net
 executables: []
 
@@ -40,7 +40,7 @@ files:
 - lib/core_ext/active_record.rb
 - lib/core_ext/dbi.rb
 has_rdoc: true
-homepage: http://github.com/rails-sqlserver/2000-2005-adapter/
+homepage: http://github.com/rails-sqlserver
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -67,7 +67,7 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: SQL Server 2000 & 2005 & 2008 Adapter For Rails.
+summary: SQL Server 2000, 2005 and 2008 Adapter For Rails.
 test_files: 
 - test/cases/aaaa_create_tables_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb