activerecord-sqlserver-adapter 3.2.6 → 3.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG CHANGED
@@ -1,4 +1,10 @@
1
1
 
2
+ * 3.2.7 *
3
+
4
+ * Find VERSION in base file out of module namespace. Fixes #208
5
+ * Better support for explain without sp_execute args. FIxes #207
6
+
7
+
2
8
  * 3.2.6 *
3
9
 
4
10
  * Unique has_many associations with pagination now work. Fixes #209
@@ -21,15 +21,15 @@ module ActiveRecord
21
21
  if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
22
22
  executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
23
23
  executesql_args = executesql.split(', ')
24
- executesql_args.reject! { |arg| arg =~ SQLSERVER_PARAM_MATCHER }
25
- executesql_args.pop if executesql_args.many?
24
+ found_args = executesql_args.reject! { |arg| arg =~ SQLSERVER_PARAM_MATCHER }
25
+ executesql_args.pop if found_args && executesql_args.many?
26
26
  executesql = executesql_args.join(', ').strip.match(/N'(.*)'/)[1]
27
27
  Utils.unquote_string(executesql)
28
28
  else
29
29
  sql
30
30
  end
31
31
  end
32
-
32
+
33
33
 
34
34
  end
35
35
  end
@@ -16,7 +16,6 @@ require 'active_record/connection_adapters/sqlserver/schema_statements'
16
16
  require 'active_record/connection_adapters/sqlserver/showplan'
17
17
  require 'active_record/connection_adapters/sqlserver/quoting'
18
18
  require 'active_record/connection_adapters/sqlserver/utils'
19
- require 'active_record/connection_adapters/sqlserver/version'
20
19
 
21
20
  module ActiveRecord
22
21
 
@@ -177,8 +176,8 @@ module ActiveRecord
177
176
  include Sqlserver::SchemaStatements
178
177
  include Sqlserver::DatabaseLimits
179
178
  include Sqlserver::Errors
180
- include Sqlserver::Version
181
179
 
180
+ VERSION = File.read(File.expand_path("../../../../VERSION",__FILE__)).strip
182
181
  ADAPTER_NAME = 'SQLServer'.freeze
183
182
  DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
184
183
  SUPPORTED_VERSIONS = [2005,2008,2010,2011,2012]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord-sqlserver-adapter
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.6
4
+ version: 3.2.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,11 +13,11 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2012-07-08 00:00:00.000000000 Z
16
+ date: 2012-07-10 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activerecord
20
- requirement: &70121348787340 !ruby/object:Gem::Requirement
20
+ requirement: &70304932921060 !ruby/object:Gem::Requirement
21
21
  none: false
22
22
  requirements:
23
23
  - - ~>
@@ -25,7 +25,7 @@ dependencies:
25
25
  version: 3.2.0
26
26
  type: :runtime
27
27
  prerelease: false
28
- version_requirements: *70121348787340
28
+ version_requirements: *70304932921060
29
29
  description: SQL Server 2005 and 2008 Adapter For ActiveRecord
30
30
  email: ken@metaskills.net
31
31
  executables: []
@@ -48,7 +48,6 @@ files:
48
48
  - lib/active_record/connection_adapters/sqlserver/showplan/printer_xml.rb
49
49
  - lib/active_record/connection_adapters/sqlserver/showplan.rb
50
50
  - lib/active_record/connection_adapters/sqlserver/utils.rb
51
- - lib/active_record/connection_adapters/sqlserver/version.rb
52
51
  - lib/active_record/connection_adapters/sqlserver_adapter.rb
53
52
  - lib/activerecord-sqlserver-adapter.rb
54
53
  - lib/arel/visitors/sqlserver.rb
@@ -1,11 +0,0 @@
1
- module ActiveRecord
2
- module ConnectionAdapters
3
- module Sqlserver
4
- module Version
5
-
6
- VERSION = '3.2.6'
7
-
8
- end
9
- end
10
- end
11
- end