prick 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1acbb39706f5c58e4ef47230fa18cea7fb16d3c15c3fdc500624b859b4328bc
-  data.tar.gz: 9853c05b7f3717d0c12e68595f0dd945d95d84f372b7d438efe222ba2388e62a
+  metadata.gz: 2788abf0737d8f89b08f4dcbe8cf026ffb4927a2a155655b28350c53951c2c1f
+  data.tar.gz: a336758b7ff556e11346f7bb0f6da9e949a2d51b7f4f377b24d9e91d0b92af50
 SHA512:
-  metadata.gz: f3ad4787717d1f9c3a1eb6d727dbfd9b5a22b0a13c22951d25a757ead4bae71831ba35d26dc2dbec5b68d826c3469c44eded315dade0de4f6819e6c4193a7389
-  data.tar.gz: a630950080794df280914d7980095827010ae717ea14262a4dc4a95b25af2fbbb50a4116d52fb912461a1a03aa9be910ad6a115857ba5fbe70cb20b1d977aa87
+  metadata.gz: e8352c55f6fd37f84c4495f8c1ffe89b5594f936fe74d500e77fe44a7c5fe367c7995dd6824a446c67c36891af892bc277c4c757fe5e6c60a4b07b12e8698809
+  data.tar.gz: 25e407b34434192eb797cb83bd265b6b2b7004341dee7ba7ab8b64582d9730d2a5ea19dacde7eaa9474d2c2f7e96559a0fbdf4d9fb9fc1e07c8ac9fb6a0c55e6

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
         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/database.rb

@@ -1,6 +1,4 @@
 
-#require "prick/ensure.rb"
-
 module Prick
   class Database
     attr_reader :name

data/lib/prick/program.rb

@@ -151,7 +151,7 @@ module Prick
 
     def prepare_release(fork)
       project.prepare_release(fork)
-    enda
+    end
 
     def prepare_feature(name)
       raise NotYet
@@ -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

@@ -1,20 +1,18 @@
 require 'prick/command.rb'
-#require 'prick/ensure.rb'
 
 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
@@ -24,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
@@ -133,16 +131,6 @@ EOF
       data_opt = (data ? "" : "--schema-only")
       Command.command "pg_dump --no-owner #{data_opt} #{db} | gzip --to-stdout >#{file}"
     end
-
-  private
-    @ensure_states = {
-      exist_user: [:create_user, :drop_user],
-      exist_database: [
-        lambda { |this, db, user| this.ensure_state(:exist_user, user) },
-        lambda { |this, db, user| this.create_database(db, owner: user) },
-        :drop_database
-      ]
-    }
   end
 end
 

data/lib/prick/schema.rb

@@ -7,9 +7,10 @@ module Prick
   BUILD_SQL_FILE = BUILD_BASE_NAME + ".sql"
   BUILD_YML_FILE = BUILD_BASE_NAME + ".yml"
 
-  # Note this models the SCHEMAS_DIR directory, not a database schema
+  # 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.6.0"
+  VERSION = "0.11.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.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-08 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

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

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