prick 0.20.13 → 0.20.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4435f17e31e98bc0c62c1f7c92818f71f059bc308522ab1ed8ac6acb17825768
-  data.tar.gz: aaaf83164a0de30d6a134cc12159cf5fed858806a68e4dba9738da93abd24e15
+  metadata.gz: 20f00d302f4282832c257119bf9bfe5f2d171c9d706ec74bca142681d670a596
+  data.tar.gz: 5facc31ae461bcc1919509d81d71ea4f9244c20fae8e5a693f991b419343d47b
 SHA512:
-  metadata.gz: 0b6939f154a1e04af830c9bad778deb871f6573dd729afebf776fad34b06bbda1d6debe11b3d38278ec1f09357a6218723e70e0983a93dd6f3f6db2c4311fb5e
-  data.tar.gz: c291aeef50d1e5a133c47c7908653762da31d047852bcdfcfe19a0a97114efeb3118f9d2c759466621ece995120e3380107b57e97614410cbc82b18f813a1d7c
+  metadata.gz: 726d74592d2568c862538ea0692a01067eda7a7ffd3f5dba6b80abea1b3d3a96ae0f11faa5a4ee65792de764a628f4f73691d172f9e095b24b40cba9f140efc8
+  data.tar.gz: 708e3863256205385a418b4ce3436d3639f576fd6700d478b7e11933232187af6bda60988d0a952942cd56351d896835c574b8a31c920b991ac7a663dc89147e

data/exe/prick

@@ -74,10 +74,13 @@ SPEC = %(
       Kind can be 'users', 'data', 'schema', 'database' (the default), or 'all'. It is
       not an error if the object doesn't exist. TODO Only 'users' is currently defined
 
-  build! -t,time --dump=KIND? -- [SCHEMA]
+  build! -f,force -t,time --dump=KIND? -- [SCHEMA]
       Build the project. If SCHEMA is defined, later schemas are excluded.
       KIND can be 'nodes', 'allnodes' or 'batches' (the default)
 
+      Usually, schemas marked with 'no refresh' is not built, use --force to
+      rebuild all schemas
+
   make! -t,time --dump=KIND? -- [SCHEMA]
       @ Only rebuild changed files
 
@@ -180,7 +183,8 @@ begin
 
     when :build!
       dump = cmd.dump? ? cmd.dump("batches").to_sym : nil
-      Prick::SubCommand.build(database, username, args.expect(0..1), timer: cmd.time?, dump: dump)
+      Prick::SubCommand.build(
+        database, username, args.expect(0..1), force: cmd.force?, timer: cmd.time?, dump: dump)
 
     when :make!
       dump = cmd.dump? ? cmd.dump("batches").to_sym : nil

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

@@ -47,7 +47,6 @@ module Prick
         @clean = clean
         @pool = NodePool.new
         @root = Parser.parse(conn, dir)
-        @pg_graph_ignore_schemas = []
         load_pool(@root) # Collect nodes into pool
         @batches = nil # Initialized by #group
       end
@@ -95,6 +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 usage, create on schema public to public"
         for batch in batches
           batch.execute
         end

data/lib/builder/node_pool.rb

@@ -7,6 +7,9 @@ module Prick
 
       attr_reader :nodes
 
+      # All nodes including nodes deleted later on
+      attr_reader :all_nodes
+
       attr_reader :init_nodes
       attr_reader :decl_nodes
       attr_reader :seed_nodes
@@ -25,7 +28,9 @@ module Prick
       # to exclude foreign schemes that doesn't follow the PgGraph naming
       # conventions
       def pg_graph_ignore_schemas()
-        build_nodes.select(&:pg_graph_ignore_schema).map(&:schema).uniq
+        all_nodes.select { |node|
+          node.is_a?(BuildNode) && node.pg_graph_ignore_schema
+        }.map(&:schema).uniq
       end
 
       def refresh_schemas() 
@@ -43,6 +48,7 @@ module Prick
       def add(*nodes)
         nodes = Array(nodes).flatten
         @nodes.concat(nodes)
+        @all_nodes.concat(nodes)
         nodes.each { |node| 
           @schemas[node.schema] += 1
           @kind_nodes[node.phase]&.append(node)
@@ -83,6 +89,7 @@ module Prick
         else
           @schemas = Hash.new(0) # map from schema name to number of nodes
           @nodes = []
+          @all_nodes = []
           @init_nodes = []
           @decl_nodes = []
           @seed_nodes = []

data/lib/prick/version.rb

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

data/lib/subcommand/prick-build.rb

@@ -3,11 +3,13 @@
 require 'builder/builder.rb'
 
 module Prick::SubCommand
-  def self.build(database, username, schema, builddir: "schema", timer: nil, dump: nil)
+  def self.build(database, username, schema, builddir: "schema", force: false, timer: nil, dump: nil)
     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,28 +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
-            # Explicit schema is always rebuilt
-            refresh = [builder.refresh_schemas, schema].compact.flatten.uniq
-            keep = builder.keep_schemas.reject { |s| s == schema }
+            if force
+              # Drop all schemas
+              super_conn.rdbms.empty!(database)
 
-            # Rebuild non-existing keep-schemas
-            keep.reject! { |schema|
-              refresh << schema if !conn.schema.exist?(schema)
-            }
+            else
+              # Find schemas to refresh. This includes all schemas in the
+              # database
+              refresh_schemas = conn.schema.list
 
-            # Eliminate keep schemas from build pool
-            builder.pool.delete_schema(keep)
+              # Find existing keep-schemas
+              keep_schemas = builder.keep_schemas.select { |s| conn.schema.exist?(s) }
 
-            # Drop refresh schemes
-            refresh.each { |schema| conn.schema.drop(schema, cascade: true) }
+              # Remove keep-schemas from list of schemas
+              refresh_schemas -= keep_schemas
+
+              # Eliminate keep schemas from build pool
+              builder.pool.delete_schema(keep_schemas)
+
+              # Drop refresh schemes
+              refresh_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
+            end
           end
 
+          # Delete schemas after target scheme if present
           builder.pool.delete_schema(builder.pool.after_schema(schema)) if schema
         end
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.13
+  version: 0.20.16
 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