blackstack-deployer 1.2.6 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be40fc26512412ab26ca2b7d21e48c8c82f128d080f7291d00d71ddd69abaca9
-  data.tar.gz: 308ab54f2f5a11e3cc06325308f1c0654b089f23e6f8582426d7e5b2d4b2337b
+  metadata.gz: c2197d07351cc7992754e1a97848f862cece1e90384b539a93d89fb765a200a7
+  data.tar.gz: 849d35bb7fa51c2071a9567fe2a9ab01fd75d7c50d239da9446f09c81a2db3e4
 SHA512:
-  metadata.gz: f83b42917544ebafe681e3bc9747f32ecc8ee355de7b727b5b466ede9223a85c846885e8c91dfa6b70f045bad474ddddb7a03c2879369be3c80902015d1ef400
-  data.tar.gz: 7165eeb3f074603b67dc2dbb2ba9f6f2a30d4f067eea595d7df103456b5bb1650d45e78760fdcdcc530231dd3b47b041eec1ddd2205705b176c4e7eedf76b498
+  metadata.gz: a67164cd4df13e59d5e3258700d7ebe2451b1b787e315968d7ea5647866138d90ac5acaee8ed2c4f660fcf179af5c6aeacfdb6aafa71ca1c9a1d14c8f0e71a63
+  data.tar.gz: 8893cf809bf4d011ac52e2cb161fe38cfbc700bcf418d6ca630d38696b8508f6ddb01e0749d8b2eaba0767b089d83830278b692167108541ee3da17fbd37cab2

data/lib/blackstack-deployer.rb

@@ -1,5 +1,5 @@
 #require 'blackstack-nodes'
-require_relative 'blackstack-nodes'
+require'blackstack-nodes'
 
 require 'sequel'
 
@@ -568,18 +568,36 @@ module BlackStack
       # Reference: https://stackoverflow.com/questions/64066344/import-large-sql-files-with-ruby-sequel-gem
       # This method is called by `BlackStack::Deployer::db_execute_file` if the filename matches with `/\.sentences\./`. 
       # This method should not be called directly by user code.
-      def self.execute_sentences(sql)      
+      def self.execute_sentences(sql, chunk_size=200)      
         tlogger = BlackStack::Deployer::logger
 
         # Fix issue: Ruby `split': invalid byte sequence in UTF-8 (ArgumentError)
         # Reference: https://stackoverflow.com/questions/11065962/ruby-split-invalid-byte-sequence-in-utf-8-argumenterror
-        sql.encode!('UTF-8', :invalid => :replace)
-
-        # Keeping only ASCII characters
-        # Ruby: https://programming-idioms.org/idiom/147/remove-all-non-ascii-characters/1903/ruby
-        sql.split(/;/i).each { |statement|
-          statement = statement.to_s.strip
-          tlogger.logs "#{statement.split("\n").first}... "
+        #
+        # Fix issue: `PG::SyntaxError: ERROR:  at or near "��truncate": syntax error`
+        #
+        sql.encode!('UTF-8', :invalid => :replace, :replace => '')
+
+        # Remove null bytes to avoid error: `String contains null byte`
+        # Reference: https://stackoverflow.com/questions/29320369/coping-with-string-contains-null-byte-sent-from-users
+        sql.gsub!("\u0000", "")
+
+        # Get the array of sentences
+        tlogger.logs "Splitting the sql sentences... "
+        sentences = sql.split(/;/i) 
+        tlogger.logf "done (#{sentences.size})"
+
+        # Chunk the array into parts of chunk_size elements
+        # Reference: https://stackoverflow.com/questions/2699584/how-to-split-chunk-a-ruby-array-into-parts-of-x-elements
+        tlogger.logs "Bunlding the array of sentences into chunks of #{chunk_size} each... "
+        chunks = sentences.each_slice(chunk_size).to_a
+        tlogger.logf "done (#{chunks.size})"
+
+        chunk_number = -1
+        chunks.each { |chunk|
+          chunk_number += 1
+          statement = chunk.join(";\n").to_s.strip
+          tlogger.logs "lines #{chunk_size*chunk_number+1} to #{chunk_size*chunk_number+chunk.size} of #{sentences.size}... "
           begin
             @@db.execute(statement) #if statement.to_s.strip.size > 0
             tlogger.done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackstack-deployer
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.9
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blackstack-nodes