prick 0.7.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd62ad39d6f79354d9eb4e68e102cbe2fa45c3c83f3bb670bb67cc91faab2b6c
-  data.tar.gz: 1802956bd55eafd32b16ff2d473e7b8c4f22ffaa2526ab83afb1c8d271b3fe37
+  metadata.gz: d22544dd4510ae8e2ca01c940e3020dab601ac8661429be316fa549576f54ab1
+  data.tar.gz: f94264fb4beea7ede50dd57ede3902e6128ced4230177c6a6a5bbb84662b7f67
 SHA512:
-  metadata.gz: c8b1553cba9e5afe792b1f3119ffb9b85e23626d830b752dc98ee5bd28e4c7eeaf8e7b50acb52cfe9e32dcf935d8dcd99694bf2d1d29ebd830c1a9abcb852f38
-  data.tar.gz: 3a189a2dff6750afc58f01189dc86fd671b605f5281e17d725607483e0d2f24603f54cc9071145dcfa681109d971da8736a5e81be454b3b1d3d3ee055060f92f
+  metadata.gz: d1f1b9222fd94b4fdf66137f307c19efe64cdbcc301b00a5904ce7013eedb7652aaf3a5dbabbe0defad7b9f8d7e396a1efbc73fe568d83f46e5c4ef79b9b6760
+  data.tar.gz: 7eaeb1c2923ed69188e51c071097cca27a1c66d90226f26e99ff26d9e4c7540912ed62be74fda30006d914077faa70e9d384dc02bdbd9e4d0b9753f08f66af92

data/exe/prick

@@ -251,7 +251,7 @@ begin
       program.save(version, file)
 
     when :drop
-      program.drop(args.expect(0..1), opts.drop!.all)
+      program.drop(args.expect(0..1), opts.drop!.all?)
 
     when :diff
       mark = opts.diff!.mark

data/lib/prick.rb

@@ -1,5 +1,5 @@
 
-$LOAD_PATH.unshift("/home/clr/prj/shellopts/lib")
+#$LOAD_PATH.unshift("/home/clr/prj/shellopts/lib")
 
 # 'semantic' is required here instead of in prick/version.rb to avoid having Gem depend on it
 require "semantic" 

data/lib/prick/builder.rb

@@ -7,18 +7,24 @@ module Prick
   # and is used to match a build file. Build files are looked up in the
   # following order:
   #
-  #   #{name}, #{name}.* executable
+  #   #{name} executable
+  #   #{name}.* executable
   #   #{name}.yml
   #   #{name}.sql
   #   #{name}/
   #
+  # The output from executable objects is expected to be SQL statements that
+  # are fed into postgres
+  #
   # When a resource match a directory, the directory can contain a special
   # default resource ('build' or 'migrate') that takes over the rest of the
   # build process for that directory.  Typically, you'll use the 'build.yml' or
-  # 'migrate.yml' to control the build order of the other resources
+  # 'migrate.yml' to control the build order of the other resources If a
+  # directory doesn't contain a build resource, the resources in the directory
+  # are built in alphabetic order
   #
-  # If a directory doesn't contain a build resource, the resources in the
-  # directory are built in alphabetic order
+  # Build (but not migration) SQL scripts and executables are executed with
+  # search path set to containing schema
   #
   class Builder
     attr_reader :database
@@ -57,11 +63,11 @@ module Prick
       Dir.chdir(dir) { yield(file) }
     end
 
-    def do_sql(path)
+    def do_sql(path, schema: nil)
 #     puts "do_sql(#{path})"
       do_dir(path) { |file| 
         if @execute
-          Rdbms.exec_file(database.name, file, user: database.user) 
+          Rdbms.exec_file(database.name, file, user: database.user, schema: schema) 
         else
           @lines += IO.readlines(file).map(&:chomp)
         end
@@ -69,12 +75,12 @@ module Prick
       true
     end
 
-    def do_exe(path)
+    def do_exe(path, schema: nil)
 #     puts "do_exe(#{path})"
       do_dir(path) { |file| 
-        lines = Command.command "#{file} #{database.name} #{database.user}" # FIXME Security
+        lines = Command.command "./#{file} #{database.name} #{database.user}" # FIXME Security
         if @execute
-          Rdbms.exec_sql(database.name, lines.join("\n"), database.user)
+          Rdbms.exec_sql(database.name, lines.join("\n"), user: database.user, schema: schema)
         else
           @lines += lines
         end
@@ -159,6 +165,17 @@ module Prick
     end
 
     def self.yml_file(directory) File.join(directory, "build") + ".yml" end
+
+  protected
+    def do_sql(path)
+      schema = Dir.getwd.sub(/^.*schema\/([^\/]+)(?:\/.*)?$/, '\1')
+      super(path, schema: schema)
+    end
+
+    def do_exe(path)
+      schema = Dir.getwd.sub(/^.*schema\/([^\/]+)(?:\/.*)?$/, '\1')
+      super(path, schema: schema)
+    end
   end
 end
 

data/lib/prick/program.rb

@@ -162,7 +162,7 @@ module Prick
     end
 
     def prepare_schema(name)
-      raise NotYet
+      project.prepare_schema(name)
     end
 
     def prepare_diff(version = nil)

data/lib/prick/project.rb

@@ -162,6 +162,16 @@ module Prick
       self
     end
 
+    def prepare_schema(name, commit: true)
+      path = File.join(SCHEMA_DIR, name)
+      FileUtils.mkdir_p(path)
+      Git.add Share.cp("schema/schema.sql", path, clobber: false, templates: { 'SCHEMA' => name })
+      Git.add Share.cp("schema/build.yml", path, clobber: false)
+      File.open(Schema.yml_file, "a") { |f| f.write("- #{name}\n") }
+      Git.add(Schema.yml_file)
+      submit "Added schema #{name}", commit
+    end
+
     def prepare_diff(from_version = version)
       begin
         from_name = "#{name}-base"

data/lib/prick/rdbms.rb

@@ -4,16 +4,15 @@ require 'csv'
 
 module Prick
   module Rdbms
-#   extend Ensure
-
     ### EXECUTE SQL
 
     # Execute the SQL statement and return stdout as an array of tuples
-    def self.exec_sql(db, sql, user: ENV['USER'])
+    def self.exec_sql(db, sql, user: ENV['USER'], schema: nil)
+      schema ||= "public"
       stdout = Command.command %(
         {
           echo "set role #{user};"
-          echo "set search_path to public;"
+          echo "set search_path to #{schema};"
           cat <<'EOF'
           #{sql}
 EOF
@@ -23,8 +22,8 @@ EOF
     end
 
     # Execute the given file and return stdout as an array of tuples
-    def self.exec_file(db, file, user: ENV['USER'])
-      self.exec_sql(db, File.read(file), user: user)
+    def self.exec_file(db, file, user: ENV['USER'], schema: nil)
+      self.exec_sql(db, File.read(file), user: user, schema: schema)
     end
 
     # Execute the SQL statement and return the result as an array of record tuples

data/lib/prick/schema.rb

@@ -9,7 +9,8 @@ module Prick
 
   # Note this models the SCHEMA_DIR directory, not a database schema
   class Schema
-    def yml_file() SchemaBuilder.yml_file(SCHEMA_DIR) end
+    def yml_file() self.class.yml_file end
+    def self.yml_file() SchemaBuilder.yml_file(SCHEMA_DIR) end
 
     def version() SchemaVersion.load end
     def version=(version) SchemaVersion.new(version).write end

data/lib/prick/version.rb

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.7.0"
+  VERSION = "0.12.0"
 end
 
 # Project related code starts here

data/share/schema/schema.sql

@@ -1,5 +1,3 @@
 
 drop schema if exists [<SCHEMA>] cascade;
 create schema [<SCHEMA>];
-
-set search_path to [<SCHEMA>];

data/share/schema/schema/prick/schema.sql

@@ -1,5 +1,3 @@
 
 drop schema if exists prick cascade;
 create schema prick;
-
-set search_path to prick;

data/share/schema/schema/public/build.yml

@@ -1,7 +1,6 @@
 # Default schema files
 #
 ---
-- schema 
 - roles 
 - types 
 - tables

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shellopts
@@ -133,7 +133,6 @@ files:
 - share/schema/schema/prick/tables.sql
 - share/schema/schema/public/.keep
 - share/schema/schema/public/build.yml
-- share/schema/schema/public/schema.sql
 - test_assorted
 - test_feature
 - test_refactor
@@ -156,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A release control and management system for postgresql

data/share/schema/schema/public/schema.sql

@@ -1,3 +0,0 @@
-set search_path to public;
-
-