rails-sqlserver-2000-2005-adapter 2.2.1 → 2.2.2

data/CHANGELOG

@@ -1,10 +1,17 @@
 
-*MASTER* ()
+MASTER
 
 * 
 
 
-*2.2.1* (November 25th, 2008)
+2.2.2 (December 2nd, 2008)
+
+* Add support for view defaults by making column_definitions use real table name for schema info.
+
+* Include version in connection method and inspection. [Ken Collins]
+
+
+2.2.1 (November 25th, 2008)
 
 * Add identity insert support for views. Cache #views so that identity #table_name_or_views_table_name 
   will run quickly. [Ken Collins]
@@ -13,7 +20,7 @@
   #table_exists? will not fall back to checking views too. [Ken Collins]
 
 
-*2.2.0* (November 21st, 2008)
+2.2.0 (November 21st, 2008)
 
 * Release for rails 2.2.2. Many many changes.  [Ken Collins], [Murray Steele], [Shawn Balestracci], [Joe Rafaniello]
 

data/README.rdoc

@@ -13,6 +13,7 @@ The SQL Server adapter for rails is back for ActiveRecord 2.2 and up! We are cur
 * Pessimistic locking suppot. See the #add_lock! method for details.
 * Enabled #case_sensitive_equality_operator used by unique validations.
 * Unicode character support for nchar, nvarchar and ntext data types.
+* Support for views as table names. Also support views during identity inserts.
 
 ==== Date/Time Data Type Hinting
 
@@ -98,7 +99,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.
 
-* Lighthouse: http://rails-sqlserver.lighthouseapp.com/projects/20277-sql-server-05-adapter/overview
+* 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/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -150,6 +150,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
+      VERSION                 = '2.2.2'.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
@@ -203,8 +204,12 @@ module ActiveRecord
         database_year == 2005
       end
       
+      def version
+        self.class::VERSION
+      end
+      
       def inspect
-        "#<#{self.class} year: #{database_year}, connection_options: #{@connection_options.inspect}>"
+        "#<#{self.class} version: #{version}, year: #{database_year}, connection_options: #{@connection_options.inspect}>"
       end
       
       def native_text_database_type
@@ -751,7 +756,7 @@ module ActiveRecord
       # IDENTITY INSERTS =========================================#
       
       def with_identity_insert_enabled(table_name, &block)
-        table_name = table_name_or_views_table_name(table_name)
+        table_name = quote_table_name(table_name_or_views_table_name(table_name))
         set_identity_insert(table_name, true)
         yield
       ensure
@@ -781,7 +786,7 @@ module ActiveRecord
       
       def table_name_or_views_table_name(table_name)
         unquoted_table_name = unqualify_table_name(table_name)
-        views.include?(unquoted_table_name) ? view_table_name(unquoted_table_name) : table_name
+        views.include?(unquoted_table_name) ? view_table_name(unquoted_table_name) : unquoted_table_name
       end
       
       # HELPER METHODS ===========================================#
@@ -849,7 +854,8 @@ module ActiveRecord
       
       def column_definitions(table_name)
         db_name = unqualify_db_name(table_name)
-        table_name = unqualify_table_name(table_name)
+        real_table_name = table_name_or_views_table_name(table_name)
+        passed_table_name = unqualify_table_name(table_name)
         sql = %{
           SELECT
           columns.TABLE_NAME as table_name,
@@ -874,12 +880,13 @@ module ActiveRecord
             ELSE 1
           END as is_identity
           FROM #{db_name}INFORMATION_SCHEMA.COLUMNS columns
-          WHERE columns.TABLE_NAME = '#{table_name}'
+          WHERE columns.TABLE_NAME = '#{real_table_name}'
           ORDER BY columns.ordinal_position
         }.gsub(/[ \t\r\n]+/,' ')
         results = without_type_conversion { select(sql,nil,true) }
         results.collect do |ci|
           ci.symbolize_keys!
+          ci[:table_name] = passed_table_name
           ci[:type] = case ci[:type]
                       when /^bit|image|text|ntext|datetime$/
                         ci[:type]

data/test/cases/adapter_test_sqlserver.rb

@@ -27,6 +27,10 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
       assert_equal 'SQLServer', @connection.adapter_name
     end
     
+    should 'include version in inspect' do
+      assert_match(/version\: \d.\d.\d/,@connection.inspect)
+    end
+    
     should 'support migrations' do
       assert @connection.supports_migrations?
     end
@@ -393,8 +397,19 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
         end
       end
       
+      should 'find identity column' do
+        assert CustomersView.columns_hash['id'].primary
+        assert CustomersView.columns_hash['id'].is_identity?
+      end
+      
+      should 'pick up on default values from table' do
+        assert_equal 0, CustomersView.new.balance
+        assert_equal 'null', StringDefaultsView.new.string_with_pretend_null_one
+      end
+      
       should 'yield all column objects having the correct table name' do
-        assert CustomersView.columns.all?{ |c| c.table_name == 'customers_view' }
+        assert CustomersView.columns.all?{ |c| c.table_name == 'customers_view' }, 
+          CustomersView.columns.map(&:table_name).inspect
       end
       
       should 'respond true to table_exists?' do

data/test/cases/sqlserver_helper.rb

@@ -20,6 +20,7 @@ class FkTestHasFk < ActiveRecord::Base ; end
 class FkTestHasPk < ActiveRecord::Base ; end
 class NumericData < ActiveRecord::Base ; self.table_name = 'numeric_data' ; end
 class CustomersView < ActiveRecord::Base ; self.table_name = 'customers_view' ; end
+class StringDefaultsView < ActiveRecord::Base ; self.table_name = 'string_defaults_view' ; end
 class SqlServerUnicode < ActiveRecord::Base ; end
 class SqlServerString < ActiveRecord::Base ; end
 class SqlServerChronic < ActiveRecord::Base

data/test/schema/sqlserver_specific_schema.rb

@@ -67,6 +67,11 @@ ActiveRecord::Schema.define do
       SELECT id, name, balance
       FROM customers
   CUSTOMERSVIEW
-  
+  execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'string_defaults_view') DROP VIEW string_defaults_view"
+  execute <<-STRINGDEFAULTSVIEW
+    CREATE VIEW string_defaults_view AS
+      SELECT id, string_with_pretend_null_one
+      FROM string_defaults
+  STRINGDEFAULTSVIEW
   
 end

metadata

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