activerecord-sqlserver-adapter 3.0.15 → 3.0.16

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/CHANGELOG +5 -0
  2. data/lib/active_record/connection_adapters/sqlserver/quoting.rb +1 -1
  3. data/lib/active_record/connection_adapters/sqlserver_adapter.rb +1 -1
  4. data/lib/arel/visitors/sqlserver.rb +2 -0
  5. metadata +59 -32
data/CHANGELOG CHANGED
@@ -1,4 +1,9 @@
1
1
 
2
+ * 3-0-stable *
3
+
4
+ * Allow complex order objects to not be molested by our visitor overrides. Fixes #99
5
+
6
+
2
7
  * 3.0.15 *
3
8
 
4
9
  * Way better schema support! Thanks to @ianic! Fixes #61
data/lib/active_record/connection_adapters/sqlserver/quoting.rb CHANGED
@@ -26,7 +26,7 @@ module ActiveRecord
26
26
 
27
27
  def quote_column_name(name)
28
28
  @sqlserver_quoted_column_and_table_names[name] ||=
29
- name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n}]" }.join('.')
29
+ name.to_s.split('.').map{ |n| n =~ /^\[.*\]$/ ? n : "[#{n.to_s.gsub(']', ']]')}]" }.join('.')
30
30
  end
31
31
 
32
32
  def quote_table_name(name)
data/lib/active_record/connection_adapters/sqlserver_adapter.rb CHANGED
@@ -164,7 +164,7 @@ module ActiveRecord
164
164
  include Sqlserver::Errors
165
165
 
166
166
  ADAPTER_NAME = 'SQLServer'.freeze
167
- VERSION = '3.0.15'.freeze
167
+ VERSION = '3.0.16'.freeze
168
168
  DATABASE_VERSION_REGEXP = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
169
169
  SUPPORTED_VERSIONS = [2005,2008,2010,2011].freeze
170
170
 
data/lib/arel/visitors/sqlserver.rb CHANGED
@@ -41,6 +41,8 @@ module Arel
41
41
  table = Arel::Table.new(x.relation.table_alias || x.relation.name)
42
42
  expr = table[x.name]
43
43
  Arel::Nodes::Ordering.new expr
44
+ when Arel::Nodes::Ordering
45
+ x
44
46
  when String
45
47
  x.split(',').map do |s|
46
48
  expr, direction = s.split
metadata CHANGED
@@ -1,10 +1,15 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: activerecord-sqlserver-adapter
3
- version: !ruby/object:Gem::Version
4
- version: 3.0.15
3
+ version: !ruby/object:Gem::Version
4
+ hash: 39
5
5
  prerelease:
6
+ segments:
7
+ - 3
8
+ - 0
9
+ - 16
10
+ version: 3.0.16
6
11
  platform: ruby
7
- authors:
12
+ authors:
8
13
  - Ken Collins
9
14
  - Murray Steele
10
15
  - Shawn Balestracci
@@ -13,38 +18,51 @@ authors:
13
18
  autorequire:
14
19
  bindir: bin
15
20
  cert_chain: []
16
- date: 2011-04-27 00:00:00.000000000 -04:00
21
+
22
+ date: 2011-09-19 00:00:00 -04:00
17
23
  default_executable:
18
- dependencies:
19
- - !ruby/object:Gem::Dependency
24
+ dependencies:
25
+ - !ruby/object:Gem::Dependency
20
26
  name: activerecord
21
- requirement: &2171190060 !ruby/object:Gem::Requirement
27
+ prerelease: false
28
+ requirement: &id001 !ruby/object:Gem::Requirement
22
29
  none: false
23
- requirements:
30
+ requirements:
24
31
  - - ~>
25
- - !ruby/object:Gem::Version
32
+ - !ruby/object:Gem::Version
33
+ hash: 1
34
+ segments:
35
+ - 3
36
+ - 0
37
+ - 3
26
38
  version: 3.0.3
27
39
  type: :runtime
28
- prerelease: false
29
- version_requirements: *2171190060
30
- - !ruby/object:Gem::Dependency
40
+ version_requirements: *id001
41
+ - !ruby/object:Gem::Dependency
31
42
  name: arel
32
- requirement: &2171189440 !ruby/object:Gem::Requirement
43
+ prerelease: false
44
+ requirement: &id002 !ruby/object:Gem::Requirement
33
45
  none: false
34
- requirements:
46
+ requirements:
35
47
  - - ~>
36
- - !ruby/object:Gem::Version
48
+ - !ruby/object:Gem::Version
49
+ hash: 1
50
+ segments:
51
+ - 2
52
+ - 0
53
+ - 7
37
54
  version: 2.0.7
38
55
  type: :runtime
39
- prerelease: false
40
- version_requirements: *2171189440
56
+ version_requirements: *id002
41
57
  description: SQL Server 2005 and 2008 Adapter For ActiveRecord
42
58
  email: ken@metaskills.net
43
59
  executables: []
60
+
44
61
  extensions: []
45
- extra_rdoc_files:
62
+
63
+ extra_rdoc_files:
46
64
  - README.rdoc
47
- files:
65
+ files:
48
66
  - CHANGELOG
49
67
  - MIT-LICENSE
50
68
  - README.rdoc
@@ -62,28 +80,37 @@ files:
62
80
  has_rdoc: true
63
81
  homepage: http://github.com/rails-sqlserver/activerecord-sqlserver-adapter
64
82
  licenses: []
83
+
65
84
  post_install_message:
66
- rdoc_options:
85
+ rdoc_options:
67
86
  - --main
68
87
  - README.rdoc
69
- require_paths:
88
+ require_paths:
70
89
  - lib
71
- required_ruby_version: !ruby/object:Gem::Requirement
90
+ required_ruby_version: !ruby/object:Gem::Requirement
72
91
  none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
77
- required_rubygems_version: !ruby/object:Gem::Requirement
92
+ requirements:
93
+ - - ">="
94
+ - !ruby/object:Gem::Version
95
+ hash: 3
96
+ segments:
97
+ - 0
98
+ version: "0"
99
+ required_rubygems_version: !ruby/object:Gem::Requirement
78
100
  none: false
79
- requirements:
80
- - - ! '>='
81
- - !ruby/object:Gem::Version
82
- version: '0'
101
+ requirements:
102
+ - - ">="
103
+ - !ruby/object:Gem::Version
104
+ hash: 3
105
+ segments:
106
+ - 0
107
+ version: "0"
83
108
  requirements: []
109
+
84
110
  rubyforge_project: activerecord-sqlserver-adapter
85
111
  rubygems_version: 1.6.2
86
112
  signing_key:
87
113
  specification_version: 3
88
114
  summary: SQL Server 2005 and 2008 Adapter For ActiveRecord.
89
115
  test_files: []
116
+