prick 0.20.14 → 0.20.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 863269702a01df7b25038a6eae9e0b2f636e20311276919cdecf6f201540d14b
-  data.tar.gz: bdf5d57641b5e250d667ff924eacd02e0a1972ea40e756346642229c815ed8b0
+  metadata.gz: 0a3550348676d001eaf4c5079c6f0bfc1f1caba9eb05a8920f56d4761e0f333f
+  data.tar.gz: ca409eef164d2fda047600b1f5ac609fc0626ca84e8266b501af2fdad7f4a992
 SHA512:
-  metadata.gz: c1228157e01f3d08383e6addddeabe9f7c9bf66cba682af39428ac961b7260d27fcd457ab0787bb4eaef4c6c2a8eb17bf15ee436d9b83f2737776ce9c8318d61
-  data.tar.gz: 109dc23dd6c225f0d0006afc7bf89d3ec49eb52e62003f4ab969979665d525fcd78e96ac2d9f1120175f1dc61d7102278a1db3c5ae867f6463ab42f8e90f012a
+  metadata.gz: 77948de2c46b5cd16f33a8c44fff0c8cecf6701802a0c33d68619cea5daeb061d7a1f7d6ace4ec0ff4a321d5d3daf780f9808766edd552915f6277133c8340e4
+  data.tar.gz: a3753a90fe4251eb673b72c072367ba6af4b1ed164ef4243288abe3dc43233bc0b059db866a4084ebb8d1cd79adc2b2212a532b3902a43b65ac4a8e337b7d22e

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,7 +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")
         for batch in batches
           batch.execute
         end

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.20.14"
+  VERSION = "0.20.17"
 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.14
+  version: 0.20.17
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic