For alias that has special characters, instead of sanitize it, use `` to escape it.

PiperOrigin-RevId: 350897245

Author: tcya

meterstick_demo.ipynb

@@ -78,8 +78,19 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 1,
       "metadata": {
+        "executionInfo": {
+          "elapsed": 12094,
+          "status": "ok",
+          "timestamp": 1608033023655,
+          "user": {
+            "displayName": "",
+            "photoUrl": "",
+            "userId": ""
+          },
+          "user_tz": 480
+        },
         "id": "f8zpdK4-y-CQ"
       },
       "outputs": [],
@@ -93,15 +104,15 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 2,
       "metadata": {
         "colab": {
           "height": 204
         },
         "executionInfo": {
-          "elapsed": 490,
+          "elapsed": 608,
           "status": "ok",
-          "timestamp": 1607761536163,
+          "timestamp": 1608033024296,
           "user": {
             "displayName": "",
             "photoUrl": "",
@@ -110,7 +121,7 @@
           "user_tz": 480
         },
         "id": "hyDE-bxMBxQY",
-        "outputId": "bea4054f-8d56-40d7-9763-d3826c20dcf3"
+        "outputId": "68ec8f8c-ec98-4e56-cb99-315878c9928c"
       },
       "outputs": [
         {
@@ -201,7 +212,7 @@
               "4           16  1.470001  Desktop    ctrl  non-US       2"
             ]
           },
-          "execution_count": 3,
+          "execution_count": 2,
           "metadata": {
             "tags": []
           },
@@ -5796,38 +5807,35 @@
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 3,
       "metadata": {
-        "colab": {
-          "height": 119
-        },
         "executionInfo": {
-          "elapsed": 450,
+          "elapsed": 380,
           "status": "ok",
-          "timestamp": 1599954217684,
+          "timestamp": 1608033025528,
           "user": {
             "displayName": "",
             "photoUrl": "",
             "userId": ""
           },
-          "user_tz": 420
+          "user_tz": 480
         },
         "id": "i9wHC71rred8",
-        "outputId": "cdef4ce9-3bb6-43db-8001-dd55c67a458f"
+        "outputId": "cea68e98-192e-44f2-bb5f-fd20886f5f35"
       },
       "outputs": [
         {
           "data": {
             "text/plain": [
               "SELECT\n",
               "  grp,\n",
-              "  SUM(IF(Y \u003e 0, X, NULL)) AS sum_X,\n",
-              "  SUM(X) AS sum_X_1\n",
+              "  SUM(IF(Y \u003e 0, X, NULL)) AS `sum(X)`,\n",
+              "  SUM(X) AS `sum(X)_1`\n",
               "FROM T\n",
               "GROUP BY grp"
             ]
           },
-          "execution_count": 10,
+          "execution_count": 3,
           "metadata": {
             "tags": []
           },

metrics.py

@@ -422,9 +422,16 @@ def compute_on_sql(
       res = execute(query)
     else:
       raise ValueError('Unrecognized SQL engine!')
+    # We replace '$' with 'macro_' in the generated SQL. To recover the names,
+    # we cannot just replace 'macro_' with '$' because 'macro_' might be in the
+    # orignal names. So we set index using the replaced names then reset index
+    # names, which recovers all indexes. Unfortunately it's not as easy to
+    # recover metric/column names, so for the remaining columns we just replace
+    # 'macro_' with '$'.
     if indexes:
-      res.set_index(list(map(utils.sql_name_sanitize, indexes)), inplace=True)
+      res.set_index([k.replace('$', 'macro_') for k in indexes], inplace=True)
       res.index.names = indexes
+    res.columns = [c.replace('macro_', '$') for c in res.columns]
     if split_by:  # Use a stable sort.
       res.sort_values(split_by, kind='mergesort', inplace=True)
     return utils.melt(res) if melted else res

operations.py

@@ -488,9 +488,6 @@ def display(res,
           AbsoluteChange('', '').name_tmpl.format(''),
           PercentChange('', '').name_tmpl.format('')
       ]
-      comparison_suffix += [
-          utils.sql_name_sanitize(c.lower()) for c in comparison_suffix
-      ]
       comparison_suffix = '(%s)$' % '|'.join(comparison_suffix)
       # Don't use inplace=True. It will change the index of 'raw' too.
       res.index = res.index.set_levels(
@@ -747,10 +744,7 @@ def compute_on_sql(
         raw = res.iloc[:, -n_metrics:]
         res = res.iloc[:, :3 * n_metrics]
         change = self.children[0]
-        raw.columns = [
-            utils.sql_name_sanitize(change.name_tmpl.lower().format(c))
-            for c in raw.columns
-        ]
+        raw.columns = [change.name_tmpl.format(c) for c in raw.columns]
         raw = utils.melt(raw)
         raw.columns = ['_base_value']
         indexes = [i for i in indexes if i not in change.extra_index]