niceql 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbeddac683e41bcbbc3d8fc2c42fcbb505a6d129c58dc9653a93650317c8125
-  data.tar.gz: e4de50a94af55592a2f31ced37b6a1986abdea37ca462ce529bd7bdfabde08be
+  metadata.gz: 2056d114407ed81b47224f1bc0f60d2e65bb88118667f074fd972149203bd6ea
+  data.tar.gz: 48c228ee2240a0fd8beec6ecc1c312b42197a8a259bf1d5b438e41fd55c51680
 SHA512:
-  metadata.gz: 64dc4d5869ee5e79b408b99fe963bcafd595d44a8c8495e72429d104478ee6811b8eba211ef13527e060746a52e4c4a6c192e17aef95237c6d79248b0a421a12
-  data.tar.gz: 865161e1af50386a06a98ba9e1af708f388f44f96f2566fb3f0695ac4756a66030731c8f8e603d5f7c88a009d4a6f4d840c0c2d9f140e81500411cccba17ee41
+  metadata.gz: 070a9574f50f434136474dfc1b671956b8df3529434f2e13f36e4b4c952a1dbc23da5a9e81a5d8eba082154c523c6056476b25396ec52654dcbe0436ae04c18e
+  data.tar.gz: e8b550669250d612233b7fdbced172d12cd6d348dd8bfda21ff6ff8dda0358c6cf59e23aa917bbade0f49286017173a10099488a830d1e0802efd71faa98b35a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.0
+* merged PR https://github.com/alekseyl/niceql/pull/19, now Arel is also extended with niceql methods!!
+* test and better niceql comparisons assertion
+* tests were trialed against rails 4.2 and some additional conditions were added for later cases
+
 # 0.3.0 
 * ruby forced to >= 2.4
 * String match extension no longer needed 

data/README.md

@@ -1,11 +1,11 @@
 # Niceql
 
-This is a small, nice, simple and no-dependency solution for SQL prettifying for Ruby. 
+This is a small, nice, simple and zero dependency solution for SQL prettifying for Ruby. 
 It can be used in an irb console without any dependencies ( run bin/console and look for examples ).
 
-Any reasonable suggestions on formatting/coloring are welcome
+Any reasonable suggestions are welcome. 
 
-**Please pay attention: untill issue https://github.com/alekseyl/niceql/issues/16 is resolved any UPDATE or INSERT request will corrupt your data, don't use on production!**
+**Please pay attention: untill issue https://github.com/alekseyl/niceql/issues/16 is resolved any UPDATE or INSERT request might corrupt your data, don't use on production!**
 
  
 ## Before/After 
@@ -44,9 +44,11 @@ Or install it yourself as:
 ```ruby
 Niceql.configure do |c|
   # Setting pg_adapter_with_nicesql to true will force formatting SQL queries
-  # before executing them, this will lead to better SQL-query debugging and much more clearer error messages 
+  # before execution. Formatted SQL will lead to much better SQL-query debugging and much more clearer error messages 
   # if you are using Postgresql as a data source.  
+  # 
   # You can adjust pg_adapter in production but do it at your own risk!
+  # 
   # If you need to debug SQL queries in production use exec_niceql
   # default: false
   # uncomment next string to enable in development
@@ -56,7 +58,7 @@ Niceql.configure do |c|
   # default: false
   # c.prettify_active_record_log_output = true
   
-  # now error prettifying is configurable
+  # Error prettifying is also configurable
   # default: defined? ::ActiveRecord::Base && ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'postgresql'
   # c.prettify_pg_errors = defined? ::ActiveRecord::Base && ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'postgresql'
   
@@ -85,7 +87,7 @@ end
 ### With ActiveRecord
 
 ```ruby
-  # puts colorized ( or not if you are willing so ) to_niceql ( you need to call puts otherwise to_niceql looks ugly  )
+  # puts colorized and formatted corresponding SQL query
   Model.scope.niceql
   
   # only formatting without colorization, you can run output of to_niceql as a SQL query in connection.execute  
@@ -110,23 +112,23 @@ end
     #=>
     #=>  SELECT * 
     #=>  FROM table
-   
-   
-
+    
 
-   # rails combines err with query, so don't forget to do it yourself:
-   puts Niceql::Prettifier.prettify_pg_err( "#{pg_err_output}\n#{sql_query}" )
+   puts Niceql::Prettifier.prettify_pg_err( pg_err_output, sql_query )
    
    # to get real nice result you should execute prettified version (i.e. execute( prettified_sql ) !) of query on your DB! 
    # otherwise you will not get such a nice output
-    puts Niceql::Prettifier.prettify_pg_err(<<~ERR )
+    raw_sql = <<~SQL
+     SELECT err 
+     FROM ( VALUES(1), (2) )
+     ORDER BY 1
+    SQL
+
+    puts Niceql::Prettifier.prettify_pg_err(<<~ERR, raw_sql )
         ERROR:  VALUES in FROM must have an alias
         LINE 2:  FROM ( VALUES(1), (2) )
                       ^
         HINT:  For example, FROM (VALUES ...) [AS] foo.
-         SELECT err 
-         FROM ( VALUES(1), (2) )
-         ORDER BY 1
     ERR
        
     

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = "0.3.1"
+  VERSION = '0.4.0'
 end

data/lib/niceql.rb

@@ -4,15 +4,15 @@ module Niceql
 
   module StringColorize
     def self.colorize_verb( str)
-      #yellow ANSI color
+      # yellow ANSI color
       "\e[0;33;49m#{str}\e[0m"
     end
     def self.colorize_str(str)
-      #cyan ANSI color
+      # cyan ANSI color
       "\e[0;36;49m#{str}\e[0m"
     end
     def self.colorize_err(err)
-      #red ANSI color
+      # red ANSI color
       "\e[0;31;49m#{err}\e[0m"
     end
   end
@@ -198,6 +198,7 @@ module Niceql
         end
       end
 
+      private_class_method
       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",
@@ -289,9 +290,10 @@ module Niceql
     @config ||= NiceQLConfig.new
   end
 
-  if defined? ::ActiveRecord::Base
-    ::ActiveRecord::Base.extend ArExtentions
-    [::ActiveRecord::Relation, ::ActiveRecord::Associations::CollectionProxy].each { |klass| klass.send(:include, ArExtentions) }
+  if defined? ::ActiveRecord
+    [::ActiveRecord::Relation,
+     ::Arel::TreeManager,
+     ::Arel::Nodes::Node].each { |klass| klass.send(:include, ArExtentions) }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: This is simple and nice gem for sql prettifying and formatting. Niceql splits,