sql_origin 1.1.0 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +15 -0
  2. data/Gemfile.lock +118 -69
  3. data/VERSION +1 -1
  4. data/lib/sql_origin.rb +1 -1
  5. data/lib/sql_origin/hooks.rb +7 -6
  6. data/sql_origin.gemspec +6 -5
  7. metadata +5 -20
checksums.yaml ADDED
@@ -0,0 +1,15 @@
1
+ ---
2
+ !binary "U0hBMQ==":
3
+ metadata.gz: !binary |-
4
+ ZmJhOTBkMjQ1NjM2YThlNjRiMGMyNWRkYmU0MjBkODU4ZGE1NDJhZg==
5
+ data.tar.gz: !binary |-
6
+ N2Y3Y2Y0ZjgzMDkxNWFkN2IyNGNhODgyNmUzNDI0MGYwZTYxOTNmNQ==
7
+ SHA512:
8
+ metadata.gz: !binary |-
9
+ NmVjZTFmNzExN2EwMjI5NGJjMjMyMzBkNWNjYmI2OGYzM2NjNGZjYjRlOWU4
10
+ YzI1MzBlNzQwMzdjZDZlNTFjMDc2NWU2NDhjMGU2NjBjNGU0MGU0ZmU3ZTFk
11
+ OGRhZWEzZmNjZmJjNDM4YzA4MWE1MWY2NzhmNzkzYmVkYzg4OTc=
12
+ data.tar.gz: !binary |-
13
+ MDFjMzEwMGIwMGYxNDQyOGNkYzRmOTQ2NGFjYTc4YTNhNGU2NWY0NzllNzIx
14
+ MmFiZGIwMTYxZDNjNjM2MzFlODc2YjgxYmE2NWYzZmFjOTMwYmU5YWIyN2Yw
15
+ NThiM2Q4ZGI2OTA2MjViNmQ0MGJkMWYwOGE1ZDQzMWFiMGQ3MWU=
data/Gemfile.lock CHANGED
@@ -1,88 +1,134 @@
1
1
  GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
- actionmailer (4.0.0)
5
- actionpack (= 4.0.0)
6
- mail (~> 2.5.3)
7
- actionpack (4.0.0)
8
- activesupport (= 4.0.0)
9
- builder (~> 3.1.0)
10
- erubis (~> 2.7.0)
11
- rack (~> 1.5.2)
4
+ actionmailer (4.2.4)
5
+ actionpack (= 4.2.4)
6
+ actionview (= 4.2.4)
7
+ activejob (= 4.2.4)
8
+ mail (~> 2.5, >= 2.5.4)
9
+ rails-dom-testing (~> 1.0, >= 1.0.5)
10
+ actionpack (4.2.4)
11
+ actionview (= 4.2.4)
12
+ activesupport (= 4.2.4)
13
+ rack (~> 1.6)
12
14
  rack-test (~> 0.6.2)
13
- activemodel (4.0.0)
14
- activesupport (= 4.0.0)
15
- builder (~> 3.1.0)
16
- activerecord (4.0.0)
17
- activemodel (= 4.0.0)
18
- activerecord-deprecated_finders (~> 1.0.2)
19
- activesupport (= 4.0.0)
20
- arel (~> 4.0.0)
21
- activerecord-deprecated_finders (1.0.3)
22
- activesupport (4.0.0)
23
- i18n (~> 0.6, >= 0.6.4)
24
- minitest (~> 4.2)
25
- multi_json (~> 1.3)
26
- thread_safe (~> 0.1)
27
- tzinfo (~> 0.3.37)
28
- arel (4.0.0)
29
- atomic (1.1.9)
30
- builder (3.1.4)
15
+ rails-dom-testing (~> 1.0, >= 1.0.5)
16
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
17
+ actionview (4.2.4)
18
+ activesupport (= 4.2.4)
19
+ builder (~> 3.1)
20
+ erubis (~> 2.7.0)
21
+ rails-dom-testing (~> 1.0, >= 1.0.5)
22
+ rails-html-sanitizer (~> 1.0, >= 1.0.2)
23
+ activejob (4.2.4)
24
+ activesupport (= 4.2.4)
25
+ globalid (>= 0.3.0)
26
+ activemodel (4.2.4)
27
+ activesupport (= 4.2.4)
28
+ builder (~> 3.1)
29
+ activerecord (4.2.4)
30
+ activemodel (= 4.2.4)
31
+ activesupport (= 4.2.4)
32
+ arel (~> 6.0)
33
+ activesupport (4.2.4)
34
+ i18n (~> 0.7)
35
+ json (~> 1.7, >= 1.7.7)
36
+ minitest (~> 5.1)
37
+ thread_safe (~> 0.3, >= 0.3.4)
38
+ tzinfo (~> 1.1)
39
+ addressable (2.3.8)
40
+ arel (6.0.3)
41
+ builder (3.2.2)
42
+ descendants_tracker (0.0.4)
43
+ thread_safe (~> 0.3, >= 0.3.1)
31
44
  erubis (2.7.0)
32
- git (1.2.5)
33
- hike (1.2.3)
34
- i18n (0.6.4)
35
- jeweler (1.8.4)
36
- bundler (~> 1.0)
45
+ faraday (0.9.1)
46
+ multipart-post (>= 1.2, < 3)
47
+ git (1.2.9.1)
48
+ github_api (0.12.4)
49
+ addressable (~> 2.3)
50
+ descendants_tracker (~> 0.0.4)
51
+ faraday (~> 0.8, < 0.10)
52
+ hashie (>= 3.4)
53
+ multi_json (>= 1.7.5, < 2.0)
54
+ nokogiri (~> 1.6.6)
55
+ oauth2
56
+ globalid (0.3.6)
57
+ activesupport (>= 4.1.0)
58
+ hashie (3.4.2)
59
+ highline (1.7.3)
60
+ i18n (0.7.0)
61
+ jeweler (2.0.1)
62
+ builder
63
+ bundler (>= 1.0)
37
64
  git (>= 1.2.5)
65
+ github_api
66
+ highline (>= 1.6.15)
67
+ nokogiri (>= 1.5.10)
38
68
  rake
39
69
  rdoc
40
- json (1.8.0)
41
- mail (2.5.4)
42
- mime-types (~> 1.16)
43
- treetop (~> 1.4.8)
44
- mime-types (1.23)
45
- minitest (4.7.5)
46
- multi_json (1.7.7)
47
- polyglot (0.3.3)
48
- rack (1.5.2)
49
- rack-test (0.6.2)
70
+ json (1.8.3)
71
+ jwt (1.5.1)
72
+ loofah (2.0.3)
73
+ nokogiri (>= 1.5.9)
74
+ mail (2.6.3)
75
+ mime-types (>= 1.16, < 3)
76
+ mime-types (2.6.1)
77
+ mini_portile (0.6.2)
78
+ minitest (5.8.0)
79
+ multi_json (1.11.2)
80
+ multi_xml (0.5.5)
81
+ multipart-post (2.0.0)
82
+ nokogiri (1.6.6.2)
83
+ mini_portile (~> 0.6.0)
84
+ oauth2 (1.0.0)
85
+ faraday (>= 0.8, < 0.10)
86
+ jwt (~> 1.0)
87
+ multi_json (~> 1.3)
88
+ multi_xml (~> 0.5)
89
+ rack (~> 1.2)
90
+ rack (1.6.4)
91
+ rack-test (0.6.3)
50
92
  rack (>= 1.0)
51
- rails (4.0.0)
52
- actionmailer (= 4.0.0)
53
- actionpack (= 4.0.0)
54
- activerecord (= 4.0.0)
55
- activesupport (= 4.0.0)
93
+ rails (4.2.4)
94
+ actionmailer (= 4.2.4)
95
+ actionpack (= 4.2.4)
96
+ actionview (= 4.2.4)
97
+ activejob (= 4.2.4)
98
+ activemodel (= 4.2.4)
99
+ activerecord (= 4.2.4)
100
+ activesupport (= 4.2.4)
56
101
  bundler (>= 1.3.0, < 2.0)
57
- railties (= 4.0.0)
58
- sprockets-rails (~> 2.0.0)
59
- railties (4.0.0)
60
- actionpack (= 4.0.0)
61
- activesupport (= 4.0.0)
102
+ railties (= 4.2.4)
103
+ sprockets-rails
104
+ rails-deprecated_sanitizer (1.0.3)
105
+ activesupport (>= 4.2.0.alpha)
106
+ rails-dom-testing (1.0.7)
107
+ activesupport (>= 4.2.0.beta, < 5.0)
108
+ nokogiri (~> 1.6.0)
109
+ rails-deprecated_sanitizer (>= 1.0.1)
110
+ rails-html-sanitizer (1.0.2)
111
+ loofah (~> 2.0)
112
+ railties (4.2.4)
113
+ actionpack (= 4.2.4)
114
+ activesupport (= 4.2.4)
62
115
  rake (>= 0.8.7)
63
116
  thor (>= 0.18.1, < 2.0)
64
- rake (10.1.0)
65
- rdoc (4.0.1)
117
+ rake (10.4.2)
118
+ rdoc (4.2.0)
66
119
  json (~> 1.4)
67
- redcarpet (2.3.0)
68
- sprockets (2.10.0)
69
- hike (~> 1.2)
70
- multi_json (~> 1.0)
120
+ redcarpet (3.3.2)
121
+ sprockets (3.3.3)
71
122
  rack (~> 1.0)
72
- tilt (~> 1.1, != 1.3.0)
73
- sprockets-rails (2.0.0)
123
+ sprockets-rails (2.3.2)
74
124
  actionpack (>= 3.0)
75
125
  activesupport (>= 3.0)
76
- sprockets (~> 2.8)
77
- thor (0.18.1)
78
- thread_safe (0.1.0)
79
- atomic
80
- tilt (1.4.1)
81
- treetop (1.4.14)
82
- polyglot
83
- polyglot (>= 0.3.1)
84
- tzinfo (0.3.37)
85
- yard (0.8.6.1)
126
+ sprockets (>= 2.8, < 4.0)
127
+ thor (0.19.1)
128
+ thread_safe (0.3.5)
129
+ tzinfo (1.2.2)
130
+ thread_safe (~> 0.1)
131
+ yard (0.8.7.6)
86
132
 
87
133
  PLATFORMS
88
134
  ruby
@@ -93,3 +139,6 @@ DEPENDENCIES
93
139
  rails (>= 4.0)
94
140
  redcarpet
95
141
  yard
142
+
143
+ BUNDLED WITH
144
+ 1.10.6
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.0
1
+ 1.1.2
data/lib/sql_origin.rb CHANGED
@@ -21,7 +21,7 @@ module SQLOrigin
21
21
  # Enables SQL:Origin backtrace logging to the Rails log.
22
22
 
23
23
  def self.append_to_log
24
- %w( PostgreSQLAdapter MysqlAdapter Mysql2Adapter OracleAdapter SQLiteAdapter ).each do |name|
24
+ %w( PostgreSQLAdapter MysqlAdapter Mysql2Adapter OracleAdapter SQLiteAdapter SQLite3Adapter ).each do |name|
25
25
  adapter = ActiveRecord::ConnectionAdapters.const_get(name.to_sym) rescue nil
26
26
  if adapter
27
27
  adapter.send :include, SQLOrigin::LogHook
data/lib/sql_origin/hooks.rb CHANGED
@@ -1,14 +1,15 @@
1
1
  module SQLOrigin
2
2
  # @private
3
3
  module LogHook
4
- def log(sql, name = "SQL", binds = [])
4
+ def log(sql, name = "SQL", binds = [], statement_name = nil)
5
5
  @instrumenter.instrument(
6
6
  "sql.active_record",
7
- :sql => sql,
8
- :name => name,
9
- :connection_id => object_id,
10
- :binds => binds,
11
- :backtrace => SQLOrigin.filtered_backtrace[0, 3]) { yield }
7
+ :sql => sql,
8
+ :name => name,
9
+ :connection_id => object_id,
10
+ :binds => binds,
11
+ :statement_name => statement_name,
12
+ :backtrace => SQLOrigin.filtered_backtrace[0, 3]) { yield }
12
13
  rescue Exception => e
13
14
  message = "#{e.class.name}: #{e.message}: #{sql}"
14
15
  @logger.debug message if @logger
data/sql_origin.gemspec CHANGED
@@ -2,14 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
+ # stub: sql_origin 1.1.2 ruby lib
5
6
 
6
7
  Gem::Specification.new do |s|
7
8
  s.name = "sql_origin"
8
- s.version = "1.1.0"
9
+ s.version = "1.1.2"
9
10
 
10
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
+ s.require_paths = ["lib"]
11
13
  s.authors = ["Tim Morgan"]
12
- s.date = "2013-06-26"
14
+ s.date = "2015-08-25"
13
15
  s.description = "Ever wonder where a SQL query comes from? This gem lets you add abbreviated backtraces to those queries, either in the query log, or as a comment in the query itself."
14
16
  s.email = "rubygems@timothymorgan.info"
15
17
  s.extra_rdoc_files = [
@@ -32,12 +34,11 @@ Gem::Specification.new do |s|
32
34
  ]
33
35
  s.homepage = "http://github.com/RISCfuture/sql_origin"
34
36
  s.licenses = ["MIT"]
35
- s.require_paths = ["lib"]
36
- s.rubygems_version = "1.8.25"
37
+ s.rubygems_version = "2.4.8"
37
38
  s.summary = "Add backtraces to your query log and queries themselves."
38
39
 
39
40
  if s.respond_to? :specification_version then
40
- s.specification_version = 3
41
+ s.specification_version = 4
41
42
 
42
43
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
43
44
  s.add_runtime_dependency(%q<rails>, [">= 4.0"])
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sql_origin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
5
- prerelease:
4
+ version: 1.1.2
6
5
  platform: ruby
7
6
  authors:
8
7
  - Tim Morgan
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2013-06-26 00:00:00.000000000 Z
11
+ date: 2015-08-25 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ! '>='
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ! '>='
28
25
  - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: yard
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
31
  - - ! '>='
36
32
  - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
38
34
  type: :development
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
38
  - - ! '>='
44
39
  - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: redcarpet
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ! '>='
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :development
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ! '>='
60
53
  - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: bundler
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
59
  - - ! '>='
68
60
  - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
70
62
  type: :development
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
66
  - - ! '>='
76
67
  - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: jeweler
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
73
  - - ! '>='
84
74
  - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
86
76
  type: :development
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
80
  - - ! '>='
92
81
  - !ruby/object:Gem::Version
@@ -116,29 +105,25 @@ files:
116
105
  homepage: http://github.com/RISCfuture/sql_origin
117
106
  licenses:
118
107
  - MIT
108
+ metadata: {}
119
109
  post_install_message:
120
110
  rdoc_options: []
121
111
  require_paths:
122
112
  - lib
123
113
  required_ruby_version: !ruby/object:Gem::Requirement
124
- none: false
125
114
  requirements:
126
115
  - - ! '>='
127
116
  - !ruby/object:Gem::Version
128
117
  version: '0'
129
- segments:
130
- - 0
131
- hash: -3377337824874064441
132
118
  required_rubygems_version: !ruby/object:Gem::Requirement
133
- none: false
134
119
  requirements:
135
120
  - - ! '>='
136
121
  - !ruby/object:Gem::Version
137
122
  version: '0'
138
123
  requirements: []
139
124
  rubyforge_project:
140
- rubygems_version: 1.8.25
125
+ rubygems_version: 2.4.8
141
126
  signing_key:
142
- specification_version: 3
127
+ specification_version: 4
143
128
  summary: Add backtraces to your query log and queries themselves.
144
129
  test_files: []