prick 0.20.16 → 0.20.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f00d302f4282832c257119bf9bfe5f2d171c9d706ec74bca142681d670a596
-  data.tar.gz: 5facc31ae461bcc1919509d81d71ea4f9244c20fae8e5a693f991b419343d47b
+  metadata.gz: 523f3f63b46850833fd679103f6a2ed389fee673376be4ffd54ab85ed76e9dfb
+  data.tar.gz: 58d881d1e9a5ebaea7b16caf35fc7d34670a6fa7f1a404357463f3dbbb73e81c
 SHA512:
-  metadata.gz: 726d74592d2568c862538ea0692a01067eda7a7ffd3f5dba6b80abea1b3d3a96ae0f11faa5a4ee65792de764a628f4f73691d172f9e095b24b40cba9f140efc8
-  data.tar.gz: 708e3863256205385a418b4ce3436d3639f576fd6700d478b7e11933232187af6bda60988d0a952942cd56351d896835c574b8a31c920b991ac7a663dc89147e
+  metadata.gz: c5f95a314a5dbaddef93d4e184ed5c10c35118b6e29f8ac8111589e4e79031dc83f254345853da84591edb9b511c5eab299dfa6716dc8db91b70361fe56ada12
+  data.tar.gz: '08eef7aaeea483bd45956898d290d69bb2859d41caafcc2ea64ce45bd9c2edd348a0cb003ba76054192e078fae3cf325c009ddb271d5d9e863915eb8eed95fe7'

data/exe/prick

@@ -2,6 +2,7 @@
 
 #$LOAD_PATH.unshift "/home/clr/prj/shellopts/lib"
 #$LOAD_PATH.unshift "/home/clr/prj/pg_graph/lib"
+#$LOAD_PATH.unshift "/home/clr/prj/fixture_fox/lib"
 
 require 'bootsnap'
 begin

data/lib/builder/batch.rb

@@ -138,7 +138,7 @@ module Prick
             # FIXME: Why only in FoxBatch - should be set higher up in the system
             conn.execute "update prick.versions set built_at = now() at time zone 'UTC'"
           rescue PG::SyntaxError, PG::Error => ex 
-            raise PostgresError, "prick: #{error} from #{node.path}"
+            raise PostgresError, "prick: #{ex.message}"
           end
         }
         t_type.emit

data/lib/builder/builder.rb

@@ -93,8 +93,6 @@ module Prick
       def execute(conn, create_schemas: schemas)
         group if batches.nil?
         conn.exec create_schemas.grep_v("public").map { |schema| "create schema #{schema}" }
-        conn.schema.create("public", authorization: "postgres")
-        conn.exec "grant usage, create on schema public to public"
         for batch in batches
           batch.execute
         end

data/lib/builder/parser.rb

@@ -76,30 +76,39 @@ module Prick
         unit
       end
 
+      def parse_file_entry(dir, entry)
+        name = entry.dup
+        name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
+        name.sub!(/\/$/, "")
+        if name =~ /^(\S+)\s+(.*)$/ # exe
+          file = $1
+          args = $2
+        else
+          file = name
+        end
+        path = "#{dir}/#{file}"
+        [path, name, file, args]
+      end
+
       def parse_entry(unit, phase, dir, entry)
         if entry.is_a?(Hash)
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
           case key
             when "sql"; InlineNode.new(unit, phase, unit.path, value)
-            when "call"; 
+            when "call" 
               args = value.split(/\s+/)
               args.size >= 3 or raise "Illegal number of arguments: #{value}"
               file, klass, command, args = *args
               ModuleNode.new(unit, phase, "#{dir}/#{file}", klass, command, args)
+            when "exec"
+              path, name, file, args = parse_file_entry(dir, value)
+              ExeNode.new(unit, phase, path, args)
           else
             raise Error, "Illegal key: #{key}"
           end
         else
-          name = entry
-          name.sub!(/\/$/, "")
-          if name =~ /^(\S+)\s+(.*)$/ # exe
-            file = $1
-            args = $2
-          else
-            file = name
-          end
-          path = "#{dir}/#{file}"
+          path, name, file, args = parse_file_entry(dir, entry)
           if File.directory? path
             parse_directory(unit, path)
           elsif File.executable? path
@@ -111,7 +120,7 @@ module Prick
               when /\.fox$/
                 FoxNode.new(unit, :seed, path)
             else
-              raise Error, "Unrecognized file type #{File.basename(path)} in #{unit.dir}"
+              raise Error, "Unrecognized file type #{File.basename(path)} in #{dir}"
             end
           else
             raise Error, "Can't find #{name} in #{dir} from #{unit}"
@@ -121,3 +130,4 @@ module Prick
     end
   end
 end
+

data/lib/prick/version.rb

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

data/lib/subcommand/prick-build.rb

@@ -27,7 +27,7 @@ module Prick::SubCommand
 
           if exist
             if force
-              # Drop all schemas
+              # Drop all schemas but re-creates the public schema
               super_conn.rdbms.empty!(database)
 
             else
@@ -46,6 +46,10 @@ module Prick::SubCommand
 
               # Drop refresh schemes
               refresh_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
+
+              # Re-create public schema
+              conn.schema.create("public", authorization: "postgres")
+              conn.exec "grant usage, create on schema public to public"
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.16
+  version: 0.20.19
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-23 00:00:00.000000000 Z
+date: 2022-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql