prick 0.42.1 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ebbfeaeaecdac6bd79e104061ffe80701a06625f28b7c6fcace327f49802ec
-  data.tar.gz: 2d117c660b47c1812ef1316777f923603abfc09a230270ee25655f3a7c41b99d
+  metadata.gz: 776071ac8d6762ee4a9d60f40c308a13be0fc51451ad52844e5821b3ec72d330
+  data.tar.gz: c2d0d5637d8948853574edb40a932ec632f4dd6c53ce19b8fd18c64b6e639ab0
 SHA512:
-  metadata.gz: 3407f818ce8b7e927eb8becf3522cdef8994c997e0bc835b079515b78bbad5b5523a9262bbd0f48e85ee1b81cc15094519bea5b24de0b2fe74c617a186563e97
-  data.tar.gz: 9d4c4dbdcc3569322926c7b2a79240b31f4eb8825da838547308a88400d1cf36f0e17866b154b7dbc4098a6bcc7b4dd1509fd37cfaefd8e69f8cc8c96a5ae564
+  metadata.gz: cbfb74c1775869db3ec1b2d24a8d69565d9b785220c9ec9c4051bb6f63de23709c71df4c4109d5de889352e66710fedcb1ca2ba667dfdd79f31f66396de35188
+  data.tar.gz: 6a9e7b64410e37e7449e5c09ef41cdac244d3050418ea04b2ca6aa5316d716d415caba1be6a4ab280875eb345eddd99f9e7e4f527a7ebfc1673b439cf457a3a5

data/lib/prick/builder/batch.rb

@@ -50,9 +50,7 @@ module Prick
           end
 
           begin
-            for node in nodes # This is marginally faster than concatenating all nodes
-              conn.execute node.source, silent: true
-            end
+            execute_nodes
           rescue PG::Error => ex
             error, line, char = conn.err
             file = nil
@@ -81,13 +79,29 @@ module Prick
             elsif node
               message = "#{error} from #{node.path}"
             else
-              raise ArgumentError, "Oops"
-              message = conn.errmsg + " in SQL batch"
+              message = "Error in #{nodes.first.path}: #{conn.errmsg}"
             end
             raise PostgresError.new(message, file, line, char)
           end
         }
       end
+
+    protected
+      def execute_nodes
+        for node in nodes # This is marginally faster than concatenating all nodes
+          conn.execute node.source, silent: true
+        end
+      end
+    end
+
+    class PSqlBatch < SqlBatch
+    protected
+      def execute_nodes
+        opts = ["-U #{Prick.state.username}"] + nodes.map { |n| "-f #{n.path}" }
+        args = [Prick.state.database]
+
+        Command.command(Prick.state.bash_environment, "psql", argv: opts + args)
+      end
     end
 
     class ModuleBatch < BuildBatch

data/lib/prick/builder/builder.rb

@@ -87,6 +87,7 @@ module Prick
         kind = nil
         batch = nil
 
+        # TODO: Refactor
         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
@@ -98,16 +99,23 @@ module Prick
             when :exe # Exe sources always create a new batch
               @batches << batch if batch
               batch = SqlBatch.new(self)
-            when batch&.kind # Same kind as current batch
+            when batch&.kind # Same kind as current batch. After this when-clause
+                             # we know that the node kind has changed
               if node.kind == :sql && step
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
+              elsif node.kind == :psql && step
+                @batches << batch if batch
+                batch = SqlBatch.new(self)
               end
             when :sql || node.kind == :inline
               if batch&.kind != :exe || step
                 @batches << batch if batch
                 batch = SqlBatch.new(self)
               end
+            when :psql
+              @batches << batch if batch
+              batch = PSqlBatch.new(self)
             when :inline
               @batches << batch if batch
               batch = SqlBatch.new(self)
@@ -123,6 +131,8 @@ module Prick
           # Add node to current batch
           batch.nodes << node
         end
+
+        # Add last batch
         @batches << batch if batch
 
         @batches

data/lib/prick/builder/node.rb

@@ -33,7 +33,7 @@ module Prick
       def initialize(parent, phase, kind, path, args = nil)
         constrain parent, BuildNode, NilClass
         constrain phase, :init, :decl, :seed, :term, nil
-        constrain kind, :sql, :exe, :fox, :yml, :inline, :module
+        constrain kind, :sql, :psql, :exe, :fox, :yml, :inline, :module
         constrain path, String, NilClass
         @parent, @phase, @kind, @path = parent, phase, kind, path
         @args = args&.empty? ? nil : args
@@ -67,6 +67,12 @@ module Prick
       end
     end
 
+    class PSqlNode < Node
+      def initialize(parent, phase, path)
+        super(parent, phase, :psql, path)
+      end
+    end
+
     class FoxNode < Node
       def initialize(parent, phase, path)
         super(parent, phase, :fox, path)

data/lib/prick/builder/parser.rb

@@ -115,6 +115,16 @@ module Prick
         [path, Array(args).flatten]
       end
 
+      def parse_psql_file_entry(unit, dir, entry)
+        if entry =~ /^[a-zA-Z0-9_.-]+$/
+          path = File.join(dir, entry)
+          File.exist?(path) or raise Error, "Can't find file #{path} in #{dir}/ from #{unit}"
+          path
+        else
+          raise Error, "Not a file name: '#{entry}'"
+        end
+      end
+
       def parse_entry(unit, phase, dir, entry)
 #       puts "#parse_entry(#{unit.inspect}, #{phase.inspect}, #{dir.inspect}, #{entry.inspect})"
         if entry.is_a?(Hash)
@@ -145,6 +155,9 @@ module Prick
           else
             raise Error, "Illegal key: #{key}"
           end
+        elsif entry =~ /\.psql$/
+          path = parse_psql_file_entry(unit, dir, entry)
+          PSqlNode.new(unit, phase, path)
         else
           (path, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
@@ -187,7 +200,7 @@ module Prick
 
       # Expand environment variables in the given file name
       #
-      # #expend_filename substitute '$<variable>' expressions in the filename
+      # #expand_filename substitute '$<variable>' expressions in the filename
       # with the corresponding value in the current environment. If the file
       # was not found, inherited environments are processed hierarchly with the
       # special environment variable ENVIRONMENT set to each PRICK_ENVIRONMENT

data/lib/prick/ext/expand_variables.rb

@@ -14,7 +14,7 @@
 def expand_variables(str, variables) # ChatGPT
   # Replace escaped bashslashes and dollar signs
   str = str.gsub('\\\\', "\x00").gsub('\\$', "\x01")
-  
+
   # Expand variables
   str.gsub!(/\$(\w+)\b|\$\{(\w+)\}/) do |match| # Strange that '\b' is necessary
     key = $1 || $2
@@ -30,7 +30,7 @@ end
 def expand_variables?(str, variables)
   # Replace escaped bashslashes and dollar signs
   str = str.gsub('\\\\', "\x00").gsub('\\$', "\x01")
-  
+
   # Look for expansion
   str.gsub!(/\$(\w+)\b|\$\{(\w+)\}/) do |match| # Strange that '\b' is necessary
     return true if variables.include?($1 || $2)
@@ -38,3 +38,10 @@ def expand_variables?(str, variables)
 
   return false
 end
+
+# Return true if the string contains a variable
+def has_variables?(str)
+  # Replace escaped bashslashes and dollar signs
+  str = str.gsub('\\\\', "\x00").gsub('\\$', "\x01")
+  !(str =~ /\$[a-zA-Z{]/).nil?
+end

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

@@ -43,7 +43,7 @@ module Prick::SubCommand
       puts Prick.databases
     else
       # Timestamp of newest file under git control
-      newest_file = Command.command("ls -tr #{Git.list.join(" ")} | tail -1").last
+      newest_file = Command.command("ls -tr #{Git.list.join(" ")} | tail -1", stderr: false, fail: false).last
       fs_time = File.mtime(newest_file)
 
       git_branch = Git.branch.current
@@ -59,7 +59,7 @@ module Prick::SubCommand
           from prick.versions
         ))
 
-        # Detect is this is the current database
+        # Detect if this is the current database
         if Prick.state.database == database
           is_current_database = true
           current_database_row = rows.size

data/lib/prick/version.rb

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

metadata

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