shiba 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: '0035975f2585607e2aa44f84064fa8ae1bcec4cfbfbf78831595d9de8c690779'
-  data.tar.gz: 3e7bc106fc1c90d3551837411d34f282814f3e8334e215b59dbb67485ff30461
+SHA1:
+  metadata.gz: b605c4306ab0ccc32f881973a7cea994b50db84a
+  data.tar.gz: c19790bf5c25d35b80973395e13cee7b644fdba3
 SHA512:
-  metadata.gz: c4dff81f128bfc76958f7fc71f26861e5e1594d64c79ec32ea8da8d2421d0a30574e24ad8c2255d38d45f5f0bf6ad30ec2248864b159ab30b6ebcba2c0cb352f
-  data.tar.gz: 4d1f746c8c7d5eedfe9708f4fea54b154c17e79c7c6bdbd91fa41994b6f4f32c1227a4511f9ad04d5a8d56747281835f9a47125a8c5b974366d27dd0ee62f4ce
+  metadata.gz: abad67fe6c72f8dbce81a10ccacdcd024ec6d9c3d1a9c55f463ecf6825b7a48ad77578a12ced06df67770675ff785f9b861d8444880c67789a980fa49e102393
+  data.tar.gz: fb92c8fbb81b39a925bcdc5a85f37a974fd938c000956d1c02a44bfd4c7730b306a32d57e12b1d95f1717e70095a3d1a14339938c919d1b698221370b2ebe5f3

data/.travis.yml

@@ -12,6 +12,11 @@ env:
   - SHIBA_TEST_ENV=test_postgres
   - SHIBA_TEST_ENV=test_mysql
 
+before_install:
+  - gem update --system
+  - gem install bundler
+
+
 before_script:
  - cp .travis/my.cnf ~/.my.cnf
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shiba (0.9.3)
+    shiba (0.9.4)
       activesupport
 
 GEM

data/lib/shiba/explain.rb

@@ -33,6 +33,14 @@ module Shiba
 
       if Shiba.connection.mysql?
         @rows = Shiba::Explain::MysqlExplain.new.transform_json(@explain_json['query_block'])
+
+        # For simple queries, use original table name rather than the alias
+        if @select_fields.keys.size == 1
+          table = @select_fields.keys.first
+          if @rows.first['table'] != table
+            @rows.first['table'] = table
+          end
+        end
       else
         @rows = Shiba::Explain::PostgresExplain.new(@explain_json).transform
       end

data/lib/shiba/index_stats.rb

@@ -13,6 +13,15 @@ module Shiba
       @tables.any?
     end
 
+    # case insenstive table match
+    def find_table(name)
+      table = @tables[name]
+      return table if table
+
+      _, table = @tables.detect { |k,_| k.casecmp(name).zero? }
+      return table
+    end
+
     Table = Struct.new(:name, :count, :indexes) do
       def encode_with(coder)
         if self.count.nil?
@@ -138,11 +147,11 @@ module Shiba
     attr_reader :tables
 
     def table_count(table)
-      return @tables[table].count if @tables[table]
+      return find_table(table).count if find_table(table)
     end
 
     def fetch_index(table, name)
-      tbl = @tables[table]
+      tbl = find_table(table)
       return nil unless tbl
 
       tbl.indexes[name]
@@ -158,7 +167,7 @@ module Shiba
     end
 
     def get_column_size(table_name, column)
-      table = @tables[table_name]
+      table = find_table(table_name)
       return nil unless table
 
       table.column_sizes[column]

data/lib/shiba/parsers/mysql_select_fields.rb

@@ -2,6 +2,7 @@ require 'shiba/parsers/shiba_string_scanner'
 
 module Shiba
   module Parsers
+    # Extracts table name and columns from queries formatted by 'show warnings'.
     class MysqlSelectFields
       def initialize(sql)
         @sql = sql
@@ -66,6 +67,18 @@ module Shiba
 
           sc.scan(/,/)
         end
+
+        # resolve table aliases
+        if sc.scan(/ `.*?`\.`(.*?)` `(.*?)`/)
+          table       = sc[1]
+          table_alias = sc[2]
+
+          if tables[table_alias]
+            tables[table] = tables[table_alias]
+            tables.delete(table_alias)
+          end
+        end
+
         tables
       end
     end

data/lib/shiba/version.rb

@@ -1,3 +1,3 @@
 module Shiba
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shiba
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Ben Osheroff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,10 +160,9 @@ files:
 - shiba.gemspec
 - shiba.yml.example
 - web/babel.config.js
-- web/dist/example_data.json
 - web/dist/index.html
-- web/dist/js/app.91a7529a.js
-- web/dist/js/app.91a7529a.js.map
+- web/dist/js/app.bca3a322.js
+- web/dist/js/app.bca3a322.js.map
 - web/package-lock.json
 - web/package.json
 - web/public/index.html
@@ -198,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Catch bad SQL queries before they cause problems in production