prick 0.20.12 → 0.20.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bbd123a6ed9f156d8e3408f12a1abbcccac79b135eb23534729545cce186978
-  data.tar.gz: cc694d4fce96f0e89e481ea6ae8d0af9c3ee81549acfd87695fc49e05b907d42
+  metadata.gz: 364c4c7c99807892c0714d99d531d19fe7fff8cfe23f80e56679d8649630b416
+  data.tar.gz: 5e2fcd8e46a130dd65451a76c22027352bd5b5a747d3996940f5f1c4941c1953
 SHA512:
-  metadata.gz: a89feccaa6e1c4773c15247e36650b65fb8db37d4f76eac6dc557844a346429b516c93d0b98658362ba85a733205cd7ddce75d3c105523018abaad7cfff1f15d
-  data.tar.gz: 9467de6887a0d8161c71e046fe5c802149719e3a1db8a7f6ddbd31a1687eb166fe179ebe6ddf634f28efb86b6720716ed5074953c36bbf3eee59b940a4db280e
+  metadata.gz: 7e185c8ffc7d29d764672647994c95f67dcb8deb8ff2ab0fbe9edc278b8934b448834327b46897f0a92b268cb94b82011369c25035cba911358739f93ab6ed95
+  data.tar.gz: 18c403ced7bad45431dc4c63c3d00a4d9f9425f5096e8f1c736be81d99f3f814e0a7ecff9a6e72f6cd794703219e76b026e9c2bc9b132570f65ae470dbb75e95

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

@@ -102,11 +102,12 @@ module Prick
           files = nodes.map(&:path)
 
           # Load meta object
-          meta = PgMeta.new(conn)
+          meta = PgMeta.new(conn, exclude_schemas: builder.pg_graph_ignore_schemas)
 
           # Create type object
           type = PgGraph::Type.new(meta, builder.reflections_file)
 
+          # Timer
           t_type.stop
           t_fox = Timer.new "  Parse files"
 
@@ -126,6 +127,7 @@ module Prick
           # Dump state file
           fox.write_state(FOX_STATE_PATH)
 
+          # Timer
           t_fox.stop
           t_exe = Timer.new "  Execute SQL"
 

data/lib/builder/builder.rb

@@ -31,9 +31,12 @@ module Prick
       # Pool of nodes. Initialized by #load_pool
       attr_reader :pool
 
-      forward_to :pool, :nodes, :decl_nodes, :init_nodes, :term_nodes,
+      forward_to :pool, :schemas,
+                        :nodes, :decl_nodes, :init_nodes, :term_nodes,
                         :seed_nodes, :fox_seed_nodes, :sql_seed_nodes,
-                        :schemas
+                        :builder_nodes,
+                        :pg_graph_ignore_schemas, 
+                        :refresh_schemas, :keep_schemas
 
       def batches() @batches ||= group end
 
@@ -90,6 +93,8 @@ 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/node.rb

@@ -142,6 +142,7 @@ module Prick
       end
     end
 
+    # A build.yml file node
     class BuildNode < Node
       def nodes() @nodes ||= init_nodes + decl_nodes + seed_nodes + term_nodes end
 
@@ -150,12 +151,17 @@ module Prick
       attr_reader :term_nodes
       attr_reader :seed_nodes
 
+      attr_accessor :pg_graph_ignore_schema
+      attr_accessor :refresh_schema
+
       def initialize(parent, path)
         super(parent, nil, :yml, path)
         @decl_nodes = []
         @init_nodes = []
         @term_nodes = []
         @seed_nodes = []
+        @pg_graph_ignore_schema = false
+        @refresh_schema = true
       end
 
       def inspect() to_s end
@@ -164,6 +170,7 @@ module Prick
         puts "BuildNode #{path}"
         indent {
           puts "schema: #{schema}" if schema
+          puts "pg_graph_ignore_schema: #{pg_graph_ignore_schema}"
           decl_nodes.each(&:dump)
           for kind in [:init, :term, :seed]
             kind_nodes = self.send("#{kind}_nodes".to_sym)

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
@@ -18,6 +21,26 @@ module Prick
       def fox_seed_nodes() seed_nodes.select { |node| node.kind == :fox } end
       def sql_seed_nodes() seed_nodes.select { |node| node.kind == :sql } end
 
+      # List of BuildNode nodes
+      def build_nodes() nodes.select { |node| node.is_a?(BuildNode) } end
+
+      # List of schemas to ignore when building PgGraph objects. This is used
+      # to exclude foreign schemes that doesn't follow the PgGraph naming
+      # conventions
+      def pg_graph_ignore_schemas()
+        all_nodes.select { |node|
+          node.is_a?(BuildNode) && node.pg_graph_ignore_schema
+        }.map(&:schema).uniq
+      end
+
+      def refresh_schemas() 
+        build_nodes.select(&:refresh_schema).map(&:schema).uniq
+      end
+
+      def keep_schemas()
+        build_nodes.reject(&:refresh_schema).map(&:schema).uniq
+      end
+
       def initialize() 
         self.clear
       end
@@ -25,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)
@@ -65,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/builder/parser.rb

@@ -50,7 +50,10 @@ module Prick
             entry.each { |key, value|
               if key == "schema"
                 unit.schema = value
-#               @schemas[unit.schema = value] = true
+              elsif key == "standard"
+                unit.pg_graph_ignore_schema = !value
+              elsif key == "refresh"
+                unit.refresh_schema = value
               else
                 case key
                   when "init"; unit.init_nodes

data/lib/prick/version.rb

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

data/lib/subcommand/prick-build.rb

@@ -3,24 +3,49 @@
 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
+
         conn = nil
         builder = nil
-
         time "Load build object" do
           if super_conn.rdbms.exist? database
             conn = PgConn.new(database, username)
-            super_conn.rdbms.empty!(database)
+            exist = true
           else
             super_conn.rdbms.create database, owner: username
             conn = PgConn.new(database, username)
+            exit = false
           end
 
           builder = Prick::Build::Builder.new(conn, builddir)
+
+          if exist
+            if force
+              builder.schemas.each { |schema| conn.schema.drop schema, cascade: true }
+
+            else
+              # Explicit schema is always rebuilt
+              refresh = [builder.refresh_schemas, schema].compact.flatten.uniq
+              keep = builder.keep_schemas.reject { |s| s == schema }
+
+              # Rebuild non-existing keep-schemas
+              keep.reject! { |schema|
+                refresh << schema if !conn.schema.exist?(schema)
+              }
+
+              # 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
         

data/prick.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bootsnap"
   spec.add_dependency "fixture_fox", "~> 0.1.3"
   spec.add_dependency "postspec"
-  spec.add_dependency "pg_graph", "~> 0.1.7"
+  spec.add_dependency "pg_graph", "~> 0.1.8"
   spec.add_dependency "shellopts", "~> 2.0.23"
 
   spec.add_development_dependency "ruby-prof"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.20.12
+  version: 0.20.15
 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
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: shellopts
   requirement: !ruby/object:Gem::Requirement