prick 0.39.10 → 0.39.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21f671634521afdb6a2f711b98042f5561496f45fcbfc75446a622cc4f0209c
-  data.tar.gz: cd77bebc7e51297f7a768ae7b3d15267ea0591a8a9338ca73ba9d4e04589f6e3
+  metadata.gz: 5ebdfba60b4161b0afa671e4c19abf963db5d017376c089acade485e5d895dc8
+  data.tar.gz: a3cff45e06c66cb094fa3ca891b4d3a863d21ab52f2fb13ff1b9c2d026bb494b
 SHA512:
-  metadata.gz: 8b48ab4c8a4dc42df39d46a827279b6e413f04d1a1989c9aee4858e30e26a05dff7630cb22fe37f464c5e3ca3cbb3634061ed2e8cdc161b514defcdf7f9372e1
-  data.tar.gz: 98e31722b962566506a7157acf72b9eeb523b68f9427f98e8b633e7e056fbe38e4c57886fa88341cde5e80285cd86e3fb5bf24eb3153d95ed74b6c0d097df371
+  metadata.gz: 16a1deeabd509f289eeb1fff91a2880e21794bd1124862b84f0fd9c4cad19c512d22d2733ac9cd7b9bf0b288f536739cd9b1c1da88b002f1e2c4ceb9dd2c677a
+  data.tar.gz: 477ce9af0329c7b07a89be381f73cf47629f97b38395342dc817b0ccc051b20b1381da92e6bd71ed9cebb0f8a0b6e9a559eeaf7944b980f1c215d440f0d56f6f

data/lib/prick/builder/batch.rb

@@ -35,23 +35,24 @@ module Prick
       def execute
 #       puts "#execute"
         super {
-          begin
-            sql = []
-            file = nil
-            node = nil
+          file = nil
+          node = nil
 
+          begin
             # A SQL batch allows the first node to be an evaluated or executed node
             if nodes.first.is_a?(CommandNode)
               node = nodes.shift
-              sql = [node.source]
+              conn.execute [node.source], silent: true
             end
+          rescue PG::Error => ex
+            error, line, char = conn.err
+            raise PostgresError.new("Error from #{node.to_s} at #{line}:#{char} - #{error}")
+          end
 
-            conn.execute sql, silent: true if !sql.empty?
+          begin
             for node in nodes # This is marginally faster than concatenating all nodes
-#             puts node.source
               conn.execute node.source, silent: true
             end
-
           rescue PG::Error => ex
             error, line, char = conn.err
             file = nil

data/lib/prick/builder/node.rb

@@ -123,6 +123,7 @@ module Prick
       def self.objects() @@objects end
     end
 
+    # Virtual base class for EvalNode and ExecNode
     class CommandNode < Node
       alias_method :command, :to_s
 
@@ -146,14 +147,16 @@ module Prick
       end
     end
 
+    # EvalNode executes the command and feeds the output into the database
     class EvalNode < CommandNode
       def read_source
         sql = execute_command
         @source_lines = 1 + 1 + sql.count("\n")
-        ["set search_path to #{schema}, pg_temp;\n", sql]
+        ["set search_path to #{schema}, pg_temp", sql.join("\n")]
       end
     end
 
+    # ExecNode executes the command and ignores its output
     class ExecNode < CommandNode
       def read_source
         execute_command

data/lib/prick/builder/parser.rb

@@ -57,7 +57,7 @@ module Prick
         unit = make_build_unit(parent, path)
         entries = YAML.load(File.read(path)) || []
         entries.each { |entry|
-          if entry.is_a?(Hash) && (entry.size != 1 || entry.first.first != "sql")
+          if entry.is_a?(Hash) && (entry.size != 1 || !%w(call sql exec eval).include?(entry.first.first))
             entry.each { |key, value|
               if key == "schema"
                 unit.schema = value
@@ -195,7 +195,7 @@ module Prick
 
         last = nil
         for env in [env] + env.ancestors.reverse
-          bash_vars["ENVIRONMENT"] = env.name
+          bash_vars["PRICK_ENVIRONMENT"] = env.name
           file = expand_variables(filename, bash_vars)
 #         last ||= (file != last and file) or return nil # return if no ENVIRONMENT substitution
           path = (file.start_with?("/") ? file : File.join(dir, file))

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.39.10"
+  VERSION = "0.39.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.39.10
+  version: 0.39.12
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic