Fix some planner expectations

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jun 19, 2024 · b978f63 · b978f63
1 parent 261f9c5
commit b978f63
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/go/vt/vtgate/planbuilder/testdata/onecase.json b/go/vt/vtgate/planbuilder/testdata/onecase.json
@@ -36,8 +36,8 @@
                           "Name": "user",
                           "Sharded": true
                         },
-                        "FieldQuery": "select count(*), `user`.intcol from `user` where 1 != 1 group by `user`.intcol",
-                        "Query": "select count(*), `user`.intcol from `user` group by `user`.intcol",
+                        "FieldQuery": "select `user`.intcol, Count(*) from `user` where 1 != 1 group by `user`.intcol",
+                        "Query": "select `user`.intcol, Count(*) from `user` group by `user`.intcol",
                         "Table": "`user`"
                       },
                       {
@@ -47,8 +47,8 @@
                           "Name": "user",
                           "Sharded": true
                         },
-                        "FieldQuery": "select count(*) from user_extra where 1 != 1 group by .0",
-                        "Query": "select count(*) from user_extra where :user_intcol + user_extra.incol < 5 group by .0",
+                        "FieldQuery": "select 1, Count(*) from user_extra where 1 != 1 group by .0",
+                        "Query": "select 1, Count(*) from user_extra where :user_intcol + user_extra.incol < 5 group by .0",
                         "Table": "user_extra"
                       }
                     ]
@@ -65,4 +65,4 @@
       ]
     }
   }
-]
+]
diff --git a/go/vt/vtgate/planbuilder/testdata/systemtables_cases57.json b/go/vt/vtgate/planbuilder/testdata/systemtables_cases57.json
@@ -914,8 +914,8 @@
           "Name": "main",
           "Sharded": false
         },
-        "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
-        "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
+        "FieldQuery": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
+        "Query": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
         "SysTableTableName": "[table_name:VARCHAR(\"foo\")]",
         "SysTableTableSchema": "[VARCHAR(\"performance_schema\")]",
         "Table": "INFORMATION_SCHEMA.`TABLES`"
@@ -931,8 +931,8 @@
           "Name": "main",
           "Sharded": false
         },
-        "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
-        "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
+        "FieldQuery": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
+        "Query": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
         "SysTableTableName": "[table_name:VARCHAR(\"foo\")]",
         "SysTableTableSchema": "[VARCHAR(\"performance_schema\")]",
         "Table": "INFORMATION_SCHEMA.`TABLES`"

diff --git a/go/vt/vtgate/planbuilder/testdata/systemtables_cases80.json b/go/vt/vtgate/planbuilder/testdata/systemtables_cases80.json
@@ -938,8 +938,8 @@
           "Name": "main",
           "Sharded": false
         },
-        "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
-        "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
+        "FieldQuery": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
+        "Query": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
         "SysTableTableName": "[table_name:VARCHAR(\"foo\")]",
         "SysTableTableSchema": "[VARCHAR(\"performance_schema\")]",
         "Table": "INFORMATION_SCHEMA.`TABLES`"
@@ -955,8 +955,8 @@
           "Name": "main",
           "Sharded": false
         },
-        "FieldQuery": "select count(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
-        "Query": "select count(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
+        "FieldQuery": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where 1 != 1",
+        "Query": "select COUNT(*) from INFORMATION_SCHEMA.`TABLES` where table_schema = :__vtschemaname and table_name = :table_name",
         "SysTableTableName": "[table_name:VARCHAR(\"foo\")]",
         "SysTableTableSchema": "[VARCHAR(\"performance_schema\")]",
         "Table": "INFORMATION_SCHEMA.`TABLES`"