rails-sqlserver-2000-2005-adapter 2.2.17 → 2.2.18

data/CHANGELOG

@@ -2,6 +2,13 @@
 MASTER
 
 
+* 2.2.18 * (June 5th, 2009)
+
+* Column reflection on table name rescues LoadError and a few others. Resolves tickets #25 & #33 [Ken Collins]
+
+* Added 2008 support. Resolves ticket #32 [Ken Collins]
+
+
 * 2.2.17 * (May 14th, 2009)
 
 * Add simplified type recognition for varchar(max) and nvarchar(max) under SQL Server 2005 to be a 

data/README.rdoc

@@ -1,11 +1,12 @@
 
-== Rails SQL Server 2000 & 2005 Adapter
+== Rails SQL Server 2000 & 2005 & 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. 
 
 
 == What's New
 
+* Now supports SQL Server 2008 too!
 * Fully tested under 1.9!!! Correctly encodes/decodes UTF-8 types in ruby 1.9 too.
 * Now supports both rails 2.2 & 2.3!!!
 * An ActiveRecord::Base.execute_procedure method that can be used by classes.
@@ -20,6 +21,13 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 * A block method to run queries within a specific isolation level.
 * Automatically reconnects to lost database connections.
 
+
+==== 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.
+
+
+
 ==== 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.

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -97,7 +97,11 @@ module ActiveRecord
       end
       
       def table_klass
-        @table_klass ||= table_name.classify.constantize rescue nil
+        @table_klass ||= begin
+          table_name.classify.constantize
+        rescue StandardError, NameError, LoadError
+          nil
+        end
         (@table_klass && @table_klass < ActiveRecord::Base) ? @table_klass : nil
       end
       
@@ -179,9 +183,9 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.17'.freeze
+      VERSION                 = '2.2.18'.freeze
       DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+(\d{4})/
-      SUPPORTED_VERSIONS      = [2000,2005].freeze
+      SUPPORTED_VERSIONS      = [2000,2005,2008].freeze
       LIMITABLE_TYPES         = ['string','integer','float','char','nchar','varchar','nvarchar'].freeze
       
       LOST_CONNECTION_EXCEPTIONS = [DBI::DatabaseError, DBI::InterfaceError]
@@ -250,6 +254,10 @@ module ActiveRecord
         database_year == 2005
       end
       
+      def sqlserver_2008?
+        database_year == 2008
+      end
+      
       def version
         self.class::VERSION
       end
@@ -268,7 +276,7 @@ module ActiveRecord
       
       def native_text_database_type
         @@native_text_database_type || 
-        if sqlserver_2005?
+        if sqlserver_2005? || sqlserver_2008?
           enable_default_unicode_types ? 'nvarchar(max)' : 'varchar(max)'
         else
           enable_default_unicode_types ? 'ntext' : 'text'
@@ -276,7 +284,7 @@ module ActiveRecord
       end
       
       def native_binary_database_type
-        @@native_binary_database_type || (sqlserver_2005? ? 'varbinary(max)' : 'image')
+        @@native_binary_database_type || ((sqlserver_2005? || sqlserver_2008?) ? 'varbinary(max)' : 'image')
       end
       
       # QUOTING ==================================================#

data/test/cases/adapter_test_sqlserver.rb

@@ -59,6 +59,7 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
         @supported_version = ActiveRecord::ConnectionAdapters::SQLServerAdapter::SUPPORTED_VERSIONS
         @sqlserver_2000_string = "Microsoft SQL Server  2000 - 8.00.2039 (Intel X86)"
         @sqlserver_2005_string = "Microsoft SQL Server 2005 - 9.00.3215.00 (Intel X86)"
+        @sqlserver_2008_string = "Microsoft SQL Server 2008 (RTM) - 10.0.1600.22 (Intel X86)"
       end
       
       should 'return a string from #database_version that matches class regexp' do
@@ -80,6 +81,11 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
         assert @connection.sqlserver_2005?
       end
       
+      should 'return true to #sqlserver_2008?' do
+        @connection.stubs(:database_version).returns(@sqlserver_2008_string)
+        assert @connection.sqlserver_2008?
+      end
+      
     end
     
     context 'for #unqualify_table_name and #unqualify_db_name' do

data/test/cases/column_test_sqlserver.rb

@@ -66,7 +66,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
     should 'have correct simplified types' do
       assert_equal :string, @char.type
       assert_equal :string, @char10.type
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal :text, @varcharmax.type, @varcharmax.inspect
         assert_equal :text, @varcharmax10.type, @varcharmax10.inspect
       end
@@ -75,7 +75,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
     should 'have correct #sql_type per schema definition' do
       assert_equal 'char(1)',     @char.sql_type,       'Specifing a char type with no limit is 1 by SQL Server standards.'
       assert_equal 'char(10)',    @char10.sql_type,      @char10.inspect
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal 'varchar(max)', @varcharmax.sql_type,   'A -1 limit should be converted to max (max) type.'
         assert_equal 'varchar(max)', @varcharmax10.sql_type, 'A -1 limit should be converted to max (max) type.'
       end
@@ -84,7 +84,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
     should 'have correct #limit per schema definition' do
       assert_equal 1,   @char.limit
       assert_equal 10,  @char10.limit
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal nil, @varcharmax.limit,   'Limits on max types are moot and we should let rails know that.'
         assert_equal nil, @varcharmax10.limit, 'Limits on max types are moot and we should let rails know that.'
       end
@@ -119,7 +119,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal :text,   @ntext10.type
       assert_equal :string, @nchar10.type
       assert_equal :string, @nvarchar100.type
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal :text, @nvarcharmax.type, @nvarcharmax.inspect
         assert_equal :text, @nvarcharmax10.type, @nvarcharmax10.inspect
       end
@@ -132,7 +132,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal 'ntext',         @ntext10.sql_type,     'Even a next with a limit of 10 specified will mean nothing.'
       assert_equal 'nchar(10)',     @nchar10.sql_type,     'An nchar with a limit of 10 needs to have it show up here.'
       assert_equal 'nvarchar(100)', @nvarchar100.sql_type, 'An nvarchar with a specified limit of 100 needs to show it.'
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal 'nvarchar(max)', @nvarcharmax.sql_type,   'A -1 limit should be converted to max (max) type.'
         assert_equal 'nvarchar(max)', @nvarcharmax10.sql_type, 'A -1 limit should be converted to max (max) type.'
       end
@@ -144,7 +144,7 @@ class ColumnTestSqlserver < ActiveRecord::TestCase
       assert_equal nil, @ntext.limit,       'An ntext column limit is moot, it is a fixed variable length'
       assert_equal 10,  @nchar10.limit
       assert_equal 100, @nvarchar100.limit
-      if sqlserver_2005?
+      if sqlserver_2005? || sqlserver_2008?
         assert_equal nil, @nvarcharmax.limit,   'Limits on max types are moot and we should let rails know that.'
         assert_equal nil, @nvarcharmax10.limit, 'Limits on max types are moot and we should let rails know that.'
       end

data/test/cases/execute_procedure_test_sqlserver.rb

@@ -23,7 +23,7 @@ class ExecuteProcedureTestSqlserver < ActiveRecord::TestCase
   should 'quote bind vars correctly' do
     assert_sql(/EXEC sp_tables '%sql_server%', NULL, NULL, NULL, 1/) do
       @klass.execute_procedure :sp_tables, '%sql_server%', nil, nil, nil, true
-    end if sqlserver_2005?
+    end if sqlserver_2005? || sqlserver_2008?
     assert_sql(/EXEC sp_tables '%sql_server%', NULL, NULL, NULL/) do
       @klass.execute_procedure :sp_tables, '%sql_server%', nil, nil, nil
     end if sqlserver_2000?

data/test/cases/schema_dumper_test_sqlserver.rb

@@ -41,7 +41,7 @@ class SchemaDumperTestSqlserver < ActiveRecord::TestCase
       table_dump('sql_server_strings') do |output|
         assert_match %r{t.text.*varchar_max}, output
       end
-    end
+    end if sqlserver_2005? || sqlserver_2008?
 
   end
   

data/test/cases/sqlserver_helper.rb

@@ -96,6 +96,7 @@ module ActiveRecord
     class << self
       def sqlserver_2000? ; ActiveRecord::Base.connection.sqlserver_2000? ; end
       def sqlserver_2005? ; ActiveRecord::Base.connection.sqlserver_2005? ; end
+      def sqlserver_2008? ; ActiveRecord::Base.connection.sqlserver_2008? ; end
       def active_record_2_point_2? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 2 ; end
       def active_record_2_point_3? ; ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3 ; end
       def ruby_19? ; RUBY_VERSION >= '1.9' ; end
@@ -112,6 +113,7 @@ module ActiveRecord
     end
     def sqlserver_2000? ; self.class.sqlserver_2000? ; end
     def sqlserver_2005? ; self.class.sqlserver_2005? ; end
+    def sqlserver_2008? ; self.class.sqlserver_2008? ; end
     def active_record_2_point_2? ; self.class.active_record_2_point_2? ; end
     def active_record_2_point_3? ; self.class.active_record_2_point_3? ; end
     def ruby_19? ; self.class.ruby_19? ; end

data/test/cases/unicode_test_sqlserver.rb

@@ -14,7 +14,7 @@ class UnicodeTestSqlserver < ActiveRecord::TestCase
       test_string = 'Ken Collins'
       assert nvarcharmax_data = SqlServerUnicode.create!(:nvarchar_max => test_string)
       assert_equal test_string, SqlServerUnicode.find(nvarcharmax_data.id).nvarchar_max
-    end if sqlserver_2005?
+    end if sqlserver_2005? || sqlserver_2008?
 
     should 'enforce default nchar_10 limit of 10' do
       assert_raise(ActiveRecord::StatementInvalid) { SqlServerUnicode.create!(:nchar => '01234567891') }

data/test/schema/sqlserver_specific_schema.rb

@@ -2,7 +2,6 @@ ActiveRecord::Schema.define do
   
   create_table :table_with_real_columns, :force => true do |t|
     t.column :real_number, :real
-    # t.column :varchar_max, :varchar_max if ActiveRecord::Base.connection.sqlserver_2005?
   end
   
   create_table :defaults, :force => true do |t|
@@ -44,7 +43,7 @@ ActiveRecord::Schema.define do
     t.column :ntext_10,       :ntext,     :limit => 10
     t.column :nchar_10,       :nchar,     :limit => 10
     t.column :nvarchar_100,   :nvarchar,  :limit => 100
-    if ActiveRecord::Base.connection.sqlserver_2005?
+    if ActiveRecord::Base.connection.sqlserver_2005? || ActiveRecord::Base.connection.sqlserver_2008?
       t.column :nvarchar_max,     :nvarchar_max 
       t.column :nvarchar_max_10,  :nvarchar_max, :limit => 10
     end
@@ -53,7 +52,7 @@ ActiveRecord::Schema.define do
   create_table :sql_server_strings, :force => true do |t|
     t.column :char,     :char
     t.column :char_10,  :char,  :limit => 10
-    if ActiveRecord::Base.connection.sqlserver_2005?
+    if ActiveRecord::Base.connection.sqlserver_2005? || ActiveRecord::Base.connection.sqlserver_2008?
       t.column :varchar_max,     :varchar_max 
       t.column :varchar_max_10,  :varchar_max, :limit => 10
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.17
+  version: 2.2.18
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -67,7 +67,7 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: SQL Server 2000 & 2005 Adapter For Rails.
+summary: SQL Server 2000 & 2005 & 2008 Adapter For Rails.
 test_files: 
 - test/cases/aaaa_create_tables_test_sqlserver.rb
 - test/cases/adapter_test_sqlserver.rb