raka 0.3.15 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9b8b30524daa0207aac3bfb90d9006490788c0384804712c05ce95000ea633
-  data.tar.gz: 2f78b17b036bd4ecb11bc03ffa75e800049efa2b946f5f39432a4a64e22a628d
+  metadata.gz: 8bd8a3909d7c65928115e4079d42947c46c3295dfbd7570fc4d861ad3855719b
+  data.tar.gz: 95b995c5f8fdcddf2f14cd3aab2d1c36bc1ae07ff579f77eeaa1e5dae8d775dc
 SHA512:
-  metadata.gz: a0a501811a98b26562bc435a9be601e5f501032b37bc7f8b48eb1308e45d98c462332d2f5b13b083a3b2bd6b8b864cc0389426cc3a29d26c9826ddc7e9560af6
-  data.tar.gz: 562812715b0171702059cfc246e6af7984a3091601b63608c062807ee93697778e8bff36ed399e5e10418bda1378daee9438e0fcc315966be31d63c56c6f2bff
+  metadata.gz: 1260dc630ecd9d31b710898f5c61ed153c85578ab68c0d73a0d690d51b005211aac68159cac937ec33a5706161257963abda14c25d2cf768b84ccf33c6258d55
+  data.tar.gz: bb2f0737226b1988f2655f2ad7b464a3ec0031b7608262a8681fa28f31d6c353d5930dab32d69771f6bcbadf8838f4f4dd7e11c0a21cc9ba6c7effdcb38a1b7e

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.17

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

@@ -24,10 +24,9 @@ class Psql
   end
 
   # 1. do not add required argument here, so psql.config will work or we can only use psql(conn: xxx).config
-  def initialize(conn: nil, create: 'mview', schema: '', params: {})
+  def initialize(conn: nil, create: 'mview', params: {})
     @create = create
     @params = params
-    @schema = schema
     @conn = conn
   end
 
@@ -37,10 +36,10 @@ class Psql
 
     if @create.to_s == 'table'
       'DROP TABLE IF EXISTS :_schema_:_name_;' \
-        'CREATE TABLE :schema:_name_ AS (' + code + ');'
+        'CREATE TABLE :_schema_:_name_ AS (' + code + ');'
     elsif @create.to_s == 'mview'
       'DROP MATERIALIZED VIEW IF EXISTS :_schema_:_name_;' \
-        'CREATE MATERIALIZED VIEW :schema:_name_ AS (' + code + ');'
+        'CREATE MATERIALIZED VIEW :_schema_:_name_ AS (' + code + ');'
     else
       code
     end
@@ -48,11 +47,12 @@ class Psql
 
   def run_script(env, fname, task)
     param_str = (@params || {}).map { |k, v| "-v #{k}=\"#{v}\"" }.join(' ')
-    schema = @schema.empty? ? task.rule_scopes.join('__') : @schema
+    schema = task.rule_scopes.join('__')
+    out_schema = (task.rule_scopes + (task.target_scope.nil? ? [] : [task.target_scope])).join('__')
 
     bash env, %(
     #{sh_cmd(schema)} #{param_str} -v _name_=#{task.output_stem} \
-      -v _schema_=#{schema.empty? ? '' : schema + '.'} -f #{fname} | tee #{fname}.log
+      -v _schema_=#{out_schema.empty? ? '' : out_schema + '.'} -f #{fname} | tee #{fname}.log
     mv #{fname}.log #{task.name}
     )
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raka
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.17
 platform: ruby
 authors:
 - yarray