diff --git a/tests/testthat/_snaps/learn.md b/tests/testthat/_snaps/learn.md
index 2f17067ceb..189efc9da3 100644
--- a/tests/testthat/_snaps/learn.md
+++ b/tests/testthat/_snaps/learn.md
@@ -264,84 +264,132 @@
           },
           {
             "constraint_name": 2,
+            "table_name": "tf_1",
+            "column_name": "a",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 3,
             "table_name": "tf_2",
             "column_name": "c",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 3,
+            "constraint_name": 4,
+            "table_name": "tf_2",
+            "column_name": "c",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 5,
             "table_name": "tf_2",
             "column_name": "d",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 4,
+            "constraint_name": 6,
             "table_name": "tf_2",
             "column_name": "e",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 4,
+            "constraint_name": 6,
             "table_name": "tf_2",
             "column_name": "e1",
             "ordinal_position": 2
           },
           {
-            "constraint_name": 5,
+            "constraint_name": 7,
             "table_name": "tf_3",
             "column_name": "f",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 5,
+            "constraint_name": 7,
             "table_name": "tf_3",
             "column_name": "f1",
             "ordinal_position": 2
           },
           {
-            "constraint_name": 6,
+            "constraint_name": 8,
+            "table_name": "tf_3",
+            "column_name": "f",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 8,
+            "table_name": "tf_3",
+            "column_name": "f1",
+            "ordinal_position": 2
+          },
+          {
+            "constraint_name": 9,
+            "table_name": "tf_3",
+            "column_name": "g",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 10,
             "table_name": "tf_4",
             "column_name": "h",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 7,
+            "constraint_name": 11,
+            "table_name": "tf_4",
+            "column_name": "h",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 12,
             "table_name": "tf_4",
             "column_name": "j",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 7,
+            "constraint_name": 12,
             "table_name": "tf_4",
             "column_name": "j1",
             "ordinal_position": 2
           },
           {
-            "constraint_name": 8,
+            "constraint_name": 13,
             "table_name": "tf_5",
             "column_name": "k",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 9,
+            "constraint_name": 14,
+            "table_name": "tf_5",
+            "column_name": "k",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 15,
             "table_name": "tf_5",
             "column_name": "l",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 10,
+            "constraint_name": 16,
             "table_name": "tf_5",
             "column_name": "m",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 11,
+            "constraint_name": 17,
             "table_name": "tf_6",
             "column_name": "n",
             "ordinal_position": 1
           },
           {
-            "constraint_name": 12,
+            "constraint_name": 18,
+            "table_name": "tf_6",
+            "column_name": "o",
+            "ordinal_position": 1
+          },
+          {
+            "constraint_name": 19,
             "table_name": "tf_6",
             "column_name": "o",
             "ordinal_position": 1
diff --git a/tests/testthat/_snaps/maria.md b/tests/testthat/_snaps/maria.md
index 0c8e55a499..43d3c9d06b 100644
--- a/tests/testthat/_snaps/maria.md
+++ b/tests/testthat/_snaps/maria.md
@@ -63,7 +63,7 @@
       $load
       $load$tf_1
       <SQL> INSERT INTO `tf_1` (`a`, `b`)
-      SELECT CAST(`a` AS INTEGER) AS `a`, CAST(`b` AS CHAR) AS `b`
+      SELECT `a`, CAST(`b` AS CHAR) AS `b`
       FROM (
         (
           SELECT NULL AS `a`, NULL AS `b`
@@ -89,9 +89,9 @@
       <SQL> INSERT INTO `tf_2` (`c`, `d`, `e`, `e1`)
       SELECT
         CAST(`c` AS CHAR) AS `c`,
-        CAST(`d` AS INTEGER) AS `d`,
+        `d`,
         CAST(`e` AS CHAR) AS `e`,
-        CAST(`e1` AS INTEGER) AS `e1`
+        `e1`
       FROM (
         (
           SELECT NULL AS `c`, NULL AS `d`, NULL AS `e`, NULL AS `e1`
@@ -113,7 +113,7 @@
       <SQL> INSERT INTO `tf_3` (`f`, `f1`, `g`)
       SELECT
         CAST(`f` AS CHAR) AS `f`,
-        CAST(`f1` AS INTEGER) AS `f1`,
+        `f1`,
         CAST(`g` AS CHAR) AS `g`
       FROM (
         (
@@ -123,16 +123,16 @@
         UNION ALL
         (
         VALUES
-          ('C', 2, 'one'),
-          ('C', 3, 'two'),
-          ('D', 4, 'three'),
-          ('E', 5, 'four'),
-          ('F', 6, 'five'),
-          ('G', 7, 'six'),
-          ('H', 7, 'seven'),
           ('I', 7, 'eight'),
+          ('F', 6, 'five'),
+          ('E', 5, 'four'),
           ('J', 10, 'nine'),
-          ('K', 11, 'ten')
+          ('C', 2, 'one'),
+          ('H', 7, 'seven'),
+          ('G', 7, 'six'),
+          ('K', 11, 'ten'),
+          ('D', 4, 'three'),
+          ('C', 3, 'two')
         )
       ) `values_table`
       
@@ -142,7 +142,7 @@
         CAST(`h` AS CHAR) AS `h`,
         CAST(`i` AS CHAR) AS `i`,
         CAST(`j` AS CHAR) AS `j`,
-        CAST(`j1` AS INTEGER) AS `j1`
+        `j1`
       FROM (
         (
           SELECT NULL AS `h`, NULL AS `i`, NULL AS `j`, NULL AS `j1`
@@ -162,8 +162,8 @@
       $load$tf_5
       <SQL> INSERT INTO `tf_5` (`ww`, `k`, `l`, `m`)
       SELECT
-        CAST(`ww` AS INTEGER) AS `ww`,
-        CAST(`k` AS INTEGER) AS `k`,
+        `ww`,
+        `k`,
         CAST(`l` AS CHAR) AS `l`,
         CAST(`m` AS CHAR) AS `m`
       FROM (
@@ -184,7 +184,7 @@
       $load$tf_6
       <SQL> INSERT INTO `tf_6` (`zz`, `n`, `o`)
       SELECT
-        CAST(`zz` AS INTEGER) AS `zz`,
+        `zz`,
         CAST(`n` AS CHAR) AS `n`,
         CAST(`o` AS CHAR) AS `o`
       FROM (