niceql 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e17e9e56ddebb633c9ff0051e0fc400842f030a9d89236d484107dbf55389d
-  data.tar.gz: a80a5c8720b2da17f44e37e56a4543360e1424fad18c67d869ca466bbe19c0e0
+  metadata.gz: 126874d18a0ec3ce725d5f62a63a0cc57012cee9d5268eb189f060d2d1e0b6d0
+  data.tar.gz: '090a0208059e848eda15e721857238c9916a97527e75b672e5216c30b3745ed9'
 SHA512:
-  metadata.gz: 83302f8bff5ec7942338b93ec77739948606a34a85480e38ee19b16785391081d99865b6f31dd86ede787aef17061d0918bb8c77cb3eb84aa2bca3030bce30a2
-  data.tar.gz: 3ab3a19673a3e6d47d1d344c38bb42717526ca84e39a999c7933a15cfbaf07a361c6b7789089f3bc4c0dcb224d2d596050141ee460c5c6d3a532ea240505450a
+  metadata.gz: 400ee6d267eb95de34d1c1e018fceaab42dac6054f08d4bbe90c45c4ea7c366855c45da67b0f3d963d880893e21cbcb70117aa46f7ffe3aff8eacce1aa5d8f75
+  data.tar.gz: 7417f1ddf85cb2959f8eb59a6997154f721dc7696ca66caf60d16b095f7390e17233915680fa176b455a761b135582b76c085ae92b0d89fb53d6a2043c36fc1e

data/CHANGELOG.md

@@ -1,7 +1,10 @@
+# 0.5.1
+* No features just some code refactoring
+
 # 0.5.0
 * BREAKING CHANGE! ActiveRecord compatibility extracted to the rails_sql_prettifier gem! 
   If you need niceql funcitonality with rails / active_record plz include rails_sql_prettifier has a 
-  a versioning aligned to the active_record versions and has same DSL for AR niceql provide prior.  
+  a versioning aligned to the active_record versions and has same DSL for ActiveRecord the niceql was providing prior.  
 
 # 0.4.1
 * description update 

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/niceql.rb

@@ -62,36 +62,31 @@ module Niceql
       # don't mess with original sql query, or prettify_pg_err will deliver incorrect results
       def prettify_pg_err(err, original_sql_query = nil)
         return err if err[/LINE \d+/].nil?
-        err_line_num = err[/LINE \d+/][5..-1].to_i
+        # LINE 2: ... -> err_line_num = 2
+        err_line_num = err.match(/LINE (\d+):/)[1].to_i
         # LINE 1: SELECT usr FROM users ORDER BY 1
         err_address_line = err.lines[1]
 
-        start_sql_line = 3 if err.lines.length <= 3
+        sql_start_line_num = 3 if err.lines.length <= 3
         # error not always contains HINT
-        start_sql_line ||= err.lines[3][/(HINT|DETAIL)/] ? 4 : 3
-        sql_body = start_sql_line < err.lines.length ? err.lines[start_sql_line..-1] : original_sql_query&.lines
+        sql_start_line_num ||= err.lines[3][/(HINT|DETAIL)/] ? 4 : 3
+        sql_body_lines = sql_start_line_num < err.lines.length ? err.lines[sql_start_line_num..-1] : original_sql_query&.lines
 
         # this means original query is missing so it's nothing to prettify
-        return err unless sql_body
+        return err unless sql_body_lines
 
-        # err line will be painted in red completely, so we just remembering it and use
-        # to replace after painting the verbs
-        err_line = sql_body[err_line_num - 1]
+        # this is an SQL line with an error.
+        # we need err_line to properly align the caret in the caret line
+        # and to apply a full red colorizing schema on an SQL line with error
+        err_line = sql_body_lines[err_line_num - 1]
 
+        #colorizing verbs, strings and error line
+        err_body = sql_body_lines.map { |ln| ln == err_line ? StringColorize.colorize_err( ln ) : colorize_err_line(ln) }
 
-        #colorizing verbs and strings
-        colorized_sql_body = sql_body.join.gsub(/#{VERBS}/ ) { |verb| StringColorize.colorize_verb(verb) }
-          .gsub(STRINGS){ |str| StringColorize.colorize_str(str) }
-
-        #reassemling error message
-        err_body = colorized_sql_body.lines
-        # replacing colorized line contained error and adding caret line
-        err_body[err_line_num - 1]= StringColorize.colorize_err( err_line )
-
-        err_caret_line = extract_err_caret_line( err_address_line, err_line, sql_body, err )
+        err_caret_line = extract_err_caret_line( err_address_line, err_line, sql_body_lines, err )
         err_body.insert( err_line_num, StringColorize.colorize_err( err_caret_line ) )
 
-        err.lines[0..start_sql_line-1].join + err_body.join
+        err.lines[0..sql_start_line_num-1].join + err_body.join
       end
 
       def prettify_sql( sql, colorize = true )
@@ -183,7 +178,11 @@ module Niceql
         end
       end
 
-      private_class_method
+      def colorize_err_line( line )
+        line.gsub(/#{VERBS}/ ) { |verb| StringColorize.colorize_verb(verb) }
+          .gsub(STRINGS) { |str| StringColorize.colorize_str(str) }
+      end
+
       def extract_err_caret_line( err_address_line, err_line, sql_body, err )
         # LINE could be quoted ( both sides and sometimes only from one ):
         # "LINE 1: ...t_id\" = $13 AND \"products\".\"carrier_id\" = $14 AND \"product_t...\n",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - alekseyl