prick 0.25.2 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dc4e433b296e10221975eb85be4abea219720e0612c0f9720369fd69e18daa1
-  data.tar.gz: 68215c2e6557dd7288bd3754a65780d4b6c3794ed10c7aecc714b856f5d94fc8
+  metadata.gz: 3fcaa84e14ed58667eaa0752b5dec5ba5786f3a32b2a598d8d78ab6636817e65
+  data.tar.gz: b9582bdb7d6733b0aaf50675581135e2c04fabe322d7c8ccbec5481569a7ec04
 SHA512:
-  metadata.gz: fd193deed4c0d020c6396ebb3862aaa8a65c6edbd1c28e822548db28412a60fb7e85ef357d1a72f883adc6375463415d926129988c8938cab767ce2ebf99a29b
-  data.tar.gz: 22c84f80ecc0eaec3d73e1c87586e705074d3793cafef5e954aaf9538c9fad04b012f50527a63bc611272c324f91e122e4366ac9d7315e91cd43a9ecabc33f2e
+  metadata.gz: 72cb0ca152e3805131079e3e9d473eb1fb8623d571bbdeddd398e943dc199bb31f5f0c1e94f78c163211dbc5bd2fcad5858e3ad11331e6a5fea70c898d07a047
+  data.tar.gz: bdd15924608544c695c2932b1a7e3581307917bced9f2a449caeb56962aa17546ed8a6314ce5f7450a519c01288c883d1d82d1980145d81ad1e9928e906ce207

data/lib/builder/builder.rb

@@ -34,7 +34,7 @@ module Prick
       forward_to :pool, :schemas,
                         :nodes, :decl_nodes, :init_nodes, :term_nodes,
                         :seed_nodes, :fox_seed_nodes, :sql_seed_nodes,
-                        :builder_nodes,
+                        :build_nodes,
                         :pg_graph_ignore_schemas, 
                         :refresh_schemas, :keep_schemas
 
@@ -92,7 +92,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.exec create_schemas.map { |schema| "create schema #{schema}" }
         for batch in batches
           batch.execute
         end

data/lib/prick/version.rb

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

data/lib/subcommand/prick-build.rb

@@ -48,10 +48,6 @@ module Prick::SubCommand
 
               # Drop refresh schemes
               refresh_schemas.each { |schema| conn.schema.drop(schema, cascade: true) }
-
-              # Re-create public schema
-              conn.schema.create("public", authorization: "postgres")
-              conn.exec "grant usage, create on schema public to public"
             end
           end
 

data/lib/subcommand/prick-make.rb

@@ -5,7 +5,7 @@ require 'builder/builder.rb'
 module Prick::SubCommand
   def self.make(database, username, schema, timer: nil, dump: nil)
     Timer.on! if timer
-    time "Prick::Command#build" do
+    time "Prick::Command#make" do
       begin
         super_conn = PgConn.new
         conn = nil
@@ -17,7 +17,7 @@ module Prick::SubCommand
         time "Load build object" do
           if super_conn.rdbms.exist? database
             conn = PgConn.new(database, username)
-            if conn.schema.exist_table? "prick", "versions" && !conn.empty?("prick.versions")
+            if conn.schema.exist_table?("prick", "versions") && !conn.empty?("prick.versions")
               built_at = conn.value("select built_at from prick.versions")
             end
           else
@@ -28,11 +28,19 @@ module Prick::SubCommand
 
           builder = Prick::Build::Builder.new(conn, "schema", clean)
 
-          if schema
-            builder.pool.after_schema(schema).each { |schema|
-              conn.schema.drop(schema, cascade: true)
-              builder.pool.delete_schema(schema)
+          if schema 
+            after_schemas = builder.pool.after_schema(schema)
+            refresh_schemas = builder.pool.refresh_schemas
+            conn.schema.drop(schema, cascade: true) # Marks it dirty
+
+            # Nuke later schemas 
+            # FIXME Not a good idea when sitting on a leaf schema.
+            # Forced-delete could be requested using 'prick make schema'
+            #
+            (after_schemas & refresh_schemas).each { |drop_schema|
+              conn.schema.drop(drop_schema, cascade: true)
             }
+            after_schemas.each { |delete_schema| builder.pool.delete_schema(delete_schema) }
           end
 
           touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > built_at }
@@ -41,7 +49,7 @@ module Prick::SubCommand
           touched_schema = touched_nodes.first&.schema
           missing_schema = builder.schemas.find { |schema| !conn.schema.exist?(schema) }
           build_schema = builder.schemas.find { |schema| [touched_schema, missing_schema].include? schema }
-
+          
           if build_schema.nil?
             puts "#{database} is up to date"
             exit

metadata

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