diff --git a/test/cases/dtype/bigint.test b/test/cases/dtype/bigint.test index 66a1abfe1baaf713d4f7c73c191b9de60e993942..ba58b0146199f8449b4bd86ded7adf9fc643d33a 100644 --- a/test/cases/dtype/bigint.test +++ b/test/cases/dtype/bigint.test @@ -31,8 +31,8 @@ drop table t1; create table t1 ( a int not null default 1, big bigint unsigned primary key); insert into t1 (big) values (0),(18446744073709551615), (0xFFFFFFFFFFFFFFFE), (18446744073709551613), (18446744073709551612); select * from t1; -select * from t1 order by big limit 1,3; -select * from t1 order by big limit 3 offset 1; +select * from t1 order by 1,2 asc limit 1,3; +select * from t1 order by big asc limit 3 offset 1; select min(big),max(big),max(big)-1 from t1; select min(big),max(big),max(big)-1 from t1 group by a; drop table t1; @@ -66,7 +66,7 @@ drop table if exists t1; drop table if exists t2; create table t1 (sint64 bigint not null); insert into t1 values (-9223372036854775808); -select * from t1 order by abs(1); +select * from t1 order by abs(1) desc; drop table t1; create table t1 (bigint_col bigint unsigned); insert into t1 values (17666000000000000000); diff --git a/test/cases/dtype/char.test b/test/cases/dtype/char.test index 74f0f3259cd1c68f352345db943db46484933741..e1a18360849bb82919aa88530d681b862d3dfeae 100644 --- a/test/cases/dtype/char.test +++ b/test/cases/dtype/char.test @@ -58,7 +58,7 @@ select concat_ws(LastName,FirstName) as fullname from Demochar where Age > 40 or select concat_ws(LastName,FirstName),Gender,Age from Demochar where Gender='F' order by Age asc; select cast(Age as char) as cAge from Demochar where cast(Age as char) like '2_'; -- @bvt:issue#3252 -select cast(Age as char) and Age as cAge from Demochar where Age>=50 order by cAge; +select cast(Age as char) and Age as cAge from Demochar where Age>=50 order by cAge asc; -- @bvt:issue CREATE TABLE employees ( employeeNumber int(11) NOT NULL, @@ -90,7 +90,7 @@ insert into employees(employeeNumber,lastName,firstName,extension,email,officeC (1501,'Bott','Larry','x2311','lbott@classicmodelcars.com','7',1102,'Sales Rep'), (1504,'Jones','Barry','x102','bjones@classicmodelcars.com','7',1102,'Sales Rep'), (1611,'Fixter','Andy','x101','afixter@classicmodelcars.com','6',1088,'Sales Rep'); -select officeCode,count(officeCode) from employees group by officeCode having count(officeCode)>2; +select officeCode,count(officeCode) from employees group by officeCode having count(officeCode)>2 order by 1 asc,2 desc; select lastName,firstName from employees where cast(officeCode as unsigned)>5 limit 2 offset 1; select max(lastName),min(lastName) from employees; select max(lastName),min(lastName),JobTitle from employees group by JobTitle; diff --git a/test/result/dtype/bigint.result b/test/result/dtype/bigint.result index 0acbef7df2952d1172de6525d7afe21ced7b2b31..e0b48a1684305fd2370ee3840aaa5516e7aaffe6 100644 --- a/test/result/dtype/bigint.result +++ b/test/result/dtype/bigint.result @@ -61,12 +61,12 @@ a big 1 18446744073709551613 1 18446744073709551614 1 18446744073709551615 -select * from t1 order by big limit 1,3; +select * from t1 order by 1,2 asc limit 1,3; a big 1 18446744073709551612 1 18446744073709551613 1 18446744073709551614 -select * from t1 order by big limit 3 offset 1; +select * from t1 order by big asc limit 3 offset 1; a big 1 18446744073709551612 1 18446744073709551613 @@ -119,7 +119,7 @@ drop table if exists t1; drop table if exists t2; create table t1 (sint64 bigint not null); insert into t1 values (-9223372036854775808); -select * from t1 order by abs(1); +select * from t1 order by abs(1) desc; sint64 -9223372036854775808 drop table t1; diff --git a/test/result/dtype/char.result b/test/result/dtype/char.result index fabae0fe870b16207340e66efeb7974bcd2e52a5..ab301289238c3769e0654cbc21c2aa4ad684a876 100644 --- a/test/result/dtype/char.result +++ b/test/result/dtype/char.result @@ -108,7 +108,7 @@ Andrea F 45 Kelly F 54 select cast(Age as char) as cAge from Demochar where cast(Age as char) like '2_'; cage -select cast(Age as char) and Age as cAge from Demochar where Age>=50 order by cAge; +select cast(Age as char) and Age as cAge from Demochar where Age>=50 order by cAge asc; cage 1 1 @@ -142,7 +142,7 @@ insert into employees(employeeNumber,lastName,firstName,extension,email,officeC (1501,'Bott','Larry','x2311','lbott@classicmodelcars.com','7',1102,'Sales Rep'), (1504,'Jones','Barry','x102','bjones@classicmodelcars.com','7',1102,'Sales Rep'), (1611,'Fixter','Andy','x101','afixter@classicmodelcars.com','6',1088,'Sales Rep'); -select officeCode,count(officeCode) from employees group by officeCode having count(officeCode)>2; +select officeCode,count(officeCode) from employees group by officeCode having count(officeCode)>2 order by 1 asc,2 desc; officecode count(officecode) 1 6 4 4