Add support for view defaults by making column_definitions use real table name for schema info.

Author: metaskills

CHANGELOG

@@ -1,10 +1,17 @@
 
-*MASTER* ()
+MASTER
+
+* 
+
+
+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)
+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]
 

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -756,7 +756,7 @@ def default_name(table_name, column_name)
       # 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
@@ -786,7 +786,7 @@ def identity_column(table_name)
 
       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 ===========================================#
@@ -854,7 +854,8 @@ def initialize_sqlserver_caches(reset_columns=true)
 
       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,
@@ -879,12 +880,13 @@ def column_definitions(table_name)
             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]

test/cases/adapter_test_sqlserver.rb

@@ -402,8 +402,14 @@ def setup
         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

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

test/schema/sqlserver_specific_schema.rb

@@ -67,6 +67,11 @@
       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