activerecord-sqlserver-adapter 3.2.8 → 3.2.9

data/CHANGELOG

@@ -1,7 +1,15 @@
 
+* 3.2.9 *
+
+* The #remove_default_constraint uses #execute_procedure now. Fixes #223. Thanks @gicappa and @clintmiller.
+* Mimic other adapters quoting for empty strings passed to integer columns. Fixes #164.
+* Allow named parameters in stored procedures. Fixes #216. Thanks @sixfeetover.
+* Make sure exclude [__rnt] table names form relation reflection. Fixes #219 and #221. Thanks @sphogan.
+
+
 * 3.2.8 *
 
-Include VERSION in gemspec's files.
+* Include VERSION in gemspec's files.
 
 
 * 3.2.7 *

data/VERSION

@@ -1 +1 @@
-3.2.8
+3.2.9

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -23,7 +23,7 @@ module ActiveRecord
               executesql_args = executesql.split(', ')
               found_args = executesql_args.reject! { |arg| arg =~ SQLSERVER_PARAM_MATCHER }
               executesql_args.pop if found_args && executesql_args.many?
-              executesql = executesql_args.join(', ').strip.match(/N'(.*)'/)[1]
+              executesql = executesql_args.join(', ').strip.match(/N'(.*)'/m)[1]
               Utils.unquote_string(executesql)
             else
               sql

data/lib/active_record/connection_adapters/sqlserver/core_ext/relation.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module CoreExt
+        module Relation
+          
+          private
+          
+          def tables_in_string(string)
+            super - ['__rnt']
+          end
+          
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Relation.send :include, ActiveRecord::ConnectionAdapters::Sqlserver::CoreExt::Relation

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

@@ -93,7 +93,11 @@ module ActiveRecord
         # === SQLServer Specific ======================================== #
         
         def execute_procedure(proc_name, *variables)
-          vars = variables.map{ |v| quote(v) }.join(', ')
+          vars = if variables.any? && variables.first.is_a?(Hash)
+                   variables.first.map { |k,v| "@#{k} = #{quote(v)}" }
+                 else
+                   variables.map { |v| quote(v) }
+                 end.join(', ')
           sql = "EXEC #{proc_name} #{vars}".strip
           name = 'Execute Procedure'
           log(sql, name) do

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

@@ -10,7 +10,7 @@ module ActiveRecord
           case value
           when String, ActiveSupport::Multibyte::Chars
             if column && column.type == :integer && value.blank?
-              nil
+              value.to_i.to_s
             elsif column && column.type == :binary
               column.class.string_to_binary(value)
             elsif value.is_utf8? || (column && column.type == :string)

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

@@ -250,7 +250,7 @@ module ActiveRecord
 
         def remove_default_constraint(table_name, column_name)
           # If their are foreign keys in this table, we could still get back a 2D array, so flatten just in case.
-          select_all("EXEC sp_helpconstraint '#{quote_string(table_name)}','nomsg'").flatten.select do |row|
+          execute_procedure(:sp_helpconstraint, table_name, 'nomsg').flatten.select do |row|
             row['constraint_type'] == "DEFAULT on column #{column_name}"
           end.each do |row|
             do_execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{row['constraint_name']}"

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -8,6 +8,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
 require 'active_record/connection_adapters/sqlserver/core_ext/database_statements'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain'
+require 'active_record/connection_adapters/sqlserver/core_ext/relation'
 require 'active_record/connection_adapters/sqlserver/database_limits'
 require 'active_record/connection_adapters/sqlserver/database_statements'
 require 'active_record/connection_adapters/sqlserver/errors'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70299608268660 !ruby/object:Gem::Requirement
+  requirement: &70115456563760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,7 +25,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70299608268660
+  version_requirements: *70115456563760
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord
 email: ken@metaskills.net
 executables: []
@@ -39,6 +39,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/core_ext/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/odbc.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/relation.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
 - lib/active_record/connection_adapters/sqlserver/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/errors.rb