Skip to content

Commit 825539a

Browse files
Changed ordering in case macos IDs are non deterministic
1 parent 1b555f4 commit 825539a

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

diesel_tests/tests/limit_offset.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn limit() {
1313
let expected_data = vec![("Sean".to_string(), None::<String>)];
1414
let actual_data: Vec<_> = users
1515
.select((name, hair_color))
16-
.order(id)
16+
.order(name)
1717
.limit(1)
1818
.load(connection)
1919
.unwrap();
@@ -31,7 +31,7 @@ fn offset() {
3131
.unwrap();
3232

3333
let expected_data = vec![("Tess".to_string(), None::<String>)];
34-
let q = users.select((name, hair_color)).order(id).offset(1);
34+
let q = users.select((name, hair_color)).order(name).offset(1);
3535
let actual_data: Vec<_> = q.load(connection).unwrap();
3636
assert_eq!(expected_data, actual_data);
3737
}
@@ -45,10 +45,10 @@ fn limit_offset() {
4545
.execute(connection)
4646
.unwrap();
4747

48-
let expected_data = vec![("Ruby".to_string(), None::<String>)];
48+
let expected_data = vec![("Tess".to_string(), None::<String>)];
4949
let q = users
5050
.select((name, hair_color))
51-
.order(id)
51+
.order(name)
5252
.limit(1)
5353
.offset(2);
5454
let actual_data: Vec<_> = q.load(connection).unwrap();
@@ -68,7 +68,7 @@ fn boxed_limit() {
6868
let actual_data: Vec<_> = users
6969
.into_boxed()
7070
.select((name, hair_color))
71-
.order(id)
71+
.order(name)
7272
.limit(1)
7373
.load(connection)
7474
.unwrap();
@@ -78,7 +78,7 @@ fn boxed_limit() {
7878
.select((name, hair_color))
7979
.limit(1)
8080
.into_boxed()
81-
.order(id)
81+
.order(name)
8282
.load(connection)
8383
.unwrap();
8484
assert_eq!(expected_data, actual_data);
@@ -98,7 +98,7 @@ fn boxed_offset() {
9898
let actual_data: Vec<_> = users
9999
.select((name, hair_color))
100100
.into_boxed()
101-
.order(id)
101+
.order(name)
102102
.offset(1)
103103
.load(connection)
104104
.unwrap();
@@ -110,7 +110,7 @@ fn boxed_offset() {
110110
.select((name, hair_color))
111111
.offset(1)
112112
.into_boxed()
113-
.order(id)
113+
.order(name)
114114
.load(connection)
115115
.unwrap();
116116
assert_eq!(expected_data, actual_data);
@@ -126,12 +126,12 @@ fn boxed_limit_offset() {
126126
.execute(connection)
127127
.unwrap();
128128

129-
let expected_data = vec![("Ruby".to_string(), None::<String>)];
129+
let expected_data = vec![("Tess".to_string(), None::<String>)];
130130

131131
let actual_data: Vec<_> = users
132132
.into_boxed()
133133
.select((name, hair_color))
134-
.order(id)
134+
.order(name)
135135
.limit(1)
136136
.offset(2)
137137
.load(connection)
@@ -143,7 +143,7 @@ fn boxed_limit_offset() {
143143
.limit(1)
144144
.offset(2)
145145
.into_boxed()
146-
.order(id)
146+
.order(name)
147147
.load(connection)
148148
.unwrap();
149149
assert_eq!(expected_data, actual_data);
@@ -152,7 +152,7 @@ fn boxed_limit_offset() {
152152
.select((name, hair_color))
153153
.limit(1)
154154
.into_boxed()
155-
.order(id)
155+
.order(name)
156156
.offset(2)
157157
.load(connection)
158158
.unwrap();
@@ -164,7 +164,7 @@ fn boxed_limit_offset() {
164164
.select((name, hair_color))
165165
.offset(2)
166166
.into_boxed()
167-
.order(id)
167+
.order(name)
168168
.limit(1)
169169
.load(connection)
170170
.unwrap();

0 commit comments

Comments
 (0)