prick 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3009c0da5619e908746d98eefe922851d886105d10b6bc49cc0295cf47a50033
-  data.tar.gz: 3ee5cd54a3b29171306c3ad2fe8ea10c2e6d1ad84e1b8446b6314770c6734aef
+  metadata.gz: 8fa13b0150bd8e2a403643947215116be13d78d33f053e15c766a258574cf79e
+  data.tar.gz: 8b817641aff64c1ad488ce7562ac03a26c8d2144b3bf79999ef0af0ae910d298
 SHA512:
-  metadata.gz: 7ee1ce2cd13293542db575cbbf5d955f542eff9b3cc6e4b87027800e7b0effb12ca134df2665f6a2a240cb0c191cd2fc9e5cca9b943c307591b499e75d27b5db
-  data.tar.gz: 7f81e321f4875bce049b5adf7eb7fe7394a8112135d13b73ebdd48680b014329517e7137df419f504861a2d855243d37dfcafc2f67226fef57c537e28dd27dde
+  metadata.gz: 5b0896b4d9d38984cee6f3a3d6481ed4b9607c54101a120aaa4344b701ed649fe7ef5ca25bcb1214aa1802700e80e0bee41aa47157039f4f2774825d0af04f44
+  data.tar.gz: e19f8f4b6529bc1463f01fdcb5077ddfd55fe970ac062ef8fbbfd79dd31d1c8f74dcef759222cfdbaf4890158ef6b7993ddeb369d8c0499ead2265f20073769a

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

@@ -20,6 +20,8 @@ module Prick
   # If a directory doesn't contain a build resource, the resources in the
   # directory are built in alphabetic order
   #
+  # Build SQL scripts are executed with search path set to containing schema
+  #
   class Builder
     attr_reader :database
     attr_reader :directory
@@ -57,11 +59,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
@@ -159,6 +161,12 @@ 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
   end
 end
 

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

@@ -4,7 +4,7 @@
 
 # Required by gem
 module Prick
-  VERSION = "0.9.0"
+  VERSION = "0.10.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.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-11 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;
-
-