activerecord-sqlserver-adapter 3.2.6 → 3.2.7

data/CHANGELOG

@@ -1,4 +1,10 @@
 
+* 3.2.7 *
+
+* Find VERSION in base file out of module namespace. Fixes #208
+* Better support for explain without sp_execute args. FIxes #207
+
+
 * 3.2.6 *
 
 * Unique has_many associations with pagination now work. Fixes #209

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

@@ -21,15 +21,15 @@ module ActiveRecord
             if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
               executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
               executesql_args = executesql.split(', ')
-              executesql_args.reject! { |arg| arg =~ SQLSERVER_PARAM_MATCHER }
-              executesql_args.pop if executesql_args.many?
+              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]
               Utils.unquote_string(executesql)
             else
               sql
             end
           end
-          
+
           
         end
       end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -16,7 +16,6 @@ require 'active_record/connection_adapters/sqlserver/schema_statements'
 require 'active_record/connection_adapters/sqlserver/showplan'
 require 'active_record/connection_adapters/sqlserver/quoting'
 require 'active_record/connection_adapters/sqlserver/utils'
-require 'active_record/connection_adapters/sqlserver/version'
 
 module ActiveRecord
   
@@ -177,8 +176,8 @@ module ActiveRecord
       include Sqlserver::SchemaStatements
       include Sqlserver::DatabaseLimits
       include Sqlserver::Errors
-      include Sqlserver::Version
       
+      VERSION                     = File.read(File.expand_path("../../../../VERSION",__FILE__)).strip
       ADAPTER_NAME                = 'SQLServer'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011,2012]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,11 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70121348787340 !ruby/object:Gem::Requirement
+  requirement: &70304932921060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -25,7 +25,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70121348787340
+  version_requirements: *70304932921060
 description: SQL Server 2005 and 2008 Adapter For ActiveRecord
 email: ken@metaskills.net
 executables: []
@@ -48,7 +48,6 @@ files:
 - lib/active_record/connection_adapters/sqlserver/showplan/printer_xml.rb
 - lib/active_record/connection_adapters/sqlserver/showplan.rb
 - lib/active_record/connection_adapters/sqlserver/utils.rb
-- lib/active_record/connection_adapters/sqlserver/version.rb
 - lib/active_record/connection_adapters/sqlserver_adapter.rb
 - lib/activerecord-sqlserver-adapter.rb
 - lib/arel/visitors/sqlserver.rb

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

@@ -1,11 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Sqlserver
-      module Version
-        
-        VERSION = '3.2.6'
-        
-      end
-    end
-  end
-end