raka 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a91b1fab962b4bd99bd333aacc88b52267750458e9430584668f13389aec117
-  data.tar.gz: a58613eddc635b0440e6cb0e061311abc137e7b893dd87b5c66f8f97c6f952c2
+  metadata.gz: c9181e13ec5517b0c40faba8c2e121a9b44c9da29de439bd5303d8fa5ee50870
+  data.tar.gz: a4c9f8d7e03f067f8266cf77cef52b2d153111c3b24c13a37f9927fe5b543fe5
 SHA512:
-  metadata.gz: cf28cfc8c9e3c3be6f4a1d12edb525f8353dd225efd64e7e6d5904ed068173f036af496bcf13a3d5febb731249e3e57c1bee87eea1994a00b34334efe8a5a5c2
-  data.tar.gz: bdd4d58a420a46cdb4fd23a714ea60c14b11c7a0fe8b5bb6cfc343f860208e60ae163d28abab6839cf7abb2548c4c7a849d513026d9c4e091167e2d102f99161
+  metadata.gz: 03cfe492010d2621bd84aa0c03f452be71de1d26d1d1e354a608893dca47d512ad666a42fb1c0e1d7b89522ad60acbcdd77a9466da388917a6992c9c9afbc8cd
+  data.tar.gz: f5f1d930083bf7342cac0285ba625219f6eb24fea7e1d61241e81bceda711a49496fa58b899de89759573143671adc74f142c730cfe7343b3663855ca91fcc1a

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.6.0

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

@@ -17,10 +17,12 @@ end
 # 1. Persistent mode: operations on .db file with CREATE TABLE
 # 2. Ad-hoc mode: parquet in/out using COPY operations
 class Duckdb
-  def initialize(database: nil, params: {})
+  def initialize(database: nil, params: {}, before: nil, after: nil)
     @params = params
     @database = database
     @mode = @database ? :persistent : :adhoc
+    @before = before
+    @after = after
   end
 
   def duckdb_cmd
@@ -32,26 +34,50 @@ class Duckdb
     end
   end
 
-  def build(code, _task)
-    # Replace parameter placeholders
+  def process_params(code)
+    return code if code.nil?
+    
     processed_code = code
     (@params || {}).each do |key, value|
       processed_code = processed_code.gsub("$#{key}", "'#{value}'")
     end
+    processed_code
+  end
+
+  def build(code, _task)
+    # Process parameter placeholders for all parts
+    main_sql = process_params(code)
+    before_sql = process_params(@before)
+    after_sql = process_params(@after)
 
+    # Build SQL parts as separate statements
+    sql_parts = []
+    
+    # Add before hook if present
+    sql_parts << before_sql if before_sql
+    
+    # Add main query based on mode
     case @mode
     when :persistent
-      "DROP TABLE IF EXISTS :_name_; CREATE TABLE :_name_ AS (#{processed_code});"
+      sql_parts << "DROP TABLE IF EXISTS :_name_;"
+      sql_parts << "CREATE TABLE :_name_ AS (#{main_sql});"
     when :adhoc
-      "COPY (#{processed_code}) TO ':output:' (FORMAT PARQUET);"
+      sql_parts << "COPY (#{main_sql}) TO ':output:' (FORMAT PARQUET);"
     end
+    
+    # Add after hook if present
+    sql_parts << after_sql if after_sql
+    
+    sql_parts.join("\n")
   end
 
   def run_script(env, fname, task)
     case @mode
     when :persistent
+      # Split the SQL into separate statements and execute them individually
       bash env, %(
-      #{duckdb_cmd} -c "$(cat #{fname} | sed 's|:_name_|#{task.output_stem}|g')" | tee #{fname}.log
+      # Execute the combined SQL script with proper variable replacement
+      cat #{fname} | sed 's|:_name_|#{task.output_stem}|g' | #{duckdb_cmd} | tee #{fname}.log
       echo "#{@database}" > #{task.name}
       )
     when :adhoc

data/lib/raka/token.rb

@@ -157,12 +157,12 @@ class Token
     symbol = @chain.pop.to_s
     # if the pattern contains child pattern like percent_(\d+), we change the capture to
     # named capture so that it can be captured later. The name is symbol with the index, like func0
-    pattern = pattern.gsub(/\(\S+?\)/).with_index { |m, i| "(?<#{symbol}#{i}>#{m})" }
+    pattern = pattern.to_s.gsub(/\(\S+?\)/).with_index { |m, i| "(?<#{symbol}#{i}>#{m})" }
 
     # if the symbol is _, \S+ will be put in chain, it indicates not to capture,
     # so just replace it with the refined pattern
     if symbol == Pattern::ANY # match-everything and not bound
-      @chain.push pattern.to_s
+      @chain.push "#{pattern}\\w*"
     else
       @chain.push "(?<#{symbol}>(#{pattern}\\w*))"
     end

metadata

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