Commit e5767723 authored by Olivier Bertrand's avatar Olivier Bertrand

- Last revision was to add the JSON table type. This one adds a sort

  on the multiple table result to obtain the same result on Windows
  and Linux (because files can be retrieved in a different order)
modified:
  storage/connect/mysql-test/connect/r/json.result
  storage/connect/mysql-test/connect/t/json.test
parent 8fc69564
...@@ -350,32 +350,32 @@ WEEK INT(2), ...@@ -350,32 +350,32 @@ WEEK INT(2),
WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT', WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT') AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1;
SELECT * FROM t1 ORDER BY WHO, WEEK; SELECT * FROM t1 ORDER BY WHO, WEEK, WHAT, AMOUNT;
WHO WEEK WHAT AMOUNT WHO WEEK WHAT AMOUNT
Beth 3 Beer 16.00 Beth 3 Beer 16.00
Beth 4 Beer 15.00 Beth 4 Beer 15.00
Beth 4 Food 17.00 Beth 4 Food 17.00
Beth 5 Food 12.00
Beth 5 Beer 20.00 Beth 5 Beer 20.00
Beth 5 Food 12.00
Janet 3 Beer 18.00 Janet 3 Beer 18.00
Janet 3 Food 18.00
Janet 3 Car 19.00 Janet 3 Car 19.00
Janet 3 Food 18.00
Janet 4 Car 17.00 Janet 4 Car 17.00
Janet 5 Beer 19.00
Janet 5 Beer 14.00 Janet 5 Beer 14.00
Janet 5 Beer 19.00
Janet 5 Car 12.00 Janet 5 Car 12.00
Janet 5 Food 12.00 Janet 5 Food 12.00
Joe 3 Food 12.00
Joe 3 Beer 18.00 Joe 3 Beer 18.00
Joe 3 Car 20.00 Joe 3 Car 20.00
Joe 3 Food 12.00
Joe 3 Food 19.00 Joe 3 Food 19.00
Joe 4 Beer 14.00 Joe 4 Beer 14.00
Joe 4 Food 17.00
Joe 4 Food 17.00
Joe 4 Beer 16.00 Joe 4 Beer 16.00
Joe 4 Beer 19.00 Joe 4 Beer 19.00
Joe 5 Food 12.00 Joe 4 Food 17.00
Joe 4 Food 17.00
Joe 5 Beer 14.00 Joe 5 Beer 14.00
Joe 5 Food 12.00
DROP TABLE t1; DROP TABLE t1;
# #
# Or also a partition JSON table # Or also a partition JSON table
......
...@@ -215,7 +215,7 @@ WEEK INT(2), ...@@ -215,7 +215,7 @@ WEEK INT(2),
WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT', WHAT CHAR(32) FIELD_FORMAT='EXPENSE:[X]:WHAT',
AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT') AMOUNT DOUBLE(8,2) FIELD_FORMAT='EXPENSE:[X]:AMOUNT')
ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1; ENGINE=CONNECT TABLE_TYPE=JSON FILE_NAME='mulexp*.jsn' MULTIPLE=1;
SELECT * FROM t1 ORDER BY WHO, WEEK; SELECT * FROM t1 ORDER BY WHO, WEEK, WHAT, AMOUNT;
DROP TABLE t1; DROP TABLE t1;
--echo # --echo #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment