marginalia 1.1.1 → 1.1.2
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of marginalia might be problematic. Click here for more details.
- data/lib/marginalia.rb +4 -2
- data/marginalia.gemspec +1 -1
- metadata +15 -15
data/lib/marginalia.rb
CHANGED
|
@@ -11,7 +11,9 @@ module Marginalia
|
|
|
11
11
|
if defined? :execute
|
|
12
12
|
alias_method :execute_without_marginalia, :execute
|
|
13
13
|
alias_method :execute, :execute_with_marginalia
|
|
14
|
-
|
|
14
|
+
end
|
|
15
|
+
|
|
16
|
+
if defined? :exec_query
|
|
15
17
|
alias_method :exec_query_without_marginalia, :exec_query
|
|
16
18
|
alias_method :exec_query, :exec_query_with_marginalia
|
|
17
19
|
end
|
|
@@ -20,7 +22,7 @@ module Marginalia
|
|
|
20
22
|
|
|
21
23
|
def annotate_sql(sql)
|
|
22
24
|
comment = Marginalia::Comment.construct_comment
|
|
23
|
-
if comment.present?
|
|
25
|
+
if comment.present? && !sql.match(comment)
|
|
24
26
|
"#{sql} /*#{comment}*/"
|
|
25
27
|
else
|
|
26
28
|
sql
|
data/marginalia.gemspec
CHANGED
|
@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
|
|
|
8
8
|
gem.test_files = `git ls-files -- {test}/*`.split("\n")
|
|
9
9
|
gem.name = "marginalia"
|
|
10
10
|
gem.require_paths = ["lib"]
|
|
11
|
-
gem.version = "1.1.
|
|
11
|
+
gem.version = "1.1.2"
|
|
12
12
|
|
|
13
13
|
gem.add_runtime_dependency "actionpack", ">= 2.3", "< 3.3"
|
|
14
14
|
gem.add_runtime_dependency "activerecord", ">= 2.3", "< 3.3"
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: marginalia
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -15,7 +15,7 @@ date: 2013-03-16 00:00:00.000000000 Z
|
|
|
15
15
|
dependencies:
|
|
16
16
|
- !ruby/object:Gem::Dependency
|
|
17
17
|
name: actionpack
|
|
18
|
-
requirement: &
|
|
18
|
+
requirement: &8114020 !ruby/object:Gem::Requirement
|
|
19
19
|
none: false
|
|
20
20
|
requirements:
|
|
21
21
|
- - ! '>='
|
|
@@ -26,10 +26,10 @@ dependencies:
|
|
|
26
26
|
version: '3.3'
|
|
27
27
|
type: :runtime
|
|
28
28
|
prerelease: false
|
|
29
|
-
version_requirements: *
|
|
29
|
+
version_requirements: *8114020
|
|
30
30
|
- !ruby/object:Gem::Dependency
|
|
31
31
|
name: activerecord
|
|
32
|
-
requirement: &
|
|
32
|
+
requirement: &8111760 !ruby/object:Gem::Requirement
|
|
33
33
|
none: false
|
|
34
34
|
requirements:
|
|
35
35
|
- - ! '>='
|
|
@@ -40,10 +40,10 @@ dependencies:
|
|
|
40
40
|
version: '3.3'
|
|
41
41
|
type: :runtime
|
|
42
42
|
prerelease: false
|
|
43
|
-
version_requirements: *
|
|
43
|
+
version_requirements: *8111760
|
|
44
44
|
- !ruby/object:Gem::Dependency
|
|
45
45
|
name: rake
|
|
46
|
-
requirement: &
|
|
46
|
+
requirement: &8110740 !ruby/object:Gem::Requirement
|
|
47
47
|
none: false
|
|
48
48
|
requirements:
|
|
49
49
|
- - ! '>='
|
|
@@ -51,10 +51,10 @@ dependencies:
|
|
|
51
51
|
version: '0'
|
|
52
52
|
type: :development
|
|
53
53
|
prerelease: false
|
|
54
|
-
version_requirements: *
|
|
54
|
+
version_requirements: *8110740
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: mysql
|
|
57
|
-
requirement: &
|
|
57
|
+
requirement: &8109440 !ruby/object:Gem::Requirement
|
|
58
58
|
none: false
|
|
59
59
|
requirements:
|
|
60
60
|
- - ! '>='
|
|
@@ -62,10 +62,10 @@ dependencies:
|
|
|
62
62
|
version: '0'
|
|
63
63
|
type: :development
|
|
64
64
|
prerelease: false
|
|
65
|
-
version_requirements: *
|
|
65
|
+
version_requirements: *8109440
|
|
66
66
|
- !ruby/object:Gem::Dependency
|
|
67
67
|
name: mysql2
|
|
68
|
-
requirement: &
|
|
68
|
+
requirement: &8108580 !ruby/object:Gem::Requirement
|
|
69
69
|
none: false
|
|
70
70
|
requirements:
|
|
71
71
|
- - ! '>='
|
|
@@ -73,10 +73,10 @@ dependencies:
|
|
|
73
73
|
version: '0'
|
|
74
74
|
type: :development
|
|
75
75
|
prerelease: false
|
|
76
|
-
version_requirements: *
|
|
76
|
+
version_requirements: *8108580
|
|
77
77
|
- !ruby/object:Gem::Dependency
|
|
78
78
|
name: pg
|
|
79
|
-
requirement: &
|
|
79
|
+
requirement: &10963780 !ruby/object:Gem::Requirement
|
|
80
80
|
none: false
|
|
81
81
|
requirements:
|
|
82
82
|
- - ! '>='
|
|
@@ -84,10 +84,10 @@ dependencies:
|
|
|
84
84
|
version: '0'
|
|
85
85
|
type: :development
|
|
86
86
|
prerelease: false
|
|
87
|
-
version_requirements: *
|
|
87
|
+
version_requirements: *10963780
|
|
88
88
|
- !ruby/object:Gem::Dependency
|
|
89
89
|
name: sqlite3
|
|
90
|
-
requirement: &
|
|
90
|
+
requirement: &10962640 !ruby/object:Gem::Requirement
|
|
91
91
|
none: false
|
|
92
92
|
requirements:
|
|
93
93
|
- - ! '>='
|
|
@@ -95,7 +95,7 @@ dependencies:
|
|
|
95
95
|
version: '0'
|
|
96
96
|
type: :development
|
|
97
97
|
prerelease: false
|
|
98
|
-
version_requirements: *
|
|
98
|
+
version_requirements: *10962640
|
|
99
99
|
description:
|
|
100
100
|
email:
|
|
101
101
|
- noah@37signals.com
|