niceql 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1abb2f5e4e5f877461b9ffc00fdd4c443be900e
-  data.tar.gz: a14bdab780abdb5f9f70b7f3830787a193900d6e
+  metadata.gz: ceaa44117d9161231f6695b7d28b4819929cac6c
+  data.tar.gz: 74f5e28868936976ce3dbabf15b55d4384758b05
 SHA512:
-  metadata.gz: b15bfd9c83732a44df015a9c04c19698fddc1c4dc8a036b879499de8771c0d2c1991f2ca283e8a001837db005cbf9d81bd3bb08ed7dd3ad12714a397b4a9a162
-  data.tar.gz: 9ac6a5b8dbb7d70f9935fc8c6f750178d14371d507179cc59c1ae3f792206cf8e4028593d1a9079f883c1d9cf31dfcba4a5ef1a62561c2dac614bf7cbe0ed729
+  metadata.gz: 5f15980214bed358db1f6f4ecd3e5c96c998e9099452cdadc9134c5a3877f5279b5735ef353a91f850a2083292d64ec8b3ed49fd93c19cb990bb308e8b884f9b
+  data.tar.gz: 6adb2d6a14763db2732966529bd6d93830a375510f96f13f83074c36718e2dea45daef01af0ecb1fa02c5b950d52aed492bb96b3b886de6bf78fe4d1af5165e8

data/README.md

@@ -46,7 +46,9 @@ Or install it yourself as:
   Model.scope.to_niceql
   
   # prettify PG errors 
-  Model.scope_with_err.explain_err 
+  Model.scope_with_err.exec_niceql 
+  
+  
 ```
 
 ### Without ActiveRecord

data/lib/generators/templates/niceql_initializer.rb

@@ -0,0 +1,6 @@
+Niceql.configure do |c|
+  # You can adjust pg_adapter in prooduction at your own risk!
+  # If you need it in production use exec_niceql
+  # default: false
+  # c.pg_adapter_with_nicesql = Rails.env.development?
+end

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/niceql.rb

@@ -1,6 +1,7 @@
 require "niceql/version"
 
 module Niceql
+
   module StringColorize
     def self.colorize_verb( str)
       #yellow ANSI color
@@ -17,11 +18,11 @@ module Niceql
   end
 
   module ArExtentions
-    def explain_err
+    def exec_niceql
       begin
-        connection.execute( "EXPLAIN #{to_niceql}" )
+        connection.execute( to_niceql )
       rescue StandardError => e
-        puts Prettifier.prettify_err(e )
+        raise e.class.new( Prettifier.prettify_err(e ) )
       end
     end
 
@@ -35,7 +36,7 @@ module Niceql
   end
 
   module Prettifier
-    INLINE_VERBS = %w(ASC IN AS WHEN THEN ELSE END AND UNION ALL WITH ON DISTINCT INTERSECT EXCEPT EXISTS NOT).join('| ')
+    INLINE_VERBS = %w(ASC IN AS WHEN THEN ELSE END AND UNION ALL WITH ON DISTINCT INTERSECT EXCEPT EXISTS NOT COUNT).join('| ')
     NEW_LINE_VERBS = 'SELECT|FROM|WHERE|CASE|ORDER BY|LIMIT|GROUP BY|WITH|LEFT JOIN|RIGHT JOIN|JOIN|HAVING|OFFSET'
     VERBS = "#{INLINE_VERBS}|#{NEW_LINE_VERBS}"
     STRINGS = /("[^"]+")|('[^']+')/
@@ -45,24 +46,45 @@ module Niceql
       if ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'postgresql'
         prettify_pg_err( err.to_s )
       else
-        puts err
+        err
       end
     end
 
 
     def self.prettify_pg_err(err)
       err_line_num = err[/LINE \d+/][5..-1].to_i
+
       start_sql_line = err.lines[3][/(HINT|DETAIL)/] ? 4 : 3
       err_body = err.lines[start_sql_line..-1]
-      err_line = StringColorize.colorize_err( err_body[err_line_num-1] )
+      err_quote = ( err.lines[1][/\.\.\..+\.\.\./] && err.lines[1][/\.\.\..+\.\.\./][3..-4] ) ||
+          ( err.lines[1][/\.\.\..+/] && err.lines[1][/\.\.\..+/][3..-1] )
+
+
+      # line 2 is err carret line
+      err_carret_line = err.lines[2][err.lines[1][/LINE \d+:/].length+1..-1]
+      # err line painted red completly, so we just remembering it and use
+      # to replace after paiting the verbs
+      err_line = err_body[err_line_num-1]
+
+      # when err line is too long postgres quotes it part in doble ...
+      if err_quote
+        err_quote_carret_offset = err_carret_line.length - err.lines[1].index( '...' ) + 3
+        err_carret_line =  ' ' * ( err_line.index( err_quote ) + err_quote_carret_offset )
+      end
+
+      # if mistake is on last string than err_line.last != \n so we need to prepend \n to carret line
+      err_line = ( err_line.last == "\n" ? err_line + "\n" : "\n" + err_line )
 
+      #colorizing verbs and strings
       err_body = err_body.join.gsub(/#{VERBS}/ ) { |verb| StringColorize.colorize_verb(verb) }
       err_body = err_body.gsub(STRINGS){ |str| StringColorize.colorize_str(str) }
 
+      #reassemling error message
       err_body = err_body.lines
-      err_body[err_line_num-1]= err_line
-      err_body.insert( err_line_num, StringColorize.colorize_err( err.lines[2][err.lines[1][/LINE \d+:/].length+1..-1] ) )
-      puts err.lines[0..start_sql_line-1].join + err_body.join
+      err_body[err_line_num-1]= StringColorize.colorize_err( err_line )
+      err_body.insert( err_line_num, StringColorize.colorize_err( err_carret_line ) )
+
+      err.lines[0..start_sql_line-1].join + err_body.join
     end
 
     def self.prettify_sql( sql, colorize = true )
@@ -101,8 +123,41 @@ module Niceql
     end
   end
 
+  module PostgresAdapterNiceQL
+    def exec_query(sql, name = "SQL", binds = [], prepare: false)
+      begin
+        # replacing sql with prettified sql, thats all
+        super( Prettifier.prettify_sql(sql, false), name, binds, prepare: prepare )
+      rescue StandardError => e
+        raise e.class.new( Prettifier.prettify_err(e ) )
+      end
+    end
+  end
+
+  class NiceQLConfig
+    attr_accessor :pg_adapter_with_nicesql
+    def initialize
+      self.pg_adapter_with_nicesql = false
+    end
+  end
+
+
+  def self.configure
+    @config ||= NiceQLConfig.new
+
+    yield( @config )
+
+    if @config.pg_adapter_with_nicesql
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(PostgresAdapterNiceQL)
+    end
+  end
+
+
   if defined? ::ActiveRecord::Base
     ::ActiveRecord::Base.extend ArExtentions
     [::ActiveRecord::Relation, ::ActiveRecord::Associations::CollectionProxy].each { |klass| klass.send(:include, ArExtentions) }
   end
+
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - alekseyl
@@ -70,6 +70,7 @@ files:
 - bin/setup
 - err_now.png
 - err_was.png
+- lib/generators/templates/niceql_initializer.rb
 - lib/niceql.rb
 - lib/niceql/version.rb
 - niceql.gemspec