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

data/CHANGELOG

@@ -4,9 +4,19 @@ MASTER
 * 
 
 
+* 2.2.3 (December 5th, 2008)
+
+* Changing back to using real table name in column_definitions. Makes sure views get back only the columns 
+  that are defined for them with correct names, etc. Now supporting views by looking for NULL default and 
+  then if table name is a view, perform a targeted with sub select to the real table name and column name 
+  to find true default. [Ken Collins]
+
+* Ensure that add_limit_offset! does not alter sub queries. [Erik Bryn]
+
+
 2.2.2 (December 2nd, 2008)
 
-* Add support for view defaults by making column_definitions use real table name for schema info.
+* Add support for view defaults by making column_definitions use real table name for schema info. [Ken Collins]
 
 * Include version in connection method and inspection. [Ken Collins]
 

data/README.rdoc

@@ -13,7 +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.
+* View support for table names, identity inserts, and column defaults.
 
 ==== Date/Time Data Type Hinting
 

data/RUNNING_UNIT_TESTS

@@ -11,7 +11,7 @@ test/connections/<your database>/connection.rb.
 The following gems need to be installed. Make sure you have gems.github.com as a
 source. http://github.com/blog/97-github-loves-rubygems-1-2
 
-  * gem install thoughbot-shoulda
+  * gem install thoughtbot-shoulda -s http://gems.github.com
   * gem install mocha
 
 The tests of this adapter depend on the existence of rails checkout. All the tests

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -150,7 +150,7 @@ module ActiveRecord
     class SQLServerAdapter < AbstractAdapter
       
       ADAPTER_NAME            = 'SQLServer'.freeze
-      VERSION                 = '2.2.2'.freeze
+      VERSION                 = '2.2.3'.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
@@ -353,7 +353,7 @@ module ActiveRecord
         end
         # The business of adding limit/offset
         if options[:limit] and options[:offset]
-          total_rows = select_value("SELECT count(*) as TotalRows from (#{sql.gsub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT#{$1} TOP 1000000000")}) tally").to_i
+          total_rows = select_value("SELECT count(*) as TotalRows from (#{sql.sub(/\bSELECT(\s+DISTINCT)?\b/i, "SELECT#{$1} TOP 1000000000")}) tally").to_i
           if (options[:limit] + options[:offset]) >= total_rows
             options[:limit] = (total_rows - options[:offset] >= 0) ? (total_rows - options[:offset]) : 0
           end
@@ -457,6 +457,7 @@ module ActiveRecord
       end
       
       def view_information(table_name)
+        table_name = unqualify_table_name(table_name)
         select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'"
       end
       
@@ -827,6 +828,12 @@ module ActiveRecord
         end
       end
       
+      def views_real_column_name(table_name,column_name)
+        view_definition = view_information(table_name)['VIEW_DEFINITION']
+        match_data = view_definition.match(/([\w-]*)\s+as\s+pretend_null/im)
+        match_data ? match_data[1] : column_name
+      end
+      
       def order_to_min_set(order)
         orders_dirs = orders_and_dirs_set(order)
         orders_dirs.map do |o,d|
@@ -854,17 +861,13 @@ module ActiveRecord
       
       def column_definitions(table_name)
         db_name = unqualify_db_name(table_name)
-        real_table_name = table_name_or_views_table_name(table_name)
-        passed_table_name = unqualify_table_name(table_name)
+        table_name = unqualify_table_name(table_name)
         sql = %{
           SELECT
           columns.TABLE_NAME as table_name,
           columns.COLUMN_NAME as name,
           columns.DATA_TYPE as type,
-          CASE
-            WHEN columns.COLUMN_DEFAULT = '(null)' OR columns.COLUMN_DEFAULT = '(NULL)' THEN NULL
-            ELSE columns.COLUMN_DEFAULT
-          END as default_value,
+          columns.COLUMN_DEFAULT as default_value,
           columns.NUMERIC_SCALE as numeric_scale,
           columns.NUMERIC_PRECISION as numeric_precision,
           CASE
@@ -880,13 +883,12 @@ module ActiveRecord
             ELSE 1
           END as is_identity
           FROM #{db_name}INFORMATION_SCHEMA.COLUMNS columns
-          WHERE columns.TABLE_NAME = '#{real_table_name}'
+          WHERE columns.TABLE_NAME = '#{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]
@@ -897,7 +899,18 @@ module ActiveRecord
                       else
                         ci[:type]
                       end
-          ci[:default_value] = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)[1] if ci[:default_value]
+          if ci[:default_value].nil? && views.include?(table_name)
+            real_table_name = table_name_or_views_table_name(table_name)
+            real_column_name = views_real_column_name(table_name,ci[:name])
+            col_default_sql = "SELECT c.COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS c WHERE c.TABLE_NAME = '#{real_table_name}' AND c.COLUMN_NAME = '#{real_column_name}'"
+            ci[:default_value] = without_type_conversion { select_value(col_default_sql) }
+          end
+          ci[:default_value] = case ci[:default_value]
+                               when nil, '(null)', '(NULL)'
+                                 nil
+                               else
+                                 ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/)[1]
+                               end
           ci[:null] = ci[:is_nullable].to_i == 1 ; ci.delete(:is_nullable)
           ci
         end

data/test/cases/adapter_test_sqlserver.rb

@@ -284,13 +284,12 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
     end
     
     should 'NOT ALLOW by default the deletion of a referenced parent' do
+      FkTestHasPk.connection.disable_referential_integrity { }
       assert_raise(ActiveRecord::StatementInvalid) { @parent.destroy }
     end
     
     should 'ALLOW deletion of referenced parent using #disable_referential_integrity block' do
-      assert_nothing_raised(ActiveRecord::StatementInvalid) do
-        FkTestHasPk.connection.disable_referential_integrity { @parent.destroy }
-      end
+      FkTestHasPk.connection.disable_referential_integrity { @parent.destroy }
     end
     
     should 'again NOT ALLOW deletion of referenced parent after #disable_referential_integrity block' do
@@ -389,31 +388,75 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
     
     context 'used by a class for table_name' do
       
-      should 'yield column objects' do
-        assert !CustomersView.columns.blank?
-        ['id','name','balance'].each do |colname|
-          assert_instance_of ActiveRecord::ConnectionAdapters::SQLServerColumn, 
-            CustomersView.columns_hash[colname], "Column name #{colname.inspect} was not found"
+      context 'with same column names' do
+        
+        should 'have matching column objects' do
+          columns = ['id','name','balance']
+          assert !CustomersView.columns.blank?
+          assert_equal columns.size, CustomersView.columns.size
+          columns.each do |colname|
+            assert_instance_of ActiveRecord::ConnectionAdapters::SQLServerColumn, 
+              CustomersView.columns_hash[colname], 
+              "Column name #{colname.inspect} was not found in these columns #{CustomersView.columns.map(&:name).inspect}"
+          end
         end
+        
+        should 'find identity column' do
+          assert CustomersView.columns_hash['id'].primary
+          assert CustomersView.columns_hash['id'].is_identity?
+        end
+        
+        should 'find default values' do
+          assert_equal 0, CustomersView.new.balance
+        end
+        
+        should 'respond true to table_exists?' do
+          assert CustomersView.table_exists?
+        end
+        
+        should 'have correct table name for all column objects' do
+          assert CustomersView.columns.all?{ |c| c.table_name == 'customers_view' }, 
+            CustomersView.columns.map(&:table_name).inspect
+        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' }, 
-          CustomersView.columns.map(&:table_name).inspect
-      end
-      
-      should 'respond true to table_exists?' do
-        assert CustomersView.table_exists?
+      context 'with aliased column names' do
+        
+        should 'have matching column objects' do
+          columns = ['id','pretend_null']
+          assert !StringDefaultsView.columns.blank?
+          assert_equal columns.size, StringDefaultsView.columns.size
+          columns.each do |colname|
+            assert_instance_of ActiveRecord::ConnectionAdapters::SQLServerColumn, 
+              StringDefaultsView.columns_hash[colname], 
+              "Column name #{colname.inspect} was not found in these columns #{StringDefaultsView.columns.map(&:name).inspect}"
+          end
+        end
+        
+        should 'find identity column' do
+          assert StringDefaultsView.columns_hash['id'].primary
+          assert StringDefaultsView.columns_hash['id'].is_identity?
+        end
+        
+        should 'find default values' do
+          # col_default_sql = "SELECT c.COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS c WHERE c.TABLE_NAME = 'string_defaults' AND c.COLUMN_NAME = 'string_with_pretend_null_one'"
+          # raise @connection.select_value(col_default_sql).inspect
+          # raise @connection.without_type_conversion{ @connection.select_value(col_default_sql) }.inspect
+          
+          assert_equal 'null', StringDefaultsView.new.pretend_null, 
+            StringDefaultsView.columns_hash['pretend_null'].inspect
+        end
+        
+        should 'respond true to table_exists?' do
+          assert StringDefaultsView.table_exists?
+        end
+        
+        should 'have correct table name for all column objects' do
+          assert StringDefaultsView.columns.all?{ |c| c.table_name == 'string_defaults_view' }, 
+            StringDefaultsView.columns.map(&:table_name).inspect
+        end
+        
       end
       
     end

data/test/cases/offset_and_limit_test_sqlserver.rb

@@ -41,6 +41,7 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
 
     setup do
       @select_sql = 'SELECT * FROM books'
+      @subquery_select_sql = 'SELECT *, (SELECT TOP 1 id FROM books) AS book_id FROM books'
       @books = (1..10).map {|i| Book.create!}
     end
     
@@ -75,6 +76,12 @@ class OffsetAndLimitTestSqlserver < ActiveRecord::TestCase
       assert_raise(ArgumentError) { @connection.add_limit_offset!(@select_sql, options) }
     end
 
+    should 'not create invalid SQL with subquery SELECTs with TOP' do
+      options = { :limit => 5, :offset => 1 }
+      expected_sql = "SELECT * FROM (SELECT TOP 5 * FROM (SELECT TOP 6 *, (SELECT TOP 1 id FROM books) AS book_id FROM books) AS tmp1) AS tmp2"
+      assert_equal expected_sql, @connection.add_limit_offset!(@subquery_select_sql,options)
+    end
+    
   end
   
   

data/test/schema/sqlserver_specific_schema.rb

@@ -70,7 +70,7 @@ ActiveRecord::Schema.define do
   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
+      SELECT id, string_with_pretend_null_one as pretend_null
       FROM string_defaults
   STRINGDEFAULTSVIEW
   

metadata

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