raka 0.8.2 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/lib/raka/lang/duckdb/impl.rb +8 -8
- data/lib/raka/lang/psql/impl.rb +1 -1
- data/lib/raka/protocol.rb +3 -3
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a969e25adddc76ff34f767cd8b6192b33ab11295d108c84fe75be2d59db3d02a
|
4
|
+
data.tar.gz: bde791d112773bb4ad98751a08563ed386cbf60085854e1a2c3d0b7022617713
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5ee40134396dc781759b5ad9b45526892cac7c5eb00964d340e01122214843d63383aa8eb230276484cdef17ae6729f75d55f20ec2c9931a8f57557d6a32c091
|
7
|
+
data.tar.gz: fe4f1df038df8efef80fc80c200dca642e7bd8898351ae7b94e024dc4fcd784e59b7df3e5f0e7bde45a74bd4da3b915511c7f9bfb20e681aaf1f82b7692d4e43
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.8.
|
1
|
+
0.8.3
|
@@ -36,7 +36,7 @@ class Duckdb
|
|
36
36
|
|
37
37
|
def process_params(code)
|
38
38
|
return code if code.nil?
|
39
|
-
|
39
|
+
|
40
40
|
processed_code = code
|
41
41
|
(@params || {}).each do |key, value|
|
42
42
|
processed_code = processed_code.gsub("$#{key}", "'#{value}'")
|
@@ -52,22 +52,22 @@ class Duckdb
|
|
52
52
|
|
53
53
|
# Build SQL parts as separate statements
|
54
54
|
sql_parts = []
|
55
|
-
|
55
|
+
|
56
56
|
# Add before hook if present
|
57
57
|
sql_parts << before_sql if before_sql
|
58
|
-
|
58
|
+
|
59
59
|
# Add main query based on mode
|
60
60
|
case @mode
|
61
61
|
when :persistent
|
62
|
-
sql_parts <<
|
62
|
+
sql_parts << 'DROP TABLE IF EXISTS :_name_;'
|
63
63
|
sql_parts << "CREATE TABLE :_name_ AS (#{main_sql});"
|
64
64
|
when :adhoc
|
65
65
|
sql_parts << "COPY (#{main_sql}) TO ':output:' (FORMAT PARQUET);"
|
66
66
|
end
|
67
|
-
|
67
|
+
|
68
68
|
# Add after hook if present
|
69
69
|
sql_parts << after_sql if after_sql
|
70
|
-
|
70
|
+
|
71
71
|
sql_parts.join("\n")
|
72
72
|
end
|
73
73
|
|
@@ -77,12 +77,12 @@ class Duckdb
|
|
77
77
|
# Split the SQL into separate statements and execute them individually
|
78
78
|
bash env, %(
|
79
79
|
# Execute the combined SQL script with proper variable replacement
|
80
|
-
cat #{fname} | sed 's|:_name_|#{task.output_stem}|g' | #{duckdb_cmd} | sed -z '$ s
|
80
|
+
cat #{fname} | sed 's|:_name_|#{task.output_stem}|g' | #{duckdb_cmd} | sed -z '$ s/\\n$//' | tee #{fname}.log
|
81
81
|
echo "#{@database}" > #{task.name}
|
82
82
|
)
|
83
83
|
when :adhoc
|
84
84
|
bash env, %(
|
85
|
-
cat #{fname} | sed 's|:output:|#{task.name}|g' | #{duckdb_cmd} | sed -z '$ s
|
85
|
+
cat #{fname} | sed 's|:output:|#{task.name}|g' | #{duckdb_cmd} | sed -z '$ s/\\n$//' | tee #{fname}.log
|
86
86
|
)
|
87
87
|
end
|
88
88
|
end
|
data/lib/raka/lang/psql/impl.rb
CHANGED
@@ -52,7 +52,7 @@ class Psql
|
|
52
52
|
|
53
53
|
bash env, %(
|
54
54
|
#{sh_cmd(schema)} #{param_str} -v _name_=#{task.output_stem} \
|
55
|
-
-v _schema_=#{schema.empty? ? '' : schema + '.'} -f #{fname} | sed -z '$ s
|
55
|
+
-v _schema_=#{schema.empty? ? '' : schema + '.'} -f #{fname} | sed -z '$ s/\\n$//' | tee #{fname}.log
|
56
56
|
mv #{fname}.log #{task.name}
|
57
57
|
)
|
58
58
|
end
|
data/lib/raka/protocol.rb
CHANGED
@@ -56,11 +56,11 @@ class LanguageProtocol
|
|
56
56
|
code = yield @text if @text
|
57
57
|
code = @block.call(task) if @block # do not resolve
|
58
58
|
|
59
|
-
env.logger.debug code
|
59
|
+
env.logger.debug code.chomp
|
60
60
|
script_text = @impl.build(wrap_template(remove_common_indent(code)), task)
|
61
61
|
temp_script = create_tmp(script_text)
|
62
62
|
@impl.run_script env, temp_script, task
|
63
|
-
env.logger.debug script_text
|
63
|
+
env.logger.debug script_text.chomp
|
64
64
|
end
|
65
65
|
end
|
66
66
|
|
@@ -91,7 +91,7 @@ def run_cmd(env, cmd)
|
|
91
91
|
if env.logger.level <= 0
|
92
92
|
pid = spawn(cmd, out: out_w)
|
93
93
|
Thread.new do
|
94
|
-
env.logger.debug(out_r.gets) until out_r.eof
|
94
|
+
env.logger.debug(out_r.gets.chomp) until out_r.eof
|
95
95
|
end
|
96
96
|
elsif env.logger.level == 1
|
97
97
|
pid = spawn(cmd, out: out_w)
|