Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb3a7091

Browse files
committed
Fix tests, make them compatible with MacOS / OS X
1 parenta0d4201 commitb3a7091

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

‎expected/zson.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ SELECT zson_learn('{{"nocompress", "x"}}');
4242
Done! Run " select * from zson_dict where dict_id = 0; " to see a dictionary.
4343
(1 row)
4444

45-
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word;
45+
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word COLLATE "C";
4646
dict_id | word
4747
---------+-------------
4848
0 | IP
49-
0 | master
5049
0 | ModifyIndex
5150
0 | Roles
51+
0 | master
5252
0 | slave
5353
(5 rows)
5454

@@ -58,24 +58,24 @@ SELECT zson_learn('{{"nocompress", "x"}}', 10000, 1, 128, 1);
5858
Done! Run " select * from zson_dict where dict_id = 1; " to see a dictionary.
5959
(1 row)
6060

61-
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word;
61+
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word COLLATE "C";
6262
dict_id | word
6363
---------+-------------
6464
0 | IP
65-
0 | master
6665
0 | ModifyIndex
6766
0 | Roles
67+
0 | master
6868
0 | slave
6969
1 | 10.0.0.1
7070
1 | 10.0.0.2
7171
1 | 10.0.0.3
72+
1 | IP
73+
1 | ModifyIndex
74+
1 | Roles
7275
1 | aaa
7376
1 | array
7477
1 | dummy
75-
1 | IP
7678
1 | master
77-
1 | ModifyIndex
78-
1 | Roles
7979
1 | slave
8080
1 | some
8181
(17 rows)
@@ -94,24 +94,24 @@ SELECT '{"aaa": "ololo"}'::zson -> 'aaa';
9494

9595
CREATE TABLE zson_test(x zson);
9696
INSERT INTO zson_test VALUES('{"aaa":123}' :: jsonb);
97-
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word;
97+
SELECT dict_id, word FROM zson_dict ORDER BY dict_id, word COLLATE "C";
9898
dict_id | word
9999
---------+-------------
100100
0 | IP
101-
0 | master
102101
0 | ModifyIndex
103102
0 | Roles
103+
0 | master
104104
0 | slave
105105
1 | 10.0.0.1
106106
1 | 10.0.0.2
107107
1 | 10.0.0.3
108+
1 | IP
109+
1 | ModifyIndex
110+
1 | Roles
108111
1 | aaa
109112
1 | array
110113
1 | dummy
111-
1 | IP
112114
1 | master
113-
1 | ModifyIndex
114-
1 | Roles
115115
1 | slave
116116
1 | some
117117
(17 rows)

‎sql/zson.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ INSERT INTO nocompress VALUES
2525

2626
SELECT zson_learn('{{"nocompress", "x"}}');
2727

28-
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word;
28+
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word COLLATE"C";
2929

3030
SELECT zson_learn('{{"nocompress", "x"}}',10000,1,128,1);
3131

32-
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word;
32+
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word COLLATE"C";
3333

3434
SELECT'{"aaa": "ololo"}'::zson;
3535

@@ -39,7 +39,7 @@ CREATE TABLE zson_test(x zson);
3939

4040
INSERT INTO zson_testVALUES('{"aaa":123}' :: jsonb);
4141

42-
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word;
42+
SELECT dict_id, wordFROM zson_dictORDER BY dict_id, word COLLATE"C";
4343

4444
SELECT x :: jsonbFROM zson_test;
4545

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp