add call interface, rebuild and retest

Author: JohnMount

Examples/cdata/pivot_unpivot.ipynb

@@ -2837,7 +2837,7 @@ def to_near_sql_implementation_(
             view_name = "convert_records_blocks_out_" + str(temp_id_source[0])
             temp_id_source[0] = temp_id_source[0] + 1
             pi, si = db_model.row_recs_to_blocks_query_str_list_pair(
-                record_spec=self.record_map.blocks_out,
+                record_spec=self.record_map.blocks_out
             )
             near_sql = data_algebra.near_sql.NearSQLRawQStep(
                 prefix=pi,

build/lib/data_algebra/data_ops.py

@@ -1931,9 +1931,12 @@ def row_recs_to_blocks_query_str_list_pair(
         """
         Convert row recs to blocks transformation into structures to help with SQL conversion.
         """
+        ct = record_spec.control_table
+        dm = data_algebra.data_model.lookup_data_model_for_dataframe(ct)
+        ct = dm.to_pandas(ct)
         control_value_cols = [
             c
-            for c in record_spec.control_table.columns
+            for c in ct.columns
             if c not in record_spec.control_table_keys
         ]
         control_cols = [
@@ -1960,7 +1963,7 @@ def row_recs_to_blocks_query_str_list_pair(
                 continue
             seen.add(result_col)
             cstmt = " CASE "
-            col = record_spec.control_table[result_col]
+            col = ct[result_col]
             isnull = col.isnull()
             for i in range(len(col)):
                 if not (isnull[i]):
@@ -1979,7 +1982,7 @@ def row_recs_to_blocks_query_str_list_pair(
                     cstmt = cstmt + col_sql
             cstmt = cstmt + " ELSE NULL END AS " + self.quote_identifier(result_col)
             col_stmts.append(cstmt)
-        ctab_sql = self.table_values_to_sql_str_list(record_spec.control_table)
+        ctab_sql = self.table_values_to_sql_str_list(ct)
         sql_prefix = _list_join_expecting_list(",", col_stmts) + [
             "FROM ( SELECT * FROM "
         ]
@@ -2000,17 +2003,20 @@ def blocks_to_row_recs_query_str_list_pair(
         """
         Convert blocks to row recs transform into structures to help with SQL translation.
         """
-        assert record_spec.control_table.shape[0] >= 1
+        ct = record_spec.control_table
+        dm = data_algebra.data_model.lookup_data_model_for_dataframe(ct)
+        ct = dm.to_pandas(ct)
+        assert ct.shape[0] >= 1
         col_stmts = []
         for c in record_spec.record_keys:
             col_stmts.append(
                 " " + self.quote_identifier(c) + " AS " + self.quote_identifier(c)
             )
-        if record_spec.control_table.shape[0] == 1:
+        if ct.shape[0] == 1:
             # special case with one row control table (rowrec)
-            for cc in record_spec.control_table.columns:
+            for cc in ct.columns:
                 if cc not in record_spec.control_table_keys:
-                    cc0 = record_spec.control_table[cc][0]
+                    cc0 = ct[cc][0]
                     col_stmts.append(
                         " "
                         + self.quote_identifier(cc)
@@ -2024,14 +2030,14 @@ def blocks_to_row_recs_query_str_list_pair(
             return sql_prefix, sql_suffix
         control_value_cols = [
             c
-            for c in record_spec.control_table.columns
+            for c in ct.columns
             if c not in record_spec.control_table_keys
         ]
         control_cols = [self.quote_identifier(c) for c in record_spec.record_keys]
         seen = set()
-        for i in range(record_spec.control_table.shape[0]):
+        for i in range(ct.shape[0]):
             for vc in control_value_cols:
-                col = record_spec.control_table[vc]
+                col = ct[vc]
                 isnull = col.isnull()
                 if col[i] not in seen and not isnull[i]:
                     seen.add(col[i])
@@ -2043,7 +2049,7 @@ def blocks_to_row_recs_query_str_list_pair(
                             + " AS "
                             + self.string_type
                             + ") = "
-                            + self.quote_string(str(record_spec.control_table[cc][i]))
+                            + self.quote_string(str(ct[cc][i]))
                             + " ) "
                         )
                     cstmt = (

build/lib/data_algebra/db_model.py

@@ -36,3 +36,6 @@ def __rrshift__(self, b):  # override b >> self
         This is read as sending b to self.
         """
         return self.act_on(b, correct_ordered_first_call=True)
+
+    def __call__(self, b):
+        return self.act_on(b, correct_ordered_first_call=True)

build/lib/data_algebra/shift_pipe_action.py

@@ -149,7 +149,7 @@ data_algebra/data_ops.py                1322    205    84%   36-37, 56-57, 94, 1
 data_algebra/data_ops_types.py            67      1    99%   312
 data_algebra/data_ops_utils.py            33      3    91%   29, 33, 43
 data_algebra/data_space.py                25      1    96%   76
-data_algebra/db_model.py                 999     97    90%   43, 58, 66-68, 204, 339-340, 420, 844, 856, 914, 921, 929-930, 949-953, 963, 977-981, 1005, 1017, 1076, 1078, 1084, 1095, 1107, 1139, 1143, 1148, 1181, 1185, 1201, 1204, 1284, 1295, 1300, 1323, 1327, 1368, 1375, 1413, 1417, 1435, 1450, 1454, 1476, 1480, 1494, 1534, 1538, 1574, 1578, 1639, 1643, 1645, 1648, 1673, 1752, 1756, 1760, 1763, 1768, 1811, 1822, 1960, 2011-2024, 2078-2079, 2097, 2106, 2121, 2127, 2129, 2133, 2142, 2157, 2166, 2207, 2244, 2247, 2254, 2362, 2455-2458, 2463-2464, 2468
+data_algebra/db_model.py                1005     97    90%   43, 58, 66-68, 204, 339-340, 420, 844, 856, 914, 921, 929-930, 949-953, 963, 977-981, 1005, 1017, 1076, 1078, 1084, 1095, 1107, 1139, 1143, 1148, 1181, 1185, 1201, 1204, 1284, 1295, 1300, 1323, 1327, 1368, 1375, 1413, 1417, 1435, 1450, 1454, 1476, 1480, 1494, 1534, 1538, 1574, 1578, 1639, 1643, 1645, 1648, 1673, 1752, 1756, 1760, 1763, 1768, 1811, 1822, 1963, 2017-2030, 2084-2085, 2103, 2112, 2127, 2133, 2135, 2139, 2148, 2163, 2172, 2213, 2250, 2253, 2260, 2368, 2461-2464, 2469-2470, 2474
 data_algebra/db_space.py                  76     16    79%   58-59, 63, 73-77, 83, 118-119, 132-133, 137-139
 data_algebra/eval_cache.py                51      0   100%
 data_algebra/expr_parse.py                34      0   100%
@@ -163,13 +163,13 @@ data_algebra/pandas_model.py              19      2    89%   32-33
 data_algebra/parse_by_lark.py            164     24    85%   71, 93, 108, 129-130, 137, 161, 171, 185-186, 188, 200, 206, 213-217, 245, 253, 263-266
 data_algebra/polars_model.py             597     74    88%   180, 189, 203, 446-452, 458-465, 483-484, 486, 570, 586, 596, 603, 616-620, 628, 630, 655, 658, 663, 666, 715, 733, 749, 816, 832-834, 879, 922, 941, 950, 965, 983, 1001, 1021, 1033-1035, 1038, 1045, 1047, 1054-1066, 1073, 1078, 1109, 1138, 1147, 1175, 1190, 1202
 data_algebra/python3_lark.py               1      0   100%
-data_algebra/shift_pipe_action.py         12      0   100%
+data_algebra/shift_pipe_action.py         14      0   100%
 data_algebra/solutions.py                135      4    97%   63, 308, 389, 472
 data_algebra/sql_format_options.py        17      4    76%   61, 68-71
 data_algebra/test_util.py                334     59    82%   28-29, 104, 126, 136, 139, 143, 166, 169, 173, 175-178, 189, 264-269, 273, 285, 295, 332, 334, 345, 353, 364, 371, 377, 389, 400, 414, 469, 473, 524-527, 529-532, 534-537, 539-542, 653-658, 663-664, 666
 data_algebra/util.py                     127     28    78%   26, 59-60, 63-64, 67-68, 71-72, 75-76, 79-80, 83-84, 87-88, 91-92, 95-96, 143, 165, 167, 182, 223, 227, 229
 --------------------------------------------------------------------
-TOTAL                                   6697    908    86%
+TOTAL                                   6705    908    86%
 
 
-======================= 373 passed in 842.88s (0:14:02) ========================
+======================= 373 passed in 825.96s (0:13:45) ========================

coverage.txt

@@ -2837,7 +2837,7 @@ def to_near_sql_implementation_(
             view_name = "convert_records_blocks_out_" + str(temp_id_source[0])
             temp_id_source[0] = temp_id_source[0] + 1
             pi, si = db_model.row_recs_to_blocks_query_str_list_pair(
-                record_spec=self.record_map.blocks_out,
+                record_spec=self.record_map.blocks_out
             )
             near_sql = data_algebra.near_sql.NearSQLRawQStep(
                 prefix=pi,

data_algebra/data_ops.py

@@ -1931,9 +1931,12 @@ def row_recs_to_blocks_query_str_list_pair(
         """
         Convert row recs to blocks transformation into structures to help with SQL conversion.
         """
+        ct = record_spec.control_table
+        dm = data_algebra.data_model.lookup_data_model_for_dataframe(ct)
+        ct = dm.to_pandas(ct)
         control_value_cols = [
             c
-            for c in record_spec.control_table.columns
+            for c in ct.columns
             if c not in record_spec.control_table_keys
         ]
         control_cols = [
@@ -1960,7 +1963,7 @@ def row_recs_to_blocks_query_str_list_pair(
                 continue
             seen.add(result_col)
             cstmt = " CASE "
-            col = record_spec.control_table[result_col]
+            col = ct[result_col]
             isnull = col.isnull()
             for i in range(len(col)):
                 if not (isnull[i]):
@@ -1979,7 +1982,7 @@ def row_recs_to_blocks_query_str_list_pair(
                     cstmt = cstmt + col_sql
             cstmt = cstmt + " ELSE NULL END AS " + self.quote_identifier(result_col)
             col_stmts.append(cstmt)
-        ctab_sql = self.table_values_to_sql_str_list(record_spec.control_table)
+        ctab_sql = self.table_values_to_sql_str_list(ct)
         sql_prefix = _list_join_expecting_list(",", col_stmts) + [
             "FROM ( SELECT * FROM "
         ]
@@ -2000,17 +2003,20 @@ def blocks_to_row_recs_query_str_list_pair(
         """
         Convert blocks to row recs transform into structures to help with SQL translation.
         """
-        assert record_spec.control_table.shape[0] >= 1
+        ct = record_spec.control_table
+        dm = data_algebra.data_model.lookup_data_model_for_dataframe(ct)
+        ct = dm.to_pandas(ct)
+        assert ct.shape[0] >= 1
         col_stmts = []
         for c in record_spec.record_keys:
             col_stmts.append(
                 " " + self.quote_identifier(c) + " AS " + self.quote_identifier(c)
             )
-        if record_spec.control_table.shape[0] == 1:
+        if ct.shape[0] == 1:
             # special case with one row control table (rowrec)
-            for cc in record_spec.control_table.columns:
+            for cc in ct.columns:
                 if cc not in record_spec.control_table_keys:
-                    cc0 = record_spec.control_table[cc][0]
+                    cc0 = ct[cc][0]
                     col_stmts.append(
                         " "
                         + self.quote_identifier(cc)
@@ -2024,14 +2030,14 @@ def blocks_to_row_recs_query_str_list_pair(
             return sql_prefix, sql_suffix
         control_value_cols = [
             c
-            for c in record_spec.control_table.columns
+            for c in ct.columns
             if c not in record_spec.control_table_keys
         ]
         control_cols = [self.quote_identifier(c) for c in record_spec.record_keys]
         seen = set()
-        for i in range(record_spec.control_table.shape[0]):
+        for i in range(ct.shape[0]):
             for vc in control_value_cols:
-                col = record_spec.control_table[vc]
+                col = ct[vc]
                 isnull = col.isnull()
                 if col[i] not in seen and not isnull[i]:
                     seen.add(col[i])
@@ -2043,7 +2049,7 @@ def blocks_to_row_recs_query_str_list_pair(
                             + " AS "
                             + self.string_type
                             + ") = "
-                            + self.quote_string(str(record_spec.control_table[cc][i]))
+                            + self.quote_string(str(ct[cc][i]))
                             + " ) "
                         )
                     cstmt = (

data_algebra/db_model.py

@@ -36,3 +36,6 @@ def __rrshift__(self, b):  # override b >> self
         This is read as sending b to self.
         """
         return self.act_on(b, correct_ordered_first_call=True)
+
+    def __call__(self, b):
+        return self.act_on(b, correct_ordered_first_call=True)