niceql 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 646d8fcc2c3fa42bacdef1e4de6a86dd63c3aea9
-  data.tar.gz: 1ca41e47438ed32b4085e3bb4c7e7e2364ec0c39
+  metadata.gz: e7919448f67585220d4fd6aaa4fd779558acf89c
+  data.tar.gz: 6c6ee86d5794ccaed63eade5c6cd0c6eb1d9abaa
 SHA512:
-  metadata.gz: df6a132d674f8afc0d95d2596043b93c87a01e38ef1ffadea72fd80a02318f20bb6bc1657334b1f3b63e7458a61ae906940c7892e23f2023e8a86882acc1e2f9
-  data.tar.gz: 1e5039d4c982d4aa3fa00f816dab4b181edcfdcc13ddd0599287671038b7b40a9fe7f4aabf1f15120358578e1b53d9304f539ee19697f62a3c9d4747e2e028d7
+  metadata.gz: 7abca0d3a40cfdc74105631f3996f87691deb49db0c8580db00a07f42cc480c99700802092d11d03e3f94346da23d29986df9af028902a42a6cf9a1598be8861
+  data.tar.gz: c320c6ad90c99b1b3621aa88c6fa88e8af1655f5eeb18746e7218e3eac6bab1dd722f7d0011314820f3ee69b816b49e34d080e7a1a5bf529e0c65dd4ec3d28a2

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 0.1.15
+* JOIN verb refactored, INNER|OUTER will be also colored properly
+* prettify_active_record_log_output added to config, now you can set it to true 
+  and sql will log prettified

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/niceql.rb

@@ -34,7 +34,7 @@ module Niceql
 
   module Prettifier
     INLINE_VERBS = %w(WITH ASC IN COALESCE AS WHEN THEN ELSE END AND UNION ALL WITH ON DISTINCT INTERSECT EXCEPT EXISTS NOT COUNT ROUND CAST).join('| ')
-    NEW_LINE_VERBS = 'SELECT|FROM|WHERE|CASE|ORDER BY|LIMIT|GROUP BY|LEFT JOIN|RIGHT JOIN|JOIN|HAVING|OFFSET|UPDATE'
+    NEW_LINE_VERBS = 'SELECT|FROM|WHERE|CASE|ORDER BY|LIMIT|GROUP BY|(RIGHT |LEFT )*(INNER |OUTER )*JOIN|HAVING|OFFSET|UPDATE'
     POSSIBLE_INLINER = /(ORDER BY|CASE)/
     VERBS = "#{INLINE_VERBS}|#{NEW_LINE_VERBS}"
     STRINGS = /("[^"]+")|('[^']+')/
@@ -95,7 +95,7 @@ module Niceql
       #it's better to remove all new lines because it will break formatting
       sql = sql.gsub("\n", ' ')
       # remove any additional formatting
-      sql = sql.gsub(/[ ]+/, ' ')
+      sql = sql.gsub(/[\s]+/, ' ')
 
       sql = sql.gsub(STRINGS){ |str| StringColorize.colorize_str(str) } if colorize
       first_verb  = true
@@ -137,6 +137,15 @@ module Niceql
     end
   end
 
+  module AbstractAdapterLogPrettifier
+    def log( sql, *args, &block )
+      # \n need to be placed because AR log will start with action description + time info.
+      # rescue sql - just to be sure Prettifier didn't break production
+      formatted_sql = "\n" + Prettifier.prettify_sql(sql, false) rescue sql
+      super( formatted_sql, *args, &block )
+    end
+  end
+
   module ErrorExt
     def to_s
       if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'postgresql'
@@ -148,16 +157,16 @@ module Niceql
   end
 
   class NiceQLConfig
-    attr_accessor :pg_adapter_with_nicesql
-
-    attr_accessor :indentation_base
-
-    attr_accessor :open_bracket_is_newliner
+    attr_accessor :pg_adapter_with_nicesql,
+                  :indentation_base,
+                  :open_bracket_is_newliner,
+                  :prettify_active_record_log_output
 
     def initialize
       self.pg_adapter_with_nicesql = false
       self.indentation_base = 2
       self.open_bracket_is_newliner = false
+      self.prettify_active_record_log_output = false
     end
   end
 
@@ -167,6 +176,8 @@ module Niceql
 
     if config.pg_adapter_with_nicesql
       ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL)
+    elsif config.prettify_active_record_log_output
+      ::ActiveRecord::ConnectionAdapters::AbstractAdapter.prepend( AbstractAdapterLogPrettifier )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: This is simple and nice sql prettifier, it splits, indent and colorize SQL