prick 0.35.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8acf851da65b094d2abab5a6d9469f20a974732b9e8a8f5bbc4542f72bf8dae
-  data.tar.gz: d7ce7beb146b47aea6f25a93771b206a41434bd2ecbd3a1df33b8580374e29ea
+  metadata.gz: aa15e8c866ef97ee0ba04de08ca05ea38b5cf47d6cb156e09be24d3e10a0c8d5
+  data.tar.gz: 550a8f65c73c1148fa8f9359dbfb7299d0ae2ca4c8acfc3aea7c82f7254c399f
 SHA512:
-  metadata.gz: b861e5129259bcb0dd384ba7e3c2db09c826cd50105ec514bda309268779e56458a99a3ef8ca1b83226accf7ce6569b957790e5c4374473a3cfb3700ba5ef380
-  data.tar.gz: 6c1b7227ffa63e49825f4acb503d855b9110f18224c1b3f2f7b27b72a92ac0eb3865ea8926470995a71988cb64ab9aa4a5bb26420adafd152364fd31ee28d23a
+  metadata.gz: 0b6ccea7c28cb6068597899dc8f740629fc7e3d26d7457a06c7c0e76abca1987cf63e422f2be482300c8b44474e0cda941510c1e97653ec4af064c57bb79eea4
+  data.tar.gz: 2e2685d9b25938dc291204eaa7735a167cbd7014219678dddb86ed6e02aa90c960de3aaf8e79fbe64becfff198d435c5ad05aa1657856ce1e1ea5bacee1de9d2

data/exe/prick

@@ -150,6 +150,15 @@ SPEC = %(
       different data sets
 
       # TODO: A --clean option that resets data
+      #
+
+  snapshot!
+      Records maximum ID for all tables and stores them in prick.snapshot. It is
+      used by 'drop data' to reset data to the point in time of the snapshot.
+      Only one snapshot can be created at a time
+
+  reset!
+      Restore database to the last snapshot. TODO
 
   version!
       Print project version
@@ -223,6 +232,10 @@ def require_db(database = Prick.state&.database, exist: true)
   end
 end
 
+def clean_pg_meta_cache
+  FileUtils.rm_f(PG_META_STATE_PATH)
+end
+
 def parse_database_args(state, args)
   arg, environment = args.expect(0..2)
   if arg
@@ -296,13 +309,13 @@ begin
   database = state.database
   username = state.username
   environment = state.environment
-
   # Process subcommands
   case opts.subcommand
     when :version!
       puts "#{Prick.state.name}-#{Prick.state.version}"
 
     when :setup!
+      clean_pg_meta_cache
       state.project_loaded? or Prick.error "No #{project_file} found"
       username, database, environment = parse_database_args(state, args)
       require_db(database, exist: false)
@@ -310,6 +323,7 @@ begin
 
     # FIXME Ensure that we never drop the current user
     when :teardown!
+      clean_pg_meta_cache
       if args.empty?
         Prick::SubCommand.teardown(database, remove_state_file: true)
       else
@@ -326,11 +340,13 @@ begin
       end
 
     when :set!
+      clean_pg_meta_cache
       variable, *args = args.expect(1..3)
       require_db(database) if variable == "duration"
       Prick::SubCommand.set(variable, *args) or error "Illegal variable name '#{variable}'"
 
     when :clean!
+      clean_pg_meta_cache
       database = args.expect(0..1) || database
       require_db(database)
       Prick::SubCommand.clean(database)
@@ -339,10 +355,12 @@ begin
       create_command = opts.create! # Because we need easy access to subcommand options
       case create_command.subcommand
         when :database!
+          clean_pg_meta_cache
           database, username, environment = parse_database_args(state, args)
           require_db(database, exist: false)
           Prick::SubCommand.create_database(database, username, environment)
         when :migration!
+          # clean_pg_meta_cache # FIXME ?
           require_db
           arg = args.expect(1)
           version = PrickVersion.try(arg) or Prick.error "Illegal version: #{arg}"
@@ -358,6 +376,7 @@ begin
 
     when :build!
       require_db
+      clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
 #     exclude = cmd.exclude? ? cmd.exclude.split(",") : []
       Prick::SubCommand.build(
@@ -366,6 +385,7 @@ begin
 
     when :make!
       require_db
+      clean_pg_meta_cache
       dump = cmd.dump? ? cmd.dump("batches")&.to_sym || :batches : nil
       Prick::SubCommand.make(
           database, username, args.expect(0..1), 
@@ -373,18 +393,26 @@ begin
 
     when :run!
       require_db
+      clean_pg_meta_cache
       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!
+      args.expect(0)
+      clean_pg_meta_cache
       Prick::SubCommand.bash(main: cmd.main?)
 
     when :fox!
       require_db
       Prick::SubCommand.fox(database, username, args)
 
+    when :snapshot!
+      require_db
+      args.expect(0)
+      Prick::SubCommand.snapshot(database, username)
+
     when :drop!
       case cmd.subcommand
         when :users!
@@ -397,12 +425,16 @@ begin
           owner = args.expect(0..1) || username
           Prick::SubCommand.drop_owner(owner)
         when :database!
+          clean_pg_meta_cache
           database = args.expect(0..1) || database
           Prick::SubCommand.drop_database(database)
         when :data!
-          raise NotImplementedError
+          args.expect(0)
+          require_db
+          Prick::SubCommand.drop_data(database)
         when :schema!
           require_db
+          clean_pg_meta_cache
           schemas = args.to_a
           Prick::SubCommand.drop_schema(database, schemas)
       else
@@ -417,6 +449,7 @@ begin
 
     when :migrate!
       require_db
+      # clean_pg_meta_cache # FIXME ?
       args.expect(0)
       Prick::SubCommand.migrate(database, username, file: cmd.file)
 

data/lib/prick/builder/node.rb

@@ -15,8 +15,6 @@ module Prick
       def schema() @schema ||= parent&.schema || "public" end
       def schema=(s) @schema = s end
 
-      attr_reader :source
-
       def source
         @source ||= read_source
       end

data/lib/prick/builder/parser.rb

@@ -98,6 +98,7 @@ module Prick
       # value is returned
       def parse_file_entry(unit, dir, entry)
         entry = entry.sub(/\/$/, "")
+#       puts "#parse_file_entry(#{unit.path.inspect}, #{dir.inspect}, #{entry.inspect})"
         if entry =~ /^(\S+?)(\?)?(?:\s+(.+))?\s*$/
           command = $1
           optional = !$2.nil?
@@ -141,7 +142,7 @@ module Prick
           (path, args = parse_file_entry(unit, dir, entry)) or return nil
           if File.directory? path
             parse_directory(unit, path)
-          elsif File.executable? path
+          elsif File.executable?(path)
             ExecNode.new(unit, phase, path, args)
           elsif File.file? path
             case path
@@ -166,10 +167,13 @@ module Prick
       #
       # 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)
+#       puts "#find_executable(#{filename.inspect})"
+        if !Prick.state.environments.key?(filename) # Environment names are reserved
+          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
         end
         nil
       end

data/lib/prick/constants.rb

@@ -40,6 +40,8 @@ module Prick
   PRICK_ENVIRONMENT_FILE = "prick.environment.yml"
   PRICK_ENVIRONMENT_PATH = PRICK_ENVIRONMENT_FILE
 
+  # TODO: Move to var/cache
+
   # State file
   PRICK_STATE_FILE = ".prick.state.yml"
   PRICK_STATE_PATH = PRICK_STATE_FILE
@@ -48,6 +50,10 @@ module Prick
   FOX_STATE_FILE = ".fox-state.yml"
   FOX_STATE_PATH = FOX_STATE_FILE
 
+  # PgMeta snapshot. Is deleted at the start of each build
+  PG_META_STATE_FILE = ".pg_meta-state.yml"
+  PG_META_STATE_PATH = PG_META_STATE_FILE
+
   # Reflections file
   REFLECTIONS_FILE = "reflections.yml"
   REFLECTIONS_PATH = File.join(SCHEMA_DIR, REFLECTIONS_FILE)

data/lib/prick/share/init/schema/prick/tables.sql

@@ -35,3 +35,12 @@ create table builds (
   make_duration float -- Duration of enclosing make script
 );
 
+create table snapshots (
+  id integer generated by default as identity primary key,
+  schema_name varchar not null,
+  table_name varchar not null,
+  max_id integer, -- may be null
+
+  unique(schema_name, table_name)
+);
+

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

@@ -41,6 +41,35 @@ module Prick::SubCommand
     State.connection { |conn| conn.rdbms.drop database }
   end
 
+  # Drop data not in snapshot
+  def self.drop_data(database, schemas = nil)
+    conn = Prick.state.conn
+    conn.session.triggers(false) {
+      if schemas.nil?
+        builder = Prick::Build::Builder.new(conn, Prick.state.schema_dir)
+        pool = builder.pool
+        schemas = pool.refresh_schemas
+      end
+      schema_list = conn.quote_literal_list(schemas)
+      schema_expr = schemas ? "true = true" : "schema_name in #{schema_list}"
+      tables = conn.tuples %(
+        select schema_name, table_name, max_id 
+        from prick.snapshots
+        where #{schema_expr}
+      )
+      tables.each { |schema, table, max_id|
+        uid = "#{schema}.#{table}"
+        if max_id
+          conn.exec "delete from #{uid} where id > #{max_id}"
+          conn.schema.set_serial(schema, table, max_id) if conn.schema.sequence(schema, table)
+        else
+          conn.exec "delete from #{uid}"
+          conn.schema.set_serial(schema, table, nil) if conn.schema.sequence(schema, table)
+        end
+      }
+    }
+  end
+
   # Empty the database
   def self.drop_schema(database, schemas = [])
     constrain database, String

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

@@ -65,7 +65,7 @@ module Prick::SubCommand
             end
           end
 
-          # Write-back schema to builder
+          # Write back schema to builder
           builder.root.schema = schema
 
           # Drop schema if needed

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

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require_relative '../builder/builder.rb'
+
+module Prick::SubCommand
+  def self.snapshot(
+      database, username, 
+      builddir: Prick.state.schema_dir)
+
+    conn = Prick.state.connection
+    builder = Prick::Build::Builder.new(conn, builddir)
+    pool = builder.pool
+    schemas = pool.refresh_schemas
+
+    # Clear snapshots table
+    conn.exec "delete from prick.snapshots"
+
+    # Fill it again
+    records = []
+    for schema in schemas
+      conn.schema.list_tables(schema).each { |table|
+        max_id = conn.value "select max(id) from #{schema}.#{table}"
+        records << { schema_name: schema, table_name: table, max_id: max_id}
+      }
+    end
+    conn.insert("prick", "snapshots", records)
+  end
+end
+

data/lib/prick/subcommand/subcommand.rb

@@ -1,4 +1,4 @@
-module Prick::Subcommand 
+module Prick::SubCommand 
 # def self.parse_username_database
 #   case username_database
 #     when nil

data/lib/prick/version.rb

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

data/lib/prick.rb

@@ -53,6 +53,7 @@ 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-snapshot.rb'
 require_relative 'prick/subcommand/prick-teardown.rb'
 
 module Prick

metadata

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