prick 0.20.10 → 0.20.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665b4f6868f55f1bbf9dc49d361e61c48aed945e98da96626115f6cca8abb7bc
-  data.tar.gz: 81fe9b58da6fe6cbe800d7027718b0b77ae025799600ce4ba62b900a482d70d9
+  metadata.gz: 4435f17e31e98bc0c62c1f7c92818f71f059bc308522ab1ed8ac6acb17825768
+  data.tar.gz: aaaf83164a0de30d6a134cc12159cf5fed858806a68e4dba9738da93abd24e15
 SHA512:
-  metadata.gz: 51fc6f79ee515714665e830efc923382f13b79d4fec59785c5776a7ed6f6ea0e42ceb0bda0550a73f21086aa01b95c8881643db02fa4a0306bc7e8cc77cb04b0
-  data.tar.gz: dfd428a987b78fdecf564b3e394436460f1d351dce5442c121967e4672010a5640af89019a01756054e8e9ef59c3548acfbeab51531f2d0979d6f84486710de9
+  metadata.gz: 0b6939f154a1e04af830c9bad778deb871f6573dd729afebf776fad34b06bbda1d6debe11b3d38278ec1f09357a6218723e70e0983a93dd6f3f6db2c4311fb5e
+  data.tar.gz: c291aeef50d1e5a133c47c7908653762da31d047852bcdfcfe19a0a97114efeb3118f9d2c759466621ece995120e3380107b57e97614410cbc82b18f813a1d7c

data/TODO

@@ -1,3 +1,14 @@
+o Fix that enum references are not created:
+
+    system_roles
+      - &app_registry_anon_system_role
+        system: APP_REGISTRY # <---------------------------- Creates a dangling reference
+        rolename: app_registry_anon_role
+        ordinal: 1
+        permissions:
+          - *app_registry_anon_permission
+
+
 
 o Store fox.state, reflections, and reflections in the database so third-party
   programs can use them when testing

data/exe/prick

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 #$LOAD_PATH.unshift "/home/clr/prj/shellopts/lib"
+#$LOAD_PATH.unshift "/home/clr/prj/pg_graph/lib"
 
 require 'bootsnap'
 begin

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
 
@@ -44,6 +47,7 @@ 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
@@ -90,6 +94,7 @@ 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/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

@@ -18,6 +18,24 @@ 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()
+        build_nodes.select(&: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

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.10"
+  VERSION = "0.20.13"
 end

data/lib/subcommand/prick-build.rb

@@ -8,19 +8,38 @@ module Prick::SubCommand
     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
+            # 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
+
           builder.pool.delete_schema(builder.pool.after_schema(schema)) if schema
         end
         

data/prick.gemspec

@@ -34,9 +34,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "constrain"
   spec.add_dependency "forward_to"
   spec.add_dependency "bootsnap"
-  spec.add_dependency "fixture_fox" "~> 0.1.3"
+  spec.add_dependency "fixture_fox", "~> 0.1.3"
   spec.add_dependency "postspec"
-  spec.add_dependency "pg_graph"
+  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.10
+  version: 0.20.13
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-04 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fixture_fox~> 0.1.3
+  name: fixture_fox
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: postspec
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: pg_graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: shellopts
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql