arel_extensions 2.0.14 → 2.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/arel_extensions/version.rb +1 -1
- data/lib/arel_extensions/visitors.rb +66 -60
- data/lib/arel_extensions/visitors/mssql.rb +1 -0
- data/version_v2.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7a162b1a4cbc8e976a69cc9bddb628ff31c6dc2599c3a1dab013fd74c5d76252
|
|
4
|
+
data.tar.gz: 85614bf8c6733e9030fc8689c72bb6ce9234e1eb571922e2cc52fac0fad9709c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ef1fa7672a03825d56f94b1b24e425b1c0fc8dcf549ab8c4b27a01236fb14d1da346ac2a320d4f454f0104eb7c8daa0b922350e4b3d40cf2e0d9bac975380c49
|
|
7
|
+
data.tar.gz: 21f19f658455a89be007bd78877fa8ee435a957ebb16b320d666770e2f36ffaff73603b5007870a8c988b28eac6a9dacbae039b1e531bb0154d0bf65f73649fc
|
|
@@ -1,83 +1,89 @@
|
|
|
1
1
|
require 'arel_extensions/visitors/convert_format'
|
|
2
2
|
require 'arel_extensions/visitors/to_sql'
|
|
3
3
|
require 'arel_extensions/visitors/mysql'
|
|
4
|
-
require 'arel_extensions/visitors/oracle'
|
|
5
|
-
require 'arel_extensions/visitors/oracle12'
|
|
6
4
|
require 'arel_extensions/visitors/postgresql'
|
|
7
5
|
require 'arel_extensions/visitors/sqlite'
|
|
8
|
-
require 'arel_extensions/visitors/mssql'
|
|
9
6
|
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
if defined?(Arel::Visitors::Oracle)
|
|
8
|
+
require 'arel_extensions/visitors/oracle'
|
|
9
|
+
require 'arel_extensions/visitors/oracle12'
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
if defined?(Arel::Visitors::MSSQL)
|
|
13
|
+
require 'arel_extensions/visitors/mssql'
|
|
14
|
+
|
|
15
|
+
class Arel::Visitors::MSSQL
|
|
16
|
+
include ArelExtensions::Visitors::MSSQL
|
|
12
17
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
alias_method(:old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As) rescue nil
|
|
19
|
+
def visit_Arel_Nodes_As o, collector
|
|
20
|
+
if o.left.is_a?(Arel::Nodes::Binary)
|
|
21
|
+
collector << '('
|
|
22
|
+
collector = visit o.left, collector
|
|
23
|
+
collector << ')'
|
|
24
|
+
else
|
|
25
|
+
collector = visit o.left, collector
|
|
26
|
+
end
|
|
27
|
+
collector << " AS ["
|
|
28
|
+
collector = visit o.right, collector
|
|
29
|
+
collector << "]"
|
|
30
|
+
collector
|
|
21
31
|
end
|
|
22
|
-
collector << " AS ["
|
|
23
|
-
collector = visit o.right, collector
|
|
24
|
-
collector << "]"
|
|
25
|
-
collector
|
|
26
|
-
end
|
|
27
32
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
+
alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
|
|
34
|
+
def visit_Arel_Nodes_SelectStatement o, collector
|
|
35
|
+
if !collector.value.blank? && o.limit.blank? && o.offset.blank?
|
|
36
|
+
o = o.dup
|
|
37
|
+
o.orders = []
|
|
38
|
+
end
|
|
39
|
+
old_visit_Arel_Nodes_SelectStatement(o,collector)
|
|
33
40
|
end
|
|
34
|
-
old_visit_Arel_Nodes_SelectStatement(o,collector)
|
|
35
41
|
end
|
|
36
|
-
end
|
|
37
42
|
|
|
38
|
-
begin
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
begin
|
|
44
|
+
require 'arel_sqlserver'
|
|
45
|
+
if Arel::VERSION.to_i == 6
|
|
46
|
+
if Arel::Visitors::VISITORS['sqlserver'] && Arel::Visitors::VISITORS['sqlserver'] != Arel::Visitors::MSSQL
|
|
47
|
+
Arel::Visitors::VISITORS['sqlserver'].class_eval do
|
|
48
|
+
include ArelExtensions::Visitors::MSSQL
|
|
44
49
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
+
alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
|
|
51
|
+
def visit_Arel_Nodes_SelectStatement o, collector
|
|
52
|
+
if !collector.value.blank? && o.limit.blank? && o.offset.blank?
|
|
53
|
+
o = o.dup
|
|
54
|
+
o.orders = []
|
|
55
|
+
end
|
|
56
|
+
old_visit_Arel_Nodes_SelectStatement(o,collector)
|
|
50
57
|
end
|
|
51
|
-
old_visit_Arel_Nodes_SelectStatement(o,collector)
|
|
52
|
-
end
|
|
53
58
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
alias_method(:old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As) rescue nil
|
|
60
|
+
def visit_Arel_Nodes_As o, collector
|
|
61
|
+
if o.left.is_a?(Arel::Nodes::Binary)
|
|
62
|
+
collector << '('
|
|
63
|
+
collector = visit o.left, collector
|
|
64
|
+
collector << ')'
|
|
65
|
+
else
|
|
66
|
+
collector = visit o.left, collector
|
|
67
|
+
end
|
|
68
|
+
collector << " AS ["
|
|
69
|
+
collector = visit o.right, collector
|
|
70
|
+
collector << "]"
|
|
71
|
+
collector
|
|
62
72
|
end
|
|
63
|
-
collector << " AS ["
|
|
64
|
-
collector = visit o.right, collector
|
|
65
|
-
collector << "]"
|
|
66
|
-
collector
|
|
67
|
-
end
|
|
68
73
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
74
|
+
alias_method(:old_primary_Key_From_Table, :primary_Key_From_Table) rescue nil
|
|
75
|
+
def primary_Key_From_Table t
|
|
76
|
+
return unless t
|
|
72
77
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
78
|
+
column_name = @connection.schema_cache.primary_keys(t.name) ||
|
|
79
|
+
@connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
|
|
80
|
+
column_name ? t[column_name] : nil
|
|
81
|
+
end
|
|
76
82
|
end
|
|
77
83
|
end
|
|
78
84
|
end
|
|
85
|
+
rescue LoadError
|
|
86
|
+
rescue => e
|
|
87
|
+
e
|
|
79
88
|
end
|
|
80
|
-
rescue LoadError
|
|
81
|
-
rescue => e
|
|
82
|
-
e
|
|
83
89
|
end
|
data/version_v2.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: arel_extensions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.0.
|
|
4
|
+
version: 2.0.15
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Yann Azoury
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2020-12-
|
|
13
|
+
date: 2020-12-14 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: activerecord
|