raka 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c1ea1afe876bee1942b2e05d450943a658325fe071e3cd6916ca2aa49ee664
-  data.tar.gz: 70db8390dd89d1d61946a0697ee7e341a05ecd5e15682e48c0563548cafd0634
+  metadata.gz: e7433868304f673611a2ce9b5e847a8a78cd6bbd0be86fe18d576090acf7009f
+  data.tar.gz: ebe65786208dfd8bf1e35ea83a6ad625279018aa3a73df14599392bbaa91d684
 SHA512:
-  metadata.gz: '02229d81b61a684a31aeda0cb6c8a3c665d31f2272091cbbb0c261272c73cbbdcebe1bb75c4e72fb4f89bf50d207614ff014ca04c0c16941bcc5fb907b3e2331'
-  data.tar.gz: 479b43bc7e0167a33013b33fb307ea7adeed17ca80b4a2528721d48befc198dfd4cf92f37880372f50fd9905d8a30722d745ca0a5e5c7ff1a0d66dab31527467
+  metadata.gz: d8498aa76cd3a4ec7277fb0d7e7618c030c70cab306258bec7b5806c0da249108943e56f2b78bf41eb9fddc54d0f0aada4cfb21e59abca81db5dc8fc7495f18c
+  data.tar.gz: 7eef06176d02da633b5fc2138d675ec66809f479a84e155800f25d6797ed0aa463a58d76a77d1540d1d6b9eb8c6abfed39d60f78881344634cbd37610fdae579

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/lib/raka/lang/psql/impl.rb

@@ -17,9 +17,9 @@ end
 # postgresql protocol using psql, requires HOST, PORT, USER, DB
 class Psql
   # Sometimes we want to use the psql command with bash directly
-  def sh_cmd(scope)
+  def sh_cmd(schema)
     c = @conn
-    env_vars = "PGOPTIONS='-c search_path=#{scope.empty? ? '' : scope + ','}public' "
+    env_vars = "PGOPTIONS='-c search_path=#{schema.empty? ? '' : schema + ','}public' "
     "PGPASSWORD=#{c.password} #{env_vars} psql -h #{c.host} -p #{c.port} -U #{c.user} -d #{c.db} -v ON_ERROR_STOP=1"
   end
 
@@ -35,10 +35,10 @@ class Psql
     raise 'argument conn required' if @conn.nil?
 
     if @create.to_s == 'table'
-      'DROP TABLE IF EXISTS :_name_;' \
+      'DROP TABLE IF EXISTS :_schema_.:_name_;' \
         'CREATE TABLE :_name_ AS (' + code + ');'
     elsif @create.to_s == 'mview'
-      'DROP MATERIALIZED VIEW IF EXISTS :_name_;' \
+      'DROP MATERIALIZED VIEW IF EXISTS :_schema_.:_name_;' \
         'CREATE MATERIALIZED VIEW :_name_ AS (' + code + ');'
     else
       code
@@ -47,10 +47,11 @@ class Psql
 
   def run_script(env, fname, task)
     param_str = (@params || {}).map { |k, v| "-v #{k}=\"#{v}\"" }.join(' ')
+    schema = task.rule_scopes.join('__')
 
     bash env, %(
-    #{sh_cmd(task.rule_scopes.join('__'))} #{param_str} -v _name_=#{task.output_stem} \
-      -f #{fname} | tee #{fname}.log
+    #{sh_cmd(schema)} #{param_str} -v _name_=#{task.output_stem} \
+      -v _schema_=#{schema} -f #{fname} | tee #{fname}.log
     mv #{fname}.log #{task.name}
     )
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raka
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - yarray
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-26 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake