niceql 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2efccbbe22d5da01e7efe8fca21ed008f78e4eb1
-  data.tar.gz: b4290f066aef1b5c18e1199e291c093ff22d26ba
+SHA256:
+  metadata.gz: b00aaefbdb5837f56163c43dfd8c3599add288f5d71e0df6aad33760771562bb
+  data.tar.gz: 06544b54f77cd4cc54a1b5b44ae8d1438bf57a9b6efc29c9408de7d35c75c8d9
 SHA512:
-  metadata.gz: 88846a6a3a4efea29e1c1d71eec1a2400c1b3fdf51d61cb4dcc428dace318aa55ff725f51ab13f82ca86fb9c57204c664aee35e99abee21c9c0f47654a8790c6
-  data.tar.gz: 7806bad02c6f18dfa5efca5d5b290dbca3726f42213edff413b2e8032bd52b14bea8d1980bffd0703c8af156a83203184694ef9196e5fdbef67265a94bff7802
+  metadata.gz: 5580c574b821e14a804252e7f2037341ca3e8c98d9b0b33d22057557cad29b4d1f4701773b2018a29183002280566861ccad962877b29bfcfda0db412d91f69b
+  data.tar.gz: 9d3ef9a43ab6b97e08c577521486e1b9c0151ba62848a47f096c0d31c521c0ff9b997795d3f8d62b78d4252ad8cd94fad8f8614032847dde5ad2f8fbc28cc830

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.22
+ * multi query formatting 
+
 # 0.1.21
  * fix bug for SQL started with comment 
  

data/README.md

@@ -1,7 +1,7 @@
 # Niceql
 
 This is a small, nice, simple and dependentless solution for SQL prettifiyng for Ruby. 
-It can be used in an irb console without any dependencies ( run ./console from bin and look for examples ).
+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
 
@@ -95,36 +95,46 @@ end
 ### Without ActiveRecord
 
 ```ruby
-   puts Niceql::Prettifier.prettify_sql("SELECT * FROM ( VALUES(1), (2) ) AS tmp")
    
-   # see colors in irb %) 
-   #=>  SELECT * 
-   #=>  FROM ( VALUES(1), (2) ) AS tmp
+    puts Niceql::Prettifier.prettify_sql("SELECT * FROM ( VALUES(1), (2) ) AS tmp")
+    #=>  SELECT * 
+    #=>  FROM ( VALUES(1), (2) ) AS tmp
+    
+    puts Niceql::Prettifier.prettify_multiple("SELECT * FROM ( VALUES(1), (2) ) AS tmp; SELECT * FROM table")
+    
+    #=>  SELECT * 
+    #=>  FROM ( VALUES(1), (2) ) AS tmp;
+    #=>
+    #=>  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}" )
    
    # 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 )
-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
-   
-
-# 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
+    puts Niceql::Prettifier.prettify_pg_err(<<~ERR )
+        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
+       
+    
+    # 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
 
 ```
 

data/lib/niceql.rb

@@ -189,6 +189,17 @@ module Niceql
       sql.tap{ |slf| slf.gsub!( /\s+\n/, "\n" ) }.tap{ |slf| slf.gsub!(/\s+\z/, '') }
     end
 
+    def self.prettify_multiple( sql_multi, colorize = true )
+      sql_multi.split( /(?>#{SQL_COMMENTS})|(\;)/ ).inject(['']) { |queries, pattern|
+        queries.last << pattern
+        queries << '' if pattern == ';'
+        queries
+      }.map!{ |sql|
+        # we were splitting by comments and ;, so if next sql start with comment we've got a misplaced \n\n
+        sql.match?(/\A\s+\z/) ? nil : prettify_sql( sql, colorize )
+      }.compact.join("\n\n")
+    end
+
     private
     def self.indent_multiline( verb, indent )
       #

data/lib/niceql/version.rb

@@ -1,3 +1,3 @@
 module Niceql
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niceql
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: This is simple and nice sql prettifier, it splits, indent and colorize SQL