Skip to content

Commit 2ac8053

Browse files
JohnMountJohnMount
committed
rebuild and retest
1 parent 8a24931 commit 2ac8053

File tree

5 files changed

+31
-19
lines changed

5 files changed

+31
-19
lines changed

‎build/lib/data_algebra/db_model.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,10 @@ def expr_to_sql(self, expression, *, want_inline_parens=False):
703703
op = self.op_replacements[op]
704704
if op in self.sql_formatters.keys():
705705
return self.sql_formatters[op](self, expression)
706-
subs = [
707-
self.expr_to_sql(ai, want_inline_parens=True) for ai in expression.args
708-
]
709-
if expression.inline:
706+
if (len(expression.args) > 1) and expression.inline:
707+
subs = [
708+
self.expr_to_sql(ai, want_inline_parens=True) for ai in expression.args
709+
]
710710
res = ''
711711
if want_inline_parens:
712712
res = res + '('
@@ -718,6 +718,9 @@ def expr_to_sql(self, expression, *, want_inline_parens=False):
718718
if want_inline_parens:
719719
res = res + ')'
720720
return res
721+
subs = [
722+
self.expr_to_sql(ai, want_inline_parens=False) for ai in expression.args
723+
]
721724
return op.upper() + "(" + ", ".join(subs) + ")"
722725
if isinstance(expression, data_algebra.expr_rep.ListTerm):
723726
return self.value_to_sql(expression.value)

‎coverage.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ data_algebra/data_model.py 120 23 81%
9797
data_algebra/data_ops.py 1125 193 83%
9898
data_algebra/data_ops_types.py 85 38 55%
9999
data_algebra/data_ops_utils.py 51 7 86%
100-
data_algebra/db_model.py 867 96 89%
100+
data_algebra/db_model.py 868 97 89%
101101
data_algebra/diagram.py 56 44 21%
102102
data_algebra/eval_model.py 16 1 94%
103103
data_algebra/expr_parse.py 32 0 100%
@@ -112,7 +112,7 @@ data_algebra/python3_lark.py 1 0 100%
112112
data_algebra/test_util.py 175 25 86%
113113
data_algebra/util.py 78 8 90%
114114
----------------------------------------------------------
115-
TOTAL 4717 878 81%
115+
TOTAL 4718 879 81%
116116

117117

118-
============================= 190 passed in 16.37s =============================
118+
============================= 190 passed in 16.42s =============================

‎dist/data_algebra-0.7.5-py3-none-any.whl‎

22 Bytes
Binary file not shown.

‎dist/data_algebra-0.7.5.tar.gz‎

16 Bytes
Binary file not shown.

‎docs/data_algebra/db_model.html‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -948,10 +948,10 @@ <h1 class="modulename">
948948
<span class="n">op</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">op_replacements</span><span class="p">[</span><span class="n">op</span><span class="p">]</span>
949949
<span class="k">if</span> <span class="n">op</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="o">.</span><span class="n">keys</span><span class="p">():</span>
950950
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="p">[</span><span class="n">op</span><span class="p">](</span><span class="bp">self</span><span class="p">,</span> <span class="n">expression</span><span class="p">)</span>
951-
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
952-
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
953-
<span class="p">]</span>
954-
<span class="k">if</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
951+
<span class="k">if</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">args</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">)</span> <span class="ow">and</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
952+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
953+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
954+
<span class="p">]</span>
955955
<span class="n">res</span> <span class="o">=</span> <span class="s1">&#39;&#39;</span>
956956
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
957957
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;(&#39;</span>
@@ -963,6 +963,9 @@ <h1 class="modulename">
963963
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
964964
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;)&#39;</span>
965965
<span class="k">return</span> <span class="n">res</span>
966+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
967+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
968+
<span class="p">]</span>
966969
<span class="k">return</span> <span class="n">op</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">+</span> <span class="s2">&quot;(&quot;</span> <span class="o">+</span> <span class="s2">&quot;, &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">subs</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;)&quot;</span>
967970
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">expr_rep</span><span class="o">.</span><span class="n">ListTerm</span><span class="p">):</span>
968971
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">value_to_sql</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">value</span><span class="p">)</span>
@@ -2404,10 +2407,10 @@ <h1 class="modulename">
24042407
<span class="n">op</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">op_replacements</span><span class="p">[</span><span class="n">op</span><span class="p">]</span>
24052408
<span class="k">if</span> <span class="n">op</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="o">.</span><span class="n">keys</span><span class="p">():</span>
24062409
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="p">[</span><span class="n">op</span><span class="p">](</span><span class="bp">self</span><span class="p">,</span> <span class="n">expression</span><span class="p">)</span>
2407-
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
2408-
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
2409-
<span class="p">]</span>
2410-
<span class="k">if</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
2410+
<span class="k">if</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">args</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">)</span> <span class="ow">and</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
2411+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
2412+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
2413+
<span class="p">]</span>
24112414
<span class="n">res</span> <span class="o">=</span> <span class="s1">&#39;&#39;</span>
24122415
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
24132416
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;(&#39;</span>
@@ -2419,6 +2422,9 @@ <h1 class="modulename">
24192422
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
24202423
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;)&#39;</span>
24212424
<span class="k">return</span> <span class="n">res</span>
2425+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
2426+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
2427+
<span class="p">]</span>
24222428
<span class="k">return</span> <span class="n">op</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">+</span> <span class="s2">&quot;(&quot;</span> <span class="o">+</span> <span class="s2">&quot;, &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">subs</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;)&quot;</span>
24232429
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">expr_rep</span><span class="o">.</span><span class="n">ListTerm</span><span class="p">):</span>
24242430
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">value_to_sql</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">value</span><span class="p">)</span>
@@ -4012,10 +4018,10 @@ <h1 class="modulename">
40124018
<span class="n">op</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">op_replacements</span><span class="p">[</span><span class="n">op</span><span class="p">]</span>
40134019
<span class="k">if</span> <span class="n">op</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="o">.</span><span class="n">keys</span><span class="p">():</span>
40144020
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">sql_formatters</span><span class="p">[</span><span class="n">op</span><span class="p">](</span><span class="bp">self</span><span class="p">,</span> <span class="n">expression</span><span class="p">)</span>
4015-
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
4016-
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
4017-
<span class="p">]</span>
4018-
<span class="k">if</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
4021+
<span class="k">if</span> <span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">args</span><span class="p">)</span> <span class="o">&gt;</span> <span class="mi">1</span><span class="p">)</span> <span class="ow">and</span> <span class="n">expression</span><span class="o">.</span><span class="n">inline</span><span class="p">:</span>
4022+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
4023+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
4024+
<span class="p">]</span>
40194025
<span class="n">res</span> <span class="o">=</span> <span class="s1">&#39;&#39;</span>
40204026
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
40214027
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;(&#39;</span>
@@ -4027,6 +4033,9 @@ <h1 class="modulename">
40274033
<span class="k">if</span> <span class="n">want_inline_parens</span><span class="p">:</span>
40284034
<span class="n">res</span> <span class="o">=</span> <span class="n">res</span> <span class="o">+</span> <span class="s1">&#39;)&#39;</span>
40294035
<span class="k">return</span> <span class="n">res</span>
4036+
<span class="n">subs</span> <span class="o">=</span> <span class="p">[</span>
4037+
<span class="bp">self</span><span class="o">.</span><span class="n">expr_to_sql</span><span class="p">(</span><span class="n">ai</span><span class="p">,</span> <span class="n">want_inline_parens</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span> <span class="k">for</span> <span class="n">ai</span> <span class="ow">in</span> <span class="n">expression</span><span class="o">.</span><span class="n">args</span>
4038+
<span class="p">]</span>
40304039
<span class="k">return</span> <span class="n">op</span><span class="o">.</span><span class="n">upper</span><span class="p">()</span> <span class="o">+</span> <span class="s2">&quot;(&quot;</span> <span class="o">+</span> <span class="s2">&quot;, &quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">subs</span><span class="p">)</span> <span class="o">+</span> <span class="s2">&quot;)&quot;</span>
40314040
<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">expression</span><span class="p">,</span> <span class="n">data_algebra</span><span class="o">.</span><span class="n">expr_rep</span><span class="o">.</span><span class="n">ListTerm</span><span class="p">):</span>
40324041
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">value_to_sql</span><span class="p">(</span><span class="n">expression</span><span class="o">.</span><span class="n">value</span><span class="p">)</span>

0 commit comments

Comments
 (0)