prick 0.20.15 → 0.20.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364c4c7c99807892c0714d99d531d19fe7fff8cfe23f80e56679d8649630b416
-  data.tar.gz: 5e2fcd8e46a130dd65451a76c22027352bd5b5a747d3996940f5f1c4941c1953
+  metadata.gz: 20f00d302f4282832c257119bf9bfe5f2d171c9d706ec74bca142681d670a596
+  data.tar.gz: 5facc31ae461bcc1919509d81d71ea4f9244c20fae8e5a693f991b419343d47b
 SHA512:
-  metadata.gz: 7e185c8ffc7d29d764672647994c95f67dcb8deb8ff2ab0fbe9edc278b8934b448834327b46897f0a92b268cb94b82011369c25035cba911358739f93ab6ed95
-  data.tar.gz: 18c403ced7bad45431dc4c63c3d00a4d9f9425f5096e8f1c736be81d99f3f814e0a7ecff9a6e72f6cd794703219e76b026e9c2bc9b132570f65ae470dbb75e95
+  metadata.gz: 726d74592d2568c862538ea0692a01067eda7a7ffd3f5dba6b80abea1b3d3a96ae0f11faa5a4ee65792de764a628f4f73691d172f9e095b24b40cba9f140efc8
+  data.tar.gz: 708e3863256205385a418b4ce3436d3639f576fd6700d478b7e11933232187af6bda60988d0a952942cd56351d896835c574b8a31c920b991ac7a663dc89147e

data/lib/builder/batch.rb

@@ -134,6 +134,8 @@ 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}"

data/lib/builder/builder.rb

@@ -94,7 +94,7 @@ module Prick
         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"
+        conn.exec "grant usage, create on schema public to public"
         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.15"
+  VERSION = "0.20.16"
 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,32 @@ 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
+              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) }
             end
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.15
+  version: 0.20.16
 platform: ruby
 authors:
 - Claus Rasmussen