work on new SQL cdata example

JohnMount · JohnMount · commit 51c17082f774 · 2020-01-16T18:08:28.000-08:00
diff --git a/Examples/cdata/cdata.ipynb b/Examples/cdata/cdata.ipynb
@@ -1228,13 +1228,13 @@
   "pycharm": {
    "stem_cell": {
     "cell_type": "raw",
+    "source": [],
     "metadata": {
      "collapsed": false
-    },
-    "source": []
+    }
    }
   }
  },
  "nbformat": 4,
  "nbformat_minor": 4
-}
+}
diff --git a/Examples/cdata/ranking_pivot_example.ipynb b/Examples/cdata/ranking_pivot_example.ipynb
diff --git a/build/lib/data_algebra/data_ops.py b/build/lib/data_algebra/data_ops.py
@@ -2035,7 +2035,7 @@ def to_sql_implementation(self, db_model, *, using, temp_id_source):
             db_model=db_model, using=None, temp_id_source=temp_id_source
         )
         # claims to use all columns
-        query = sub_query.to_sql(columns=self.columns_used_from_sources(), db_model=db_model)
+        query = sub_query.to_sql(columns=self.columns_used_from_sources()[0], db_model=db_model)
         blocks_out_table = None
         if self.record_map.blocks_in is not None:
             query = db_model.blocks_to_row_recs_query(
diff --git a/build/lib/data_algebra/db_model.py b/build/lib/data_algebra/db_model.py
@@ -716,10 +716,10 @@ def row_recs_to_blocks_query(
                 if not (isnull[i]):
                     source_col = col[i]
                     col_sql = (
-                        "  WHEN b."
+                        "  WHEN CAST(b."
                         + self.quote_identifier(result_col)
-                        + " = "
-                        + self.quote_literal(source_col)
+                        + " AS VARCHAR) = "
+                        + self.quote_string(str(source_col))
                         + " THEN a."
                         + self.quote_identifier(source_col)
                         + "\n"
@@ -773,10 +773,10 @@ def blocks_to_row_recs_query(
                     clauses = []
                     for cc in record_spec.control_table_keys:
                         clauses.append(
-                            " ( "
+                            " ( CAST("
                             + self.quote_identifier(cc)
-                            + " = "
-                            + self.quote_literal(record_spec.control_table[cc][i])
+                            + " AS VARCHAR) = "
+                            + self.quote_string(str(record_spec.control_table[cc][i]))
                             + " ) "
                         )
                     cstmt = (
diff --git a/coverage.txt b/coverage.txt
@@ -1,5 +1,5 @@
 ============================= test session starts ==============================
-platform darwin -- Python 3.7.5, pytest-5.3.1, py-1.8.0, pluggy-0.13.1
+platform darwin -- Python 3.7.5, pytest-5.2.4, py-1.8.0, pluggy-0.13.0
 rootdir: /Users/johnmount/Documents/work/data_algebra
 plugins: cov-2.8.1
 collected 85 items
@@ -82,4 +82,4 @@ data_algebra/yaml.py                      95     11    88%
 TOTAL                                   3961    909    77%
 
 
-============================= 85 passed in 17.96s ==============================
+============================== 85 passed in 8.56s ==============================
diff --git a/data_algebra/data_ops.py b/data_algebra/data_ops.py
@@ -2035,7 +2035,7 @@ def to_sql_implementation(self, db_model, *, using, temp_id_source):
             db_model=db_model, using=None, temp_id_source=temp_id_source
         )
         # claims to use all columns
-        query = sub_query.to_sql(columns=self.columns_used_from_sources(), db_model=db_model)
+        query = sub_query.to_sql(columns=self.columns_used_from_sources()[0], db_model=db_model)
         blocks_out_table = None
         if self.record_map.blocks_in is not None:
             query = db_model.blocks_to_row_recs_query(
diff --git a/data_algebra/db_model.py b/data_algebra/db_model.py
@@ -716,10 +716,10 @@ def row_recs_to_blocks_query(
                 if not (isnull[i]):
                     source_col = col[i]
                     col_sql = (
-                        "  WHEN b."
+                        "  WHEN CAST(b."
                         + self.quote_identifier(result_col)
-                        + " = "
-                        + self.quote_literal(source_col)
+                        + " AS VARCHAR) = "
+                        + self.quote_string(str(source_col))
                         + " THEN a."
                         + self.quote_identifier(source_col)
                         + "\n"
@@ -773,10 +773,10 @@ def blocks_to_row_recs_query(
                     clauses = []
                     for cc in record_spec.control_table_keys:
                         clauses.append(
-                            " ( "
+                            " ( CAST("
                             + self.quote_identifier(cc)
-                            + " = "
-                            + self.quote_literal(record_spec.control_table[cc][i])
+                            + " AS VARCHAR) = "
+                            + self.quote_string(str(record_spec.control_table[cc][i]))
                             + " ) "
                         )
                     cstmt = (
diff --git a/dist/data_algebra-0.4.4-py3-none-any.whl b/dist/data_algebra-0.4.4-py3-none-any.whl
diff --git a/dist/data_algebra-0.4.4.tar.gz b/dist/data_algebra-0.4.4.tar.gz

Original file line number	Diff line number	Diff line change
`@@ -2035,7 +2035,7 @@ def to_sql_implementation(self, db_model, *, using, temp_id_source):`
`2035`	`2035`	`db_model=db_model, using=None, temp_id_source=temp_id_source`
`2036`	`2036`	`)`
`2037`	`2037`	`# claims to use all columns`
`2038`		`- query = sub_query.to_sql(columns=self.columns_used_from_sources(), db_model=db_model)`
	`2038`	`+ query = sub_query.to_sql(columns=self.columns_used_from_sources()[0], db_model=db_model)`
`2039`	`2039`	`blocks_out_table = None`
`2040`	`2040`	`if self.record_map.blocks_in is not None:`
`2041`	`2041`	`query = db_model.blocks_to_row_recs_query(`