activerecord-sqlserver-adapter 3.0.3 → 3.0.4

data/CHANGELOG

@@ -1,4 +1,13 @@
 
+* 3.0.4 *
+
+* Add multiple results set support with #execute_procedure for :dblib mode. [Ken Collins]
+
+* Simplify encoding support. [Ken Collins]
+
+* Add binary timestamp datatype handling. [Erik Bryn]
+
+
 * 3.0.3
 
 * Add TinyTDS/dblib connection mode. [Ken Collins]

data/README.rdoc

@@ -6,7 +6,8 @@ The SQL Server adapter for ActiveRecord.
 
 == What's New
 
-* Version 3.x now supports rails 3!
+* New dblib connection mode using TinyTds!
+* Rails 3 support!
 
 
 ==== Testing Rake Tasks Support

data/lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -72,12 +72,17 @@ module ActiveRecord
           vars = variables.map{ |v| quote(v) }.join(', ')
           sql = "EXEC #{proc_name} #{vars}".strip
           name = 'Execute Procedure'
-          results = []
-          case @connection_options[:mode]
-          when :dblib
-            results << select(sql, name).map { |r| r.with_indifferent_access }
-          when :odbc
-            log(sql, name) do
+          log(sql, name) do
+            case @connection_options[:mode]
+            when :dblib
+              result = @connection.execute(sql)
+              result.each(:as => :hash, :cache_rows => true) do |row|
+                r = row.with_indifferent_access
+                yield(r) if block_given?
+              end
+              result.each
+            when :odbc
+              results = []
               raw_connection_run(sql) do |handle|
                 get_rows = lambda {
                   rows = handle_to_names_and_values handle, :fetch => :all
@@ -89,11 +94,13 @@ module ActiveRecord
                   get_rows.call
                 end
               end
+              results.many? ? results : results.first
+            when :adonet
+              results = []
+              results << select(sql, name).map { |r| r.with_indifferent_access }
+              results.many? ? results : results.first
             end
-          when :adonet
-            results << select(sql, name).map { |r| r.with_indifferent_access }
           end
-          results.many? ? results : results.first
         end
         
         def use_database(database=nil)

data/lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -10,8 +10,8 @@ module ActiveRecord
           when String, ActiveSupport::Multibyte::Chars
             if column && column.type == :binary
               column.class.string_to_binary(value)
-            elsif quote_value_as_utf8?(value) || column && column.respond_to?(:is_utf8?) && column.is_utf8?
-              quoted_utf8_value(value)
+            elsif value.is_utf8? || (column && column.type == :string)
+              "N'#{quote_string(value)}'"
             else
               super
             end
@@ -48,14 +48,6 @@ module ActiveRecord
             super
           end
         end
-
-        def quoted_utf8_value(value)
-          "N'#{quote_string(value)}'"
-        end
-        
-        def quote_value_as_utf8?(value)
-          value.is_utf8? || enable_default_unicode_types
-        end
         
       end
     end

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -168,7 +168,8 @@ module ActiveRecord
             :nchar        => { :name => "nchar" },
             :nvarchar     => { :name => "nvarchar", :limit => 255 },
             :nvarchar_max => { :name => "nvarchar(max)" },
-            :ntext        => { :name => "ntext" }
+            :ntext        => { :name => "ntext" },
+            :ss_timestamp => { :name => 'timestamp' }
           })
         end
         

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -68,38 +68,16 @@ module ActiveRecord
       
       class << self
         
-        def string_to_utf8_encoding(value)
-          value.force_encoding('UTF-8') rescue value
-        end
-        
         def string_to_binary(value)
-          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
          "0x#{value.unpack("H*")[0]}"
         end
         
         def binary_to_string(value)
-          value = value.dup.force_encoding(Encoding::BINARY) if value.respond_to?(:force_encoding)
           value =~ /[^[:xdigit:]]/ ? value : [value].pack('H*')
         end
         
       end
       
-      def type_cast(value)
-        if value && type == :string && is_utf8?
-          self.class.string_to_utf8_encoding(value)
-        else
-          super
-        end
-      end
-      
-      def type_cast_code(var_name)
-        if type == :string && is_utf8?
-          "#{self.class.name}.string_to_utf8_encoding(#{var_name})"
-        else
-          super
-        end
-      end
-      
       def is_identity?
         @sqlserver_options[:is_identity]
       end
@@ -156,6 +134,7 @@ module ActiveRecord
           when /uniqueidentifier/i  then :string
           when /datetime/i          then simplified_datetime
           when /varchar\(max\)/     then :text
+          when /timestamp/          then :binary
           else super
         end
       end
@@ -184,7 +163,7 @@ module ActiveRecord
       include Sqlserver::Errors
       
       ADAPTER_NAME                = 'SQLServer'.freeze
-      VERSION                     = '3.0.3'.freeze
+      VERSION                     = '3.0.4'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+(\d{4})/
       SUPPORTED_VERSIONS          = [2005,2008].freeze
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 4
+  version: 3.0.4
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        version: "3.0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord