prick 0.39.7 → 0.39.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d27db668e8163dce24bb6c7548f5332a5f5e8c72ee4a5e266b10a032a06b782
-  data.tar.gz: c3e293fec4e73625c45e28198f112a52cef7d83816274ca3a63231cfc6746c28
+  metadata.gz: db7a57d14d65cd631793874989d504c0b9aeeeee1022e4d57fd451ff62663e19
+  data.tar.gz: 20c53aa36943b9b2d8dd17c4f4fbc125d6b416392251f98b03cbbbe5e015a5eb
 SHA512:
-  metadata.gz: 02fcb89d65a6c99e95b9263266c84353eac7a572a6338bcabde51d699377a4c32161dd785ef1b9ccdd16f58ba85e92174ba09e086eda7fd11426449d30c2fa2e
-  data.tar.gz: 7079b45ddf107b13c1ea22e131ea580c16c9e3378fc0f0ff3e1eb22b8b0e8b3c22a61e3732efb1f58180a29fc97d5453a0ff2a96cec2c4d3ac1a5083948a8e97
+  metadata.gz: 312a5a5e15b995d47b75464ca5284e8b192f978dcf3ab6cc6a282fe482aeff2a76a6ff18be1d6b67b7aa44b4864378f7d02ffe06d184a88ff79cc9f8395dea0e
+  data.tar.gz: 8f952347b1992b473904a5865a612f72717b4376c357392cae82b4db60904b30e336ccafc9ee63f6566a258bbe109d5745e5aab5cbbabf52d25d4469cfd56750

data/lib/prick/builder/batch.rb

@@ -16,9 +16,13 @@ module Prick
 
       def execute(**opts, &block)
         name = self.class.to_s.sub(/.*::/, "").split(/(?=[A-Z])/).map(&:downcase).join(" ")
+        node_paths = nodes.map(&:relpath)
         time "Execute #{name} (nodes: #{nodes.size})" do
           yield(**opts)
         end
+        if Timer.on?
+          ::Timer.file.indent { |f| f.puts node_paths }
+        end
       end
 
       def dump

data/lib/prick/builder/builder.rb

@@ -88,6 +88,7 @@ module Prick
         batch = nil
 
         for node in [init_nodes, decl_nodes, fox_seed_nodes, sql_seed_nodes, term_nodes.reverse].flatten
+          # Create new batch if required. Order of when-clauses is important
           case node.kind
             when :module
               if batch&.kind != :module
@@ -103,7 +104,7 @@ module Prick
                 batch = SqlBatch.new(self)
               end
             when :sql || node.kind == :inline
-              if batch&.kind != :exe
+              if batch&.kind != :exe || step
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
               end
@@ -113,11 +114,13 @@ module Prick
             when :fox
               @batches << batch if batch
               batch = FoxBatch.new(self)
-            when :yml
+            when :yml # build.yml files
               next
           else
             raise Error, "Unexpected node kind: #{node.kind}"
           end
+
+          # Add node to current batch
           batch.nodes << node
         end
         @batches << batch if batch

data/lib/prick/builder/node.rb

@@ -9,6 +9,7 @@ module Prick
       attr_reader :args # only defined for :exe (String)
 
       def name() @name = File.basename(path) end
+      def relpath = path.sub(/^#{Dir.getwd}\//, "")
 
       # Note that schema defaults to 'public' which may not be what you want in
       # some cases
@@ -126,7 +127,6 @@ module Prick
       alias_method :command, :to_s
 
       def filename = File.basename(path)
-      def relpath = path.sub(/^#{Dir.getwd}\//, "")
 
       def initialize(parent, phase, path, args = nil)
         constrain args, [String]

data/lib/prick/local/timer.rb

@@ -43,7 +43,7 @@ module Timer
     def file() ::Timer.file end
 
     def self.on!() ::Timer.on! end
-    def self.on?() ::Time.on? end
+    def self.on?() ::Timer.on? end
 
     def unit() ::Timer.unit end
     def unit=(unit) ::Timer.unit = unit end

data/lib/prick/state.rb

@@ -357,12 +357,12 @@ module Prick
 
     def insert_record(table, attrs = {})
       sql_fields = attrs.keys.join(", ")
-      sql_values = attrs.values.map { conn.quote_literal(_1) }.join(", ")
+      sql_values = attrs.values.map { conn.quote_value(_1) }.join(", ")
       conn.value "insert into #{table} (#{sql_fields}) values (#{sql_values}) returning id"
     end
 
     def update_record(table, id, attrs = {})
-      sql_assign = attrs.map { |k,v| "#{conn.quote_identifier(k)} = #{conn.quote_literal(v)}" }.join(", ")
+      sql_assign = attrs.map { |k,v| "#{conn.quote_identifier(k)} = #{conn.quote_value(v)}" }.join(", ")
       sql_id_cond = (id.nil? ? "true" : "id = #{id}")
       conn.exec "update #{table} set #{sql_assign} where #{sql_id_cond}"
     end

data/lib/prick/subcommand/prick-drop.rb

@@ -50,8 +50,8 @@ module Prick::SubCommand
         pool = builder.pool
         schemas = pool.refresh_schemas
       end
-      schema_list = conn.quote_literal_list(schemas)
-      schema_expr = schemas ? "true = true" : "schema_name in #{schema_list}"
+      schema_list = conn.quote_values(schemas)
+      schema_expr = schemas ? "true = true" : "schema_name in (#{schema_list})"
       tables = conn.tuples %(
         select schema_name, table_name, max_id
         from prick.snapshots

data/lib/prick/version.rb

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

metadata

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