prick 0.20.13 → 0.20.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4435f17e31e98bc0c62c1f7c92818f71f059bc308522ab1ed8ac6acb17825768
-  data.tar.gz: aaaf83164a0de30d6a134cc12159cf5fed858806a68e4dba9738da93abd24e15
+  metadata.gz: 863269702a01df7b25038a6eae9e0b2f636e20311276919cdecf6f201540d14b
+  data.tar.gz: bdf5d57641b5e250d667ff924eacd02e0a1972ea40e756346642229c815ed8b0
 SHA512:
-  metadata.gz: 0b6939f154a1e04af830c9bad778deb871f6573dd729afebf776fad34b06bbda1d6debe11b3d38278ec1f09357a6218723e70e0983a93dd6f3f6db2c4311fb5e
-  data.tar.gz: c291aeef50d1e5a133c47c7908653762da31d047852bcdfcfe19a0a97114efeb3118f9d2c759466621ece995120e3380107b57e97614410cbc82b18f813a1d7c
+  metadata.gz: c1228157e01f3d08383e6addddeabe9f7c9bf66cba682af39428ac961b7260d27fcd457ab0787bb4eaef4c6c2a8eb17bf15ee436d9b83f2737776ce9c8318d61
+  data.tar.gz: 109dc23dd6c225f0d0006afc7bf89d3ec49eb52e62003f4ab969979665d525fcd78e96ac2d9f1120175f1dc61d7102278a1db3c5ae867f6463ab42f8e90f012a

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/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

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.14"
 end

data/lib/subcommand/prick-build.rb

@@ -3,7 +3,7 @@
 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
@@ -24,22 +24,28 @@ module Prick::SubCommand
           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
+              builder.schemas.each { |schema| conn.schema.drop schema, cascade: true }
 
-            # Rebuild non-existing keep-schemas
-            keep.reject! { |schema|
-              refresh << schema if !conn.schema.exist?(schema)
-            }
+            else
+              # Explicit schema is always rebuilt
+              refresh = [builder.refresh_schemas, schema].compact.flatten.uniq
+              keep = builder.keep_schemas.reject { |s| s == schema }
 
-            # Eliminate keep schemas from build pool
-            builder.pool.delete_schema(keep)
+              # Rebuild non-existing keep-schemas
+              keep.reject! { |schema|
+                refresh << schema if !conn.schema.exist?(schema)
+              }
 
-            # Drop refresh schemes
-            refresh.each { |schema| conn.schema.drop(schema, cascade: true) }
+              # Eliminate keep schemas from build pool
+              builder.pool.delete_schema(keep)
+
+              # Drop refresh schemes
+              refresh.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.13
+  version: 0.20.14
 platform: ruby
 authors:
 - Claus Rasmussen