rails-sqlserver-2000-2005-adapter 2.2.8 → 2.2.9

data/CHANGELOG

@@ -4,6 +4,16 @@ MASTER
 * 
 
 
+* 2.2.9 * (January 22nd, 2009)
+
+* Fixing a small bug in the deprecated DBI::Timestamp conversion so it correctly converts nanosecond whole 
+  numbers to back to pre type cast SQL Server milliseconds, ultimately allow ruby's Time#usec which is 
+  microseconds to be correct. [Ken Collins]
+  
+* Sometimes views are more than 4000 chars long and will return NULL for the VIEW_DEFINITION. If so, use 
+  sp_helptext procedure as a backup method. [Ken Collins]
+
+
 * 2.2.8 (January 9th, 2009)
 
 * Update execute_procedure method a bit to remove excess code. [Ken Collins]

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.8'.freeze
+      VERSION                 = '2.2.9'.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
@@ -482,8 +482,13 @@ module ActiveRecord
       
       def view_information(table_name)
         table_name = unqualify_table_name(table_name)
-        @sqlserver_view_information_cache[table_name] ||= 
-          info_schema_query { select_one("SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'") }
+        @sqlserver_view_information_cache[table_name] ||= begin
+          view_info = info_schema_query { select_one("SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'") }
+          if view_info
+            view_info['VIEW_DEFINITION'] ||= info_schema_query { select_values("EXEC sp_helptext #{table_name}").join }
+          end
+          view_info
+        end
       end
       
       def view_table_name(table_name)

data/lib/core_ext/dbi.rb

@@ -2,14 +2,12 @@
 module SQLServerDBI
   
   module Timestamp
-    # Will further change DBI::Timestamp #to_s return value by limiting the usec of 
-    # the time to 3 digits and in some cases adding zeros if needed. For example:
-    #   "1985-04-15 00:00:00.0"         # => "1985-04-15 00:00:00.000"
-    #   "2008-11-08 10:24:36.547000"    # => "2008-11-08 10:24:36.547"
-    #   "2008-11-08 10:24:36.123"       # => "2008-11-08 10:24:36.000"
+    # Deprecated DBI. See documentation for Type::SqlserverTimestamp which 
+    # this method tries to mimic as ODBC is still going to convert SQL Server 
+    # milliconds to whole number representation of nanoseconds.
     def to_sqlserver_string
-      datetime, usec = to_s[0..22].split('.')
-      "#{datetime}.#{sprintf("%03d",usec)}"
+      datetime, nanoseconds = to_s.split('.')
+      "#{datetime}.#{sprintf("%03d",nanoseconds.to_i/1000000)}"
     end
   end
   
@@ -24,7 +22,7 @@ module SQLServerDBI
     # and the conversion we expect to have in the DB before type casting.
     # 
     #   "1985-04-15 00:00:00 0"           # => "1985-04-15 00:00:00.000"
-    #   "2008-11-08 10:24:36 300000000"   # => "2008-11-08 10:24:36.003"
+    #   "2008-11-08 10:24:36 30000000"    # => "2008-11-08 10:24:36.003"
     #   "2008-11-08 10:24:36 123000000"   # => "2008-11-08 10:24:36.123"
     class SqlserverTimestamp
       def self.parse(obj)

data/test/cases/adapter_test_sqlserver.rb

@@ -250,13 +250,13 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
         should 'find 003 millisecond in the DB with before and after casting' do
           existing_003 = SqlServerChronic.find_by_datetime!(@db_datetime_003)
           assert_equal @db_datetime_003, existing_003.datetime_before_type_cast
-          assert_equal 3000, existing_003.datetime.usec, 'A 003 millisecond in SQL Server is 3000 milliseconds'
+          assert_equal 3000, existing_003.datetime.usec, 'A 003 millisecond in SQL Server is 3000 microseconds'
         end
 
         should 'find 123 millisecond in the DB with before and after casting' do
           existing_123 = SqlServerChronic.find_by_datetime!(@db_datetime_123)
           assert_equal @db_datetime_123, existing_123.datetime_before_type_cast
-          assert_equal 123000, existing_123.datetime.usec, 'A 123 millisecond in SQL Server is 123000 milliseconds'
+          assert_equal 123000, existing_123.datetime.usec, 'A 123 millisecond in SQL Server is 123000 microseconds'
         end
 
       end
@@ -536,6 +536,19 @@ class AdapterTestSqlserver < ActiveRecord::TestCase
 
     end
     
+    context 'that have more than 4000 chars for their defintion' do
+
+      should 'cope with null returned for the defintion' do
+        assert_nothing_raised() { StringDefaultsBigView.columns }
+      end
+      
+      should 'using alternate view defintion still be able to find real default' do
+        assert_equal 'null', StringDefaultsBigView.new.pretend_null, 
+          StringDefaultsBigView.columns_hash['pretend_null'].inspect
+      end
+
+    end
+    
   end
   
   

data/test/cases/specific_schema_test_sqlserver.rb

@@ -11,6 +11,7 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
     assert_equal '(null)', default.string_with_pretend_null_two
     assert_equal 'NULL', default.string_with_pretend_null_three
     assert_equal '(NULL)', default.string_with_pretend_null_four
+    assert_equal '(3)', default.string_with_pretend_paren_three
   end
 
   should 'default strings after save' do

data/test/cases/sqlserver_helper.rb

@@ -21,6 +21,7 @@ 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 StringDefaultsBigView < ActiveRecord::Base ; self.table_name = 'string_defaults_big_view' ; end
 class SqlServerUnicode < ActiveRecord::Base ; end
 class SqlServerString < ActiveRecord::Base ; end
 class SqlServerChronic < ActiveRecord::Base

data/test/schema/sqlserver_specific_schema.rb

@@ -17,6 +17,7 @@ ActiveRecord::Schema.define do
     t.column :string_with_pretend_null_two, :string, :default => '(null)'
     t.column :string_with_pretend_null_three, :string, :default => 'NULL'
     t.column :string_with_pretend_null_four, :string, :default => '(NULL)'
+    t.column :string_with_pretend_paren_three, :string, :default => '(3)'
   end
   
   create_table :sql_server_chronics, :force => true do |t|
@@ -67,6 +68,7 @@ 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
@@ -74,4 +76,12 @@ ActiveRecord::Schema.define do
       FROM string_defaults
   STRINGDEFAULTSVIEW
   
+  execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'string_defaults_big_view') DROP VIEW string_defaults_big_view"
+  execute <<-STRINGDEFAULTSBIGVIEW
+    CREATE VIEW string_defaults_big_view AS
+      SELECT id, string_with_pretend_null_one as pretend_null
+      /*#{'x'*4000}}*/
+      FROM string_defaults
+  STRINGDEFAULTSBIGVIEW
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails-sqlserver-2000-2005-adapter
 version: !ruby/object:Gem::Version 
-  version: 2.2.8
+  version: 2.2.9
 platform: ruby
 authors: 
 - Ken Collins
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-01-22 00:00:00 -08:00
 default_executable: 
 dependencies: []