sql_tracer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b316c860b3b917157a84b642ef34d1afa325523
-  data.tar.gz: 3376ca8a91e4283ed52b2d2600647edbf4f01305
+  metadata.gz: f21d52b8fc4e11295690f44a4a268c2e36a94cdb
+  data.tar.gz: a27c5ca3325849dad50e8eb1fb319927dc11de86
 SHA512:
-  metadata.gz: b90d4d27c095b9ef7a7a5fd0ccb650c952f318735c8eed092bfcfc233bb51138e34ff7a04940167afcefd9a6a8547b1e74a74747267a185433f35a6a9be86470
-  data.tar.gz: 00675f1e61f415a5731414315453840f055591e30d234197d18a988ca540d1e3b07bd8396a3276f75666a51f9cd73e5466230c25ed911e6c270486f43d390f57
+  metadata.gz: 2b7b8af5ef58e291457a4ad1d83526bbaf89a3bfe52fc68553f5ecd7a544f3b266d8edebc2351be7a5122efd6a829fd126d160c895177f1c95dc066c9f0e15b7
+  data.tar.gz: e83a0e5c7617ef3a4cba63b73146b7e65e7f6d3bfeac4f763d9a06795f11819d032a23f34896b291a5422d8756f8cef3893b4c73bdedba49d32bd40a2a97ca9b

data/app/assets/stylesheets/sql_tracer/style.css

@@ -155,6 +155,10 @@ a:active {
     word-break: break-all;
 }
 
+.filter_template {
+    padding-left: 20px;
+}
+
 .stack_info {
     word-break: break-all;
     /*padding-left: 40px;*/
@@ -168,6 +172,7 @@ a:active {
 #url_template,
 #sqls_template,
 #sql_template,
+#filter_template,
 #stack_info {
     display: none;
 }
@@ -190,3 +195,40 @@ a:active {
     from { transform: scale(1) rotate(0deg);}
     to { transform: scale(1) rotate(360deg);}
 }
+
+.filter_template input {
+    color: #373737;
+}
+
+/*for input */
+input[type=text], select {
+    width: 15%;
+    /*padding: 12px 20px;*/
+    /*margin: 8px 0;*/
+    /*display: inline-block;*/
+    /*border: 1px solid #ccc;*/
+    /*border-radius: 4px;*/
+    /*box-sizing: border-box;*/
+}
+
+input[type=submit]:hover {
+    background-color: #45a049;
+}
+
+input{
+    border: 1px solid #ccc;
+    /*padding: 7px 0px;*/
+    border-radius: 3px;
+    /*padding-left:5px;*/
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+    -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
+    -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+    transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s
+}
+input:focus{
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)
+}

data/app/views/sql_tracer/sql_tracer/index.html.erb

@@ -23,13 +23,13 @@
           </h1>
           <p>
             It helps you figure out what sqls are executed and trace method call stack, you can take a look at
-            <a class="btn btn-primary btn-xs" target="_blank" href="https://github.com/zhangqibupt/sql_tracer">
+            <a class="btn btn-primary btn-xs" target="_blank" href="https://git.dev.fwmrm.net/qzhang/sql_tracer">
               Read Me</a>
             to acquire more information.
           </p>
           <p>
             If you have any questions or improvement, please open a issue.
-            <a class="btn btn-primary btn-xs" target="_blank" href="https://github.com/zhangqibupt/sql_tracer/issues/new">
+            <a class="btn btn-primary btn-xs" target="_blank" href="https://git.dev.fwmrm.net/qzhang/sql_tracer/issues/new">
               New Issue
             </a>
           <p>
@@ -55,6 +55,19 @@
       </h4>
     </div>
   </div>
+
+  <div id="filter_template" class="panel-heading filter_template">
+    <h4 class="panel-title">
+      <label class="sql-filter-label" for="input-2">SQL:</label>
+      <input class="sql-filter-class" type="text">
+      <label class="path-filter-label" for="input-2">PATH:</label>
+      <input class="path-filter-class" type="text">
+      <input type="checkbox" class="sort_by_checkbox" value='db'> Sort by DB
+      <input type="checkbox" class="sort_by_checkbox" value='operator'> Sort by Operator
+      </a>
+    </h4>
+  </div>
+
   <div id="sql_template" class="panel-heading sql_template">
     <h4 class="panel-title">
       <a data-toggle="collapse" data-parent="#" href="#one-2" class="sql">
@@ -88,7 +101,7 @@
         }
       },
       complete: function() {
-        setTimeout("refresh()", 10000)
+        setTimeout("refresh()", 4000)
       }
     });
   }
@@ -107,6 +120,61 @@
     $sqls_template.attr("id", "");
 
     if (sqls && sqls.length > 0) {
+      var $filter_template = $("#filter_template").clone();
+      $filter_template.css("display", "block");
+
+
+      // Add Sort Action to Sort Checkboxes
+      let sortArray = [];
+      $filter_template.find(".sort_by_checkbox").on('click', function(e) {
+        if (e.target.checked) {
+          sortArray.push(e.target.value);
+        } else {
+          sortArray.splice(sortArray.indexOf(e.target.value), 1);
+        }
+
+        const compareArray = sortArray.concat('time');
+        var templates = $sqls_template.find(".sql_template");
+        templates.sort(function(a, b) {
+          var aSQL = $(a).find("a");
+          var bSQL = $(b).find("a");
+
+          for (var i = 0; i < compareArray.length; i++) {
+            if (String(aSQL.attr(compareArray[i])).toLowerCase() > String(bSQL.attr(compareArray[i])).toLowerCase()) {
+              return 1;
+            } else if (String(aSQL.attr(compareArray[i])).toLowerCase() < String(bSQL.attr(compareArray[i])).toLowerCase()) {
+              return -1;
+            }
+          }
+          return 0;
+        });
+
+        templates.each(function() {
+          $sqls_template.append(this);
+        });
+      });
+
+      // Add Filter Action to Filters
+      $filter_template.find("input").on('input', function(e) {
+        var sqlFilter = $filter_template.find(".sql-filter-class").val();
+        var pathFilter = $filter_template.find(".path-filter-class").val();
+
+        $.each($sqls_template.find(".sql_template"), function(index, template) {
+          if (!$(template).find("a").text().match(new RegExp(sqlFilter, "i")) || !$(template).next().find(".panel-body").text().match(new RegExp(pathFilter, "i"))
+          ) {
+            $(template).hide();
+            $(template).next().hide();
+          } else {
+            $(template).show();
+          }
+        });
+        $url_template.find("span").html($sqls_template.find(".sql_template:visible").size());
+      });
+
+
+      $sqls_template.append($filter_template);
+
+      // Build Dom from sqls
       $.each(sqls, function(index, sql_info) {
         var $stack_info = $("#stack_info").clone();
         $stack_info.attr("id", "");
@@ -114,8 +182,10 @@
 
         var $sql_template = $("#sql_template").clone();
         $sql_template.attr("id", "");
-        $sql_template.find("a").attr("href", "#");
-        $sql_template.find("a").html(sql_info.sql);
+        $sql_template.find("a").attr("db", sql_info.sql.db);
+        $sql_template.find("a").attr("operator", sql_info.sql.operator);
+        $sql_template.find("a").attr("time", sql_info.sql.time);
+        $sql_template.find("a").html(sql_info.sql.sql);
         $sql_template.find("a").click(function() {
           if ($stack_info.is(":visible")) {
             $sql_template.removeClass('active');

data/lib/sql_tracer/adapters/mysql2.rb

@@ -1,18 +1,16 @@
 require 'active_record/connection_adapters/mysql2_adapter'
 
-module SqlTracer
+module ActiveRecord::ConnectionAdapters
   module Mysql2SqlLogger
-    extend ActiveSupport::Concern
-    included do
-      alias_method :execute_without_sql_tracer, :execute
-
-      def execute(*args)
-        SqlTracer::SqlLogger.log_sql(args.first)
-        execute_without_sql_tracer(*args)
-      end
+    def execute(*args)
+      SqlTracer::SqlLogger.log_sql(args.first)
+      super(*args)
     end
   end
-end
 
-ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:include, SqlTracer::Mysql2SqlLogger)
+  class Mysql2Adapter
+    prepend Mysql2SqlLogger
+  end
+
+end
 

data/lib/sql_tracer/config.rb

@@ -1,8 +1,8 @@
 module SqlTracer
   module Config
     DEFAULTS = {
-      SQL_TRACER_SKIP_LIB_PATH: true, # method call paths in /.rvm directory won't be output, default true
-      SQL_TRACER_CONSOLE_OUTPUT_DISABLED: true, # sqls won't be output in back-end console if set to true
+      SQL_TRACER_SKIP_LIB_PATH: false, # method call paths in /.rvm directory won't be output, default true
+      SQL_TRACER_CONSOLE_OUTPUT_DISABLED: true, # sqls won't be output in back-end console if set to true, default false
       SQL_TRACER_OUTPUT_SELECT_SQL_ENABLED: false, # output select type sql. By default, only (insert|update|delete) sql will be output
       # sql which contains any element of this array won't be output
       SQL_TRACER_SQL_FILTER: [],

data/lib/sql_tracer/helper.rb

@@ -3,8 +3,8 @@ module SqlTracer
   class Helper
 
     class << self
-      def output_select_sql_enabled?
-        @output_select_sql_enabled ||= config.get(:SQL_TRACER_OUTPUT_SELECT_SQL_ENABLED)
+      def output_select_sql_disabled?
+        @output_select_sql_enabled ||= config.get(:SQL_TRACER_OUTPUT_SELECT_SQL_DISABLED)
       end
 
       def should_skip_lib?
@@ -13,17 +13,17 @@ module SqlTracer
 
       def should_skip_sql_by_keywords?(sql)
         @sql_keywords ||= config.get(:SQL_TRACER_SQL_FILTER)
-        @sql_keywords.any? { |keyword| sql.include?(keyword) }
+        @sql_keywords.present? && @sql_keywords.any? { |keyword| sql.include?(keyword) }
       end
 
       def should_skip_url_by_keywords?(url)
         @url_keywords ||= config.get(:SQL_TRACER_URL_FILTER)
-        @url_keywords.any? { |keyword| url.include?(keyword) }
+        @url_keywords.present? && @url_keywords.any? { |keyword| url.include?(keyword) }
       end
 
       def shoule_skip_path_by_keywords?(path)
         @path_keywords ||= build_path_filter
-        @path_keywords.any? { |keyword| path.include?(keyword) }
+        @path_keywords.present? && @path_keywords.any? { |keyword| path.include?(keyword) }
       end
 
       def disable_console_output?
@@ -32,7 +32,7 @@ module SqlTracer
 
       def should_output_sql?(sql)
         reg = 'insert|update|delete'
-        reg << '|select' if Helper.output_select_sql_enabled?
+        reg << '|select' unless Helper.output_select_sql_disabled?
         return sql =~ /^\s*(#{reg})\s/i && !Helper.should_skip_sql_by_keywords?(sql)
       end
 

data/lib/sql_tracer/sql_logger.rb

@@ -6,12 +6,31 @@ module SqlTracer
           backtrace = Thread.current.backtrace
           backtrace = Formatter.remove_filtered_path(backtrace)
           Formatter.print_all(sql, backtrace) unless Helper.disable_console_output?
-          SqlTracer::SqlStack.sql_stack << { :sql => sql, :stack => backtrace }
+
+          SqlTracer::SqlStack.sql_stack << { :sql => build_sql_struct(sql), :stack => backtrace }
         end
       rescue => e
         Rails.logger.error "Failed to log sql in SqlTracer. Error: #{e.message}"
         Rails.logger.error e.backtrace.join("\n")
       end
     end
+
+    def self.build_sql_struct(sql)
+      sql_struct = {
+        :sql => sql,
+        :operator => 'unknown',
+        :db => 'unknown',
+        :time => Time.now.to_f
+      }
+      puts
+      re = /^(insert into|update|delete|select)\s+(\S+)/i
+      begin
+        result = sql.scan(re)
+        sql_struct[:operator] = result[0][0]
+        sql_struct[:db] = result[0][1]
+      rescue
+      end
+      sql_struct
+    end
   end
 end

data/lib/sql_tracer/version.rb

@@ -1,3 +1,3 @@
 module SqlTracer
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: sql_tracer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
-- zhangqibupt
+- qzhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies: []
 description: It helps you figure out what sqls are executed and trace method call
   stack
 email:
-- zhangqibuptse@gmail.com
+- qzhang@freewheel.tv
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -35,7 +35,7 @@ files:
 - lib/sql_tracer/sql_logger.rb
 - lib/sql_tracer/sql_stack.rb
 - lib/sql_tracer/version.rb
-homepage: https://github.com/zhangqibupt/sql_tracer
+homepage: https://git.dev.fwmrm.net/qzhang/sql_tracer
 licenses: []
 metadata: {}
 post_install_message: 
@@ -59,4 +59,3 @@ signing_key:
 specification_version: 4
 summary: log backtrace when sql is executed
 test_files: []
-has_rdoc: