prick 0.33.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38cab1d940acbbaf8c36dadfddd5ce8a003e45fd881c0af033ee16b9b1bcb9b
-  data.tar.gz: c9c67dd1b746adf191a2193c536a7c2a97a962f5a7b70c371ecf42bb60621cec
+  metadata.gz: b8acf851da65b094d2abab5a6d9469f20a974732b9e8a8f5bbc4542f72bf8dae
+  data.tar.gz: d7ce7beb146b47aea6f25a93771b206a41434bd2ecbd3a1df33b8580374e29ea
 SHA512:
-  metadata.gz: 7f81c8872d37f1b2f772c013c3fd1dad4f5936552aa8a6fa32b1b594d6da5ed20e06725590fd2a5317a8c9cda41b591845c6a68ec7ab4c2b82842b3fd2599c9c
-  data.tar.gz: 17c08c190070820e63facc09a7411c8f90b43f7994a8a5eefc04baa2c7f0a9647ec562ce000d0677289d922f56c5eae410f68d0b323e8f177df122c1167b9fec
+  metadata.gz: b861e5129259bcb0dd384ba7e3c2db09c826cd50105ec514bda309268779e56458a99a3ef8ca1b83226accf7ce6569b957790e5c4374473a3cfb3700ba5ef380
+  data.tar.gz: 6c1b7227ffa63e49825f4acb503d855b9110f18224c1b3f2f7b27b72a92ac0eb3865ea8926470995a71988cb64ab9aa4a5bb26420adafd152364fd31ee28d23a

data/TODO

@@ -1,3 +1,4 @@
+o make it possible to build only one scheme
 o cleanup connection
 o make environment optional
 o eval vs exit

data/exe/prick

@@ -119,20 +119,27 @@ SPEC = %(
 
       TODO
 
-  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). 
+  build! --step -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). Schemas marked
+      with 'no refresh' is not built unless the --force is present
 
-      Schemas marked with 'no refresh' is not built unless the --force is
-      present
-
-  make! -t,time --dump=KIND? -- [SCHEMA]
+  make! --step -t,time --dump=KIND? -- [SCHEMA]
       @ Only rebuild changed files
 
       Checks file timestamps against the time of the last build and only
       rebuild affected parts of the project. KIND can be 'nodes', 'allnodes' or
       'batches' (the default)
 
+  run! --step -t,time --dump=KIND? --schema=SCHEMA -- PATH
+      @ Execute path in Prick environment
+
+      Execute a single directory or file within the Prick environment. If given
+      a directory argument, the directory is searched for a build.yml file. If
+      given a file argument, the file should be a .sql, .fox, or build file
+
+      The --schema option sets the current schema before executing the PATH
+
   bash! --main
       Emit a bash script to build the database. The script is constructed from
       the build attributes in the environment file
@@ -354,12 +361,22 @@ begin
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
-          database, username, args.expect(0..1), force: cmd.force?, timer: cmd.time?, dump: dump)
+          database, username, args.expect(0..1), 
+          force: cmd.force?, step: cmd.step?, timer: cmd.time?, dump: dump)
 
     when :make!
       require_db
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
-      Prick::SubCommand.make(database, username, args.expect(0..1), timer: cmd.time?, dump: dump)
+      Prick::SubCommand.make(
+          database, username, args.expect(0..1), 
+          step: cmd.step?, timer: cmd.time?, dump: dump)
+
+    when :run!
+      require_db
+      dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
+      Prick::SubCommand.run(
+          database, username, args.expect(1), 
+          step: cmd.step?, timer: cmd.time?, dump: dump, schema: cmd.schema)
 
     when :bash!
       Prick::SubCommand.bash(main: cmd.main?)
@@ -479,7 +496,8 @@ rescue ShellOpts::Error, Prick::Error => ex
   raise
   ShellOpts.error(ex.message)
 
-rescue RuntimeError, IOError, ShellOpts::Failure, Prick::Failure, Prick::Build::PostgresError => ex 
-  ShellOpts.failure(ex.message)
+# FIXME
+#rescue RuntimeError, IOError, ShellOpts::Failure, Prick::Failure, Prick::Build::PostgresError => ex 
+# ShellOpts.failure(ex.message)
 end
 

data/lib/prick/builder/batch.rb

@@ -28,7 +28,8 @@ module Prick
     end
 
     class SqlBatch < BuildBatch
-      def execute(step: true) # This is marginally faster!
+      def execute
+#       puts "#execute"
         super {
           begin
             sql = []
@@ -41,22 +42,16 @@ module Prick
               sql = [node.source]
             end
 
-            if step
-              conn.execute sql, silent: true if !sql.empty?
-              for node in nodes
-                conn.execute node.source, silent: true
-              end
-            else
-              node = nil
-              conn.execute sql + nodes[sql.size..-1].map(&:source), silent: true
+            conn.execute sql, silent: true if !sql.empty?
+            for node in nodes # This is marginally faster than concatenating all nodes
+#             puts node.source
+              conn.execute node.source, silent: true
             end
 
           rescue PG::Error => ex
             error, line, char = conn.err
             file = nil
-            if step
-              ;
-            elsif line
+            if line
               # Locate error node and make line number relative
               if line < nodes.first.lines
                 node = nodes.first
@@ -81,6 +76,7 @@ module Prick
             elsif node
               message = "#{error} from #{node.path}"
             else
+              raise ArgumentError, "Oops"
               message = conn.errmsg + " in SQL batch"
             end
             raise PostgresError.new(message, file, line, char)

data/lib/prick/builder/builder.rb

@@ -27,9 +27,12 @@ module Prick
       # PgConn object
       attr_reader :conn
 
-      # Root schema directory
+      # Schema directory
       attr_reader :dir
 
+      # Path to file or directory
+      attr_reader :path
+
       # Reflections YAML file
       attr_reader :reflections_file
 
@@ -39,6 +42,12 @@ module Prick
       # Root build node
       attr_reader :root
 
+      # True if this is a single-file build
+      attr_reader :single
+
+      # True if SQL entries should be single-stepped. Default false
+      attr_reader :step
+
       # Pool of nodes. Initialized by #load_pool
       attr_reader :pool
 
@@ -49,21 +58,31 @@ module Prick
                         :pg_graph_ignore_schemas, 
                         :refresh_schemas, :keep_schemas
 
-      def batches() @batches ||= group end
+      def batches() @batches || create_batches end
+
+      def initialize(conn, path, clean = true, single: false, touched: false, load_pool: true, step: false)
+        File.exist?(path) or raise Error, "Can't find #{path}"
+        single || File.directory?(path) or raise Error, "Can't find directory #{path}"
 
-      def initialize(conn, dir, clean = true, touched: false)
         @conn = conn
-        @dir = dir
+        @path = path
         @reflections_file = REFLECTIONS_PATH
         @clean = clean
+        @single = single
+        @step = step
+        @root = Parser.parse(conn, path, single: single)
+        @pool = nil # Initialized by #load_pool
+        @batches = nil # Initialized by #create_batches
+        self.load_pool if load_pool
+      end
+
+      def load_pool
         @pool = NodePool.new
-        @root = Parser.parse(conn, dir)
-        load_pool(@root) # Collect nodes into pool
-        @batches = nil # Initialized by #group
+        load_pool_impl(@root)
       end
 
       # Group sources into batches
-      def group
+      def create_batches
         @batches = []
         kind = nil
         batch = nil
@@ -78,8 +97,11 @@ module Prick
             when :exe # Exe sources always create a new batch
               @batches << batch if batch
               batch = SqlBatch.new(self)
-            when batch&.kind
-              ;
+            when batch&.kind # Same kind as current batch
+              if node.kind == :sql && step
+                @batches << batch if batch
+                batch = SqlBatch.new(self)
+              end
             when :sql || node.kind == :inline
               if batch&.kind != :exe
                 @batches << batch if batch
@@ -98,22 +120,30 @@ module Prick
           end
           batch.nodes << node
         end
-
         @batches << batch if batch
+
+        @batches
       end
 
       def execute(conn, create_schemas: schemas)
+        # Load pool
+        load_pool if pool.nil?
+
         # Group batches
-        group if batches.nil?
+        create_batches if batches.nil?
 
         # Register build in database
         Prick.state.save_build_begin
 
         # Create schemas
-        conn.exec create_schemas.map { |schema| "create schema #{schema}" }
+        conn.exec create_schemas.map { |schema| "create schema #{schema}" } if !single
 
         # Execute batch groups
         t0 = Time.now
+#       for batch in batches
+#         puts "Executing #{batch.class} batch"
+#         batch.execute
+#       end
         batches.each(&:execute)
         t1 = Time.now
 
@@ -123,15 +153,16 @@ module Prick
       end
 
       def dump
+        load_pool if pool.nil?
         batches ? batches.each(&:dump) : pool.dump
       end
 
     private
-      def load_pool(build_node)
+      def load_pool_impl(build_node)
         pool.add(build_node.init_nodes)
         build_node.decl_nodes.each { |node| 
           pool.add node
-          load_pool(node) if node.kind == :yml
+          load_pool_impl(node) if node.kind == :yml
         }
         pool.add(build_node.seed_nodes)
         pool.add(build_node.term_nodes)

data/lib/prick/builder/node.rb

@@ -10,6 +10,8 @@ module Prick
 
       def name() @name = File.basename(path) end
 
+      # Note that schema defaults to 'public' which may not be what you want in
+      # some cases
       def schema() @schema ||= parent&.schema || "public" end
       def schema=(s) @schema = s end
 
@@ -36,6 +38,7 @@ module Prick
         constrain path, String, NilClass
         @parent, @phase, @kind, @path = parent, phase, kind, path
         @args = args&.empty? ? nil : args
+        @has_schema = false
         @schema = nil
         @source = nil
         @source_lines = nil
@@ -43,7 +46,7 @@ module Prick
 
       def to_s() @to_s ||= [path, args].compact.join(" ") end
       def inspect() to_s end
-      def dump() puts "#{inspect} (#{schema})" end
+      def dump() puts "#{inspect} (#{@schema || 'nil'})" end
 
     protected
       def read_source
@@ -162,6 +165,9 @@ module Prick
 
     # A build.yml file node
     class BuildNode < Node
+      # True if the build file contains a 'schema' attribute
+      attr_accessor :has_schema
+
       def nodes() @nodes ||= init_nodes + decl_nodes + seed_nodes + term_nodes end
 
       attr_reader :decl_nodes
@@ -187,7 +193,8 @@ module Prick
       def dump
         puts "BuildNode #{path}"
         indent {
-          puts "schema: #{schema}" if schema
+          puts "has_schema: #{has_schema}"
+          puts "schema: #{@schema || 'nil'}"
           puts "refresh: #{refresh_schema.to_s}"
           puts "pg_graph_ignore_schema: #{pg_graph_ignore_schema}"
           decl_nodes.each(&:dump)

data/lib/prick/builder/parser.rb

@@ -1,30 +1,30 @@
 module Prick
   module Build
     class Parser
-      def self.parse(conn, dir)
-        Parser.new(conn).parse(dir).unit
-#       [parser.unit, parser.schemas]
+      def self.parse(conn, path, single: true)
+        Parser.new(conn).parse(path, single: single).unit
       end
 
       attr_reader :conn
-      attr_reader :dir
       attr_reader :unit # The singular RootBuildNode object
-#     attr_reader :schemas
 
       def initialize(conn)
         @conn = conn
         @unit = nil
       end
 
-      def parse(dir)
-        @dir = dir
-#       @schemas = {}
-        parse_directory(nil, dir)
+      # Return a RootBuildNode object. #path can be a file or a directory
+      def parse(path, single: false)
+        File.exist?(path) or raise Error, "Can't find #{path}"
+        if single
+          parse_path(path)
+        else
+          parse_directory(nil, path)
+        end
         self
       end
 
     private
-
       # First built unit is a RootBuildNode, the rest are regular BuildNode objects
       def make_build_unit(parent, path)
         if @unit
@@ -34,47 +34,14 @@ module Prick
         end
       end
 
-      # Search for an executable in path. Return nil if not found
-      def find_executable(filename) # ChatGPT
-        Prick.state.executable_search_path.split(File::PATH_SEPARATOR).each do |directory|
-          path = File.join(directory, filename)
-          return path if File.executable?(path)
-        end
-        nil
-      end
-
-      # Expand environments variables file name. Iterates through inherited
-      # environments if the file name contain the $ENVIRONMENT variable. Return
-      # nil if not found
-      #
-      # The hierarchy of environments is defined in the PRICK_ENVIRONMENT_FILE
-      #
-      def expand_filename(dir, filename)
-        envs = Prick.state.environments
-        env = envs[Prick.state.environment]
-        bash_vars = Prick.state.bash_environment
-
-        last = nil
-        for env in [env] + env.ancestors.reverse
-          bash_vars["ENVIRONMENT"] = env.name
-          file = expand_variables(filename, bash_vars)
-          last ||= (file != last and file) or return nil # return if no ENVIRONMENT substitution
-          path = (file.start_with?("/") ? file : File.join(dir, file))
-
-          # Check for file (may be executable)
-          return path if File.exist?(path)
-
-          # Check for executable in search path
-          path = find_executable(file) and return path if file !~ /\//
-        end
-
-        # Return nil if not found
-        return nil
-      end
-
-      # Expand $ENVIRONMENT variable
-      def expand_string(string)
-        expand_variables(string, Prick.state.bash_environment)
+      def parse_path(path, schema: nil)
+        File.exist?(path) or raise Error, "Can't find #{file}"
+        dir = File.dirname(path)
+        file = File.basename(path)
+        unit = make_build_unit(nil, nil)
+        unit.schema = schema if schema
+        entry = parse_build_entry(unit, dir, file)
+        unit
       end
 
       def parse_directory(parent, dir)
@@ -82,7 +49,7 @@ module Prick
         if File.exist? build_file
           parse_build_file(parent, dir, build_file)
         else
-          raise Error, "Can't find build.yml in #{dir}"
+          raise Error, "Can't find build.yml in #{dir} while parsing #{parent}"
         end
       end
 
@@ -94,6 +61,7 @@ module Prick
             entry.each { |key, value|
               if key == "schema"
                 unit.schema = value
+                unit.has_schema = true
               elsif key == "standard"
                 unit.pg_graph_ignore_schema = !value
               elsif key == "refresh"
@@ -109,17 +77,22 @@ module Prick
               end
             }
           else
-            node = parse_entry(unit, :decl, dir, entry) or next
-            if node.kind == :fox
-              unit.seed_nodes << node
-            else
-              unit.decl_nodes << node
-            end
+            parse_build_entry(unit, dir, entry)
           end
         }
         unit
       end
 
+      def parse_build_entry(unit, dir, file)
+        node = parse_entry(unit, :decl, dir, file) or return nil
+        if node.kind == :fox
+          unit.seed_nodes << node
+        else
+          unit.decl_nodes << node
+        end
+        node
+      end
+
       # Returns path, filename, and an array of arguments. It is an error if
       # the file can't be found unless #optional is true. In that case a nil
       # value is returned
@@ -132,7 +105,7 @@ module Prick
           args = expand_string(rest || '').split
           path = expand_filename(dir, command)
           path || optional or 
-              raise Error, "Can't find file\n   #{command}\n   #{path}\n   in #{dir}/\n   from #{unit}"
+              raise Error, "Can't find file #{command} #{path} in #{dir}/ from #{unit}"
           !path.nil? or return nil
         else
           raise Error, "Not a file name: '#{entry}'"
@@ -141,6 +114,7 @@ module Prick
       end
 
       def parse_entry(unit, phase, dir, entry)
+#       puts "#parse_entry(#{unit.inspect}, #{phase.inspect}, #{dir.inspect}, #{entry.inspect})"
         if entry.is_a?(Hash)
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
@@ -175,7 +149,9 @@ module Prick
                 SqlNode.new(unit, phase, path)
               when /\.fox$/
                 FoxNode.new(unit, :seed, path)
-              when /build-.*\.yml$/
+              when /(?:^|\/)build-.*\.yml$/
+                parse_build_file(unit, dir, path)
+              when /(?:^|\/)build.yml$/ # Only used when building a single file
                 parse_build_file(unit, dir, path)
             else
               raise Error, "Expected executable, fox, or sql file: #{File.basename(path)} in #{dir}"
@@ -185,6 +161,56 @@ module Prick
           end
         end
       end
+
+      # Search for an executable in path. Return nil if not found
+      #
+      # Note that "." is ignored in the search path 
+      def find_executable(filename) # ChatGPT
+        Prick.state.executable_search_path.split(File::PATH_SEPARATOR).each do |directory|
+          next if directory == "."
+          path = File.join(directory, filename)
+          return path if File.file?(path) && File.executable?(path)
+        end
+        nil
+      end
+
+      # Expand environment variables in the given file name
+      #
+      # #expend_filename substitute '$<variable>' expressions in the filename
+      # with the corresponding value in the current environment. If the file
+      # was not found, inherited environments are processed hierarchly with the
+      # special environment variable ENVIRONMENT set to each PRICK_ENVIRONMENT
+      # value in the inherited environments
+      #
+      # Return the resulting path to the file and nil if not found
+      #
+      def expand_filename(dir, filename)
+        envs = Prick.state.environments
+        env = envs[Prick.state.environment]
+        bash_vars = Prick.state.bash_environment.dup
+
+        last = nil
+        for env in [env] + env.ancestors.reverse
+          bash_vars["ENVIRONMENT"] = env.name
+          file = expand_variables(filename, bash_vars)
+#         last ||= (file != last and file) or return nil # return if no ENVIRONMENT substitution
+          path = (file.start_with?("/") ? file : File.join(dir, file))
+
+          # Check for file (may be executable)
+          return path if File.exist?(path)
+
+          # Check for executable in search path if file doesn't contain a '/'
+          path = find_executable(file) and return path if file !~ /\//
+        end
+
+        # Return nil if not found
+        return nil
+      end
+
+      # Expand $ENVIRONMENT variable
+      def expand_string(string)
+        expand_variables(string, Prick.state.bash_environment)
+      end
     end
   end
 end

data/lib/prick/environment.rb

@@ -245,13 +245,12 @@ module Prick
           case types[ident]
             when "BOOLEAN"
               [TrueClass, FalseClass].include?(value.class) or raise "Illegal value for #{ident}: #{value}"
-              ;
             when "STRING"
               ; # nop
             when "LIST"
               value = value&.split || []
             when "TEXT"
-              value = value.chomp
+              value = (value == false ? "false" : value.chomp)
             when nil
               ShellOpts.error "Unknown variable '#{ident}'"
           else

data/lib/prick/state.rb

@@ -14,6 +14,9 @@ module Prick
     # directory through the -C option or the 'init' command
     def prick_dir() @prick_dir ||= Dir.getwd end
 
+    # Prick schema dir
+    def schema_dir() @schema_dir ||= File.join(prick_dir, SCHEMA_DIR) end
+
     # Project file. Default 'prick.yml'
     attr_reader :project_file
 
@@ -186,7 +189,7 @@ module Prick
         hash.merge!({
           "DATABASE" =>  Prick.state.database, # FIXME: Yt
           "USERNAME" =>  Prick.state.username, # FIXME: Yt
-          "ENVIRONMENT" =>  Prick.state.environment.to_s, # FIXME: Yt
+          "ENVIRONMENT" =>  Prick.state.environment.to_s, # FIXME: Yt except in build.yml parser
           "PRICK_NAME" => Prick.state.name,
           "PRICK_TITLE" => Prick.state.title,
           "PRICK_VERSION" => Prick.state.version,

data/lib/prick/subcommand/prick-build.rb

@@ -5,8 +5,9 @@ require_relative '../builder/builder.rb'
 module Prick::SubCommand
   def self.build(
       database, username, schema, 
-      builddir: "schema", force: false, 
-      timer: nil, dump: nil)
+      builddir: Prick.state.schema_dir, 
+      force: false, # Build all schemas
+      step: false, timer: nil, dump: nil)
 
     Timer.on! if timer
 
@@ -29,7 +30,7 @@ module Prick::SubCommand
           end
           conn = Prick.state.connection
 
-          builder = Prick::Build::Builder.new(conn, builddir)
+          builder = Prick::Build::Builder.new(conn, builddir, step: step)
 
           if exist # Empty (part of) the database
             if force
@@ -49,8 +50,8 @@ module Prick::SubCommand
               # Remove keep-schemas from list of schemas
               refresh_schemas -= keep_schemas
 
-              # Also remove keep-schemas from the build pool. Why don't we use
-              # the pool tracker's list of keep schemas?
+              # Also remove keep-schemas from the build pool. TODO Why don't we
+              # use the pool tracker's list of keep schemas?
               builder.pool.delete_schema(keep_schemas)
 
               # Drop refresh schemes

data/lib/prick/subcommand/prick-make.rb

@@ -3,9 +3,9 @@
 require_relative '../builder/builder.rb'
 
 module Prick::SubCommand
-  def self.make(database, username, schema, timer: nil, dump: nil)
+  def self.make(database, username, schema, step: false, timer: nil, dump: nil)
     Timer.on! if timer
-    time "Prick::Command#make" do
+    Timer.time "Prick::Command#make" do
       begin
         super_conn = State.connection
         conn = nil
@@ -14,7 +14,7 @@ module Prick::SubCommand
         clean = false
         create_schemas = []
 
-        time "Load build object" do
+        Timer.time "Load build object" do
           if super_conn.rdbms.exist? database
             conn = Prick.state.connection
             if conn.schema.exist_relation?("prick", "versions") && !conn.empty?("prick.versions")
@@ -26,7 +26,7 @@ module Prick::SubCommand
             clean = true
           end
 
-          builder = Prick::Build::Builder.new(conn, "schema", clean)
+          builder = Prick::Build::Builder.new(conn, "schema", clean, step: step)
 
           if schema 
             after_schemas = builder.pool.after_schema(schema)
@@ -43,7 +43,7 @@ module Prick::SubCommand
             after_schemas.each { |delete_schema| builder.pool.delete_schema(delete_schema) }
           end
 
-          touched_nodes = builder.nodes.select { |node| File.mtime(node.path) > last_built_at }
+          touched_nodes = builder.nodes.select { |node| last_built_at.nil? || File.mtime(node.path) > last_built_at }
           touched_phases = touched_nodes.map(&:phase).uniq.compact
           touched_kinds = touched_nodes.map(&:kind).uniq.compact
           touched_schema = touched_nodes.first&.schema
@@ -78,7 +78,7 @@ module Prick::SubCommand
         end
         exit if dump
 
-        time "Execute build object" do
+        Timer.time "Execute build object" do
           builder.execute(conn, create_schemas: create_schemas)
         end
 

data/lib/prick/subcommand/prick-run.rb

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+
+require_relative '../builder/builder.rb'
+
+module Prick::SubCommand
+  def self.run(database, username, path, step: false, timer: nil, dump: nil, schema: nil)
+
+    Timer.on! if timer
+
+    Timer.time "Prick::Command#build" do
+      begin
+        super_conn = State.connection # Used to create new databases (doesn't make a
+                                      # difference right now as the database user is
+                                      # a superuser anyway
+        conn = nil
+        builder = nil
+
+        constrain super_conn.rdbms.exist?(database), true # FIXME Same problem as below. Also in other commands
+
+        Timer.time "Load build object" do
+          if super_conn.rdbms.exist? database # FIXME Why create database? Setup should have done this
+            exist = true
+          else
+            super_conn.rdbms.create database, owner: username
+            exist = false
+          end
+          conn = Prick.state.connection
+
+          # Parse
+          builder = Prick::Build::Builder.new(conn, path, single: true, load_pool: false, step: step)
+
+          # Register if a build file is referenced and normalize path to
+          # include build.yml of directories
+          if File.directory?(path)
+            path = File.join(path, "build.yml")
+            is_build_file = true
+          elsif File.basename(path) == "build.yml"
+            is_build_file = true
+          else
+            is_build_file = false
+          end
+        
+          # Read schema from build file if possible and decide if schema should
+          # be dropped beforehand
+          if is_build_file
+            if builder.root.has_schema
+              !schema or Prick.error "Can't use --schema when doing a schema build"
+              is_schema_rebuild = true
+              schema = build_node.schema
+            else
+              is_schema_rebuild = false
+            end
+          else
+            is_schema_rebuild = false
+          end
+
+          # Infer schema from path
+          if !schema
+            abspath = File.realpath(path)
+            schemapath = File.realpath(Prick.state.schema_dir)
+            if abspath =~ /^#{schemapath}\/([^\/]+)(?:\/.*)$/
+              schema = $1
+            else
+              Prick.error "Can't find schema" # No default schema to avoid unintended runs
+            end
+          end
+
+          # Write-back schema to builder
+          builder.root.schema = schema
+
+          # Drop schema if needed
+          if is_schema_rebuild
+            conn.schema.drop schema, cascade: true 
+          end
+
+          # Create schema if absent
+          if !conn.schema.exist?(schema)
+            conn.schema.create(schema)
+          end
+        end
+
+        if dump
+          builder.load_pool
+          case dump
+            when :nodes; builder.nodes.reject { |node| node.is_a?(Build::BuildNode) }.map &:dump
+            when :allnodes; builder.nodes.map &:dump
+            when :batches; builder.dump
+          else
+            Prick.error "Illegal dump type: #{dump.inspect}"
+          end
+        else
+          Timer.time "Execute build object" do
+            builder.execute conn
+          end
+        end
+
+#     FIXME
+#     rescue Prick::Error => ex
+#       $stderr.puts ex.message
+#       exit 1
+#
+#     rescue ::Command::Error => ex
+#       $stderr.puts ex.message
+#       exit 1
+
+      ensure
+        super_conn&.terminate
+        conn&.terminate
+      end
+    end
+  end
+end
+

data/lib/prick/version.rb

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

data/lib/prick.rb

@@ -50,6 +50,7 @@ require_relative 'prick/subcommand/prick-list.rb'
 require_relative 'prick/subcommand/prick-make.rb'
 require_relative 'prick/subcommand/prick-migrate.rb'
 require_relative 'prick/subcommand/prick-release.rb'
+require_relative 'prick/subcommand/prick-run.rb'
 require_relative 'prick/subcommand/prick-set.rb'
 require_relative 'prick/subcommand/prick-setup.rb'
 require_relative 'prick/subcommand/prick-teardown.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -230,6 +230,7 @@ files:
 - lib/prick/subcommand/prick-make.rb
 - lib/prick/subcommand/prick-migrate.rb
 - lib/prick/subcommand/prick-release.rb
+- lib/prick/subcommand/prick-run.rb
 - lib/prick/subcommand/prick-set.rb
 - lib/prick/subcommand/prick-setup.rb
 - lib/prick/subcommand/prick-teardown.rb