prick 0.20.15 → 0.20.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364c4c7c99807892c0714d99d531d19fe7fff8cfe23f80e56679d8649630b416
-  data.tar.gz: 5e2fcd8e46a130dd65451a76c22027352bd5b5a747d3996940f5f1c4941c1953
+  metadata.gz: 69e1bed1482431efd5f5e449ba9d2b3d5cccfef223398e51879aeda7374fd6e1
+  data.tar.gz: 99984a969cb456c6efbf4943f56433d1c207246dfc615956fbd550511c30bfee
 SHA512:
-  metadata.gz: 7e185c8ffc7d29d764672647994c95f67dcb8deb8ff2ab0fbe9edc278b8934b448834327b46897f0a92b268cb94b82011369c25035cba911358739f93ab6ed95
-  data.tar.gz: 18c403ced7bad45431dc4c63c3d00a4d9f9425f5096e8f1c736be81d99f3f814e0a7ecff9a6e72f6cd794703219e76b026e9c2bc9b132570f65ae470dbb75e95
+  metadata.gz: 7359ccc4a5da931531579431375e94007d7b7c66dc128c1a15c26fce5aa8b206b2ed89b33e9d15054c49f4dc64b61a31ea5647e387c219f5fdd1f0a7eed1fe25
+  data.tar.gz: 3713cb328f4aea15e7ac67d0e40dd7d1ae07e31528368aaf24d634fcd6ffbb91c2b512764a2c82cd01abe7c9aa191c784332196ba9b0f8232c5f4fe5a2b56fff

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

@@ -134,9 +134,11 @@ module Prick
           delete = builder.clean ? :none : :touched
           begin
             conn.execute fox.to_sql(format: :exec, delete: delete)
+
+            # 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 all on schema public to public"
         for batch in batches
           batch.execute
         end

data/lib/builder/parser.rb

@@ -92,6 +92,7 @@ module Prick
           end
         else
           name = entry
+          name.sub!(/\$ENVIRONMENT/, Prick.state.environment.to_s)
           name.sub!(/\/$/, "")
           if name =~ /^(\S+)\s+(.*)$/ # exe
             file = $1
@@ -111,7 +112,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 +122,4 @@ module Prick
     end
   end
 end
+

data/lib/prick/version.rb

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

data/lib/subcommand/prick-build.rb

@@ -7,7 +7,9 @@ module Prick::SubCommand
     Timer.on! if timer
     time "Prick::Command#build" do
       begin
-        super_conn = PgConn.new
+        super_conn = PgConn.new # Used to create new databases (doesn't make a
+                                # difference right now as the mikras user is
+                                # still a superuser)
 
         conn = nil
         builder = nil
@@ -18,30 +20,36 @@ module Prick::SubCommand
           else
             super_conn.rdbms.create database, owner: username
             conn = PgConn.new(database, username)
-            exit = false
+            exist = false
           end
 
           builder = Prick::Build::Builder.new(conn, builddir)
 
           if exist
             if force
-              builder.schemas.each { |schema| conn.schema.drop schema, cascade: true }
+              # Drop all schemas but re-creates the public schema
+              super_conn.rdbms.empty!(database)
 
             else
-              # Explicit schema is always rebuilt
-              refresh = [builder.refresh_schemas, schema].compact.flatten.uniq
-              keep = builder.keep_schemas.reject { |s| s == schema }
+              # Find schemas to refresh. This includes all schemas in the
+              # database
+              refresh_schemas = conn.schema.list
 
-              # Rebuild non-existing keep-schemas
-              keep.reject! { |schema|
-                refresh << schema if !conn.schema.exist?(schema)
-              }
+              # Find existing keep-schemas
+              keep_schemas = builder.keep_schemas.select { |s| conn.schema.exist?(s) }
+
+              # Remove keep-schemas from list of schemas
+              refresh_schemas -= keep_schemas
 
               # Eliminate keep schemas from build pool
-              builder.pool.delete_schema(keep)
+              builder.pool.delete_schema(keep_schemas)
 
               # Drop refresh schemes
-              refresh.each { |schema| conn.schema.drop(schema, cascade: true) }
+              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.15
+  version: 0.20.18
 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