8000 Slightly improve readability of queries in TAP tests · percona/postgres@1a8326e · GitHub
[go: up one dir, main page]
Skip to content

Commit 1a8326e

Browse files
jeltzjeltz
committed
Slightly improve readability of queries in TAP tests
Mostly about making the whitespace consistent but also changes some quoting and removes ASC in order by.
1 parent f926800 commit 1a8326e

20 files changed

+158
-159
lines changed

‎contrib/pg_tde/t/001_basic.pl

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,33 @@
1717
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
1818

1919
PGTDE::psql($node, 'postgres',
20-
'SELECT extname, extversion FROM pg_extension WHERE extname = \'pg_tde\';'
21-
);
20+
"SELECT extname, extversion FROM pg_extension WHERE extname = 'pg_tde';");
2221

2322
PGTDE::psql($node, 'postgres',
24-
'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
23+
'CREATE TABLE test_enc (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
2524
);
2625

2726
PGTDE::psql($node, 'postgres',
28-
"SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');"
27+
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');"
2928
);
3029

3130
PGTDE::psql($node, 'postgres',
32-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');"
31+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');"
3332
);
3433

3534
PGTDE::psql($node, 'postgres',
36-
'CREATE TABLE test_enc(id SERIAL,k VARCHAR(32),PRIMARY KEY (id)) USING tde_heap;'
35+
'CREATE TABLE test_enc (id SERIAL, k VARCHAR(32), PRIMARY KEY (id)) USING tde_heap;'
3736
);
3837

3938
PGTDE::psql($node, 'postgres',
40-
'INSERT INTO test_enc (k) VALUES (\'foobar\'),(\'barfoo\');');
39+
"INSERT INTO test_enc (k) VALUES ('foobar'), ('barfoo');");
4140

42-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
41+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
4342

4443
PGTDE::append_to_result_file("-- server restart");
4544
$node->restart;
4645

47-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
46+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
4847

4948
# Verify that we can't see the data in the file
5049
my $tablefile = $node->data_dir . '/'

‎contrib/pg_tde/t/002_rotate_key.pl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,37 @@
1717
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
1818

1919
PGTDE::psql($node, 'postgres',
20-
"SELECT pg_tde_add_database_key_provider_file('file-vault','/tmp/pg_tde_test_keyring.per');"
20+
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/pg_tde_test_keyring.per');"
2121
);
2222
PGTDE::psql($node, 'postgres',
23-
"SELECT pg_tde_add_database_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2.per');"
23+
"SELECT pg_tde_add_database_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2.per');"
2424
);
2525
PGTDE::psql($node, 'postgres',
26-
"SELECT pg_tde_add_global_key_provider_file('file-2','/tmp/pg_tde_test_keyring_2g.per');"
26+
"SELECT pg_tde_add_global_key_provider_file('file-2', '/tmp/pg_tde_test_keyring_2g.per');"
2727
);
2828
PGTDE::psql($node, 'postgres',
29-
"SELECT pg_tde_add_global_key_provider_file('file-3','/tmp/pg_tde_test_keyring_3.per');"
29+
"SELECT pg_tde_add_global_key_provider_file('file-3', '/tmp/pg_tde_test_keyring_3.per');"
3030
);
3131

3232
PGTDE::psql($node, 'postgres',
3333
"SELECT pg_tde_list_all_database_key_providers();");
3434

3535
PGTDE::psql($node, 'postgres',
36-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');"
36+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-vault');"
3737
);
3838

3939
PGTDE::psql($node, 'postgres',
40-
'CREATE TABLE test_enc(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
40+
'CREATE TABLE test_enc (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
4141
);
4242

43-
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc (k) VALUES (5),(6);');
43+
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc (k) VALUES (5), (6);');
4444

45-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
45+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
4646

4747
# Rotate key
4848
PGTDE::psql($node, 'postgres',
4949
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');");
50-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
50+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
5151

5252
PGTDE::append_to_result_file("-- server restart");
5353
$node->restart;
@@ -58,13 +58,13 @@
5858
PGTDE::psql($node, 'postgres',
5959
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
6060
);
61-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
61+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
6262

6363
# Again rotate key
6464
PGTDE::psql($node, 'postgres',
65-
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');"
65+
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2', 'file-2');"
6666
);
67-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
67+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
6868

6969
PGTDE::append_to_result_file("-- server restart");
7070
$node->restart;
@@ -75,13 +75,13 @@
7575
PGTDE::psql($node, 'postgres',
7676
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
7777
);
78-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
78+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
7979

8080
# Again rotate key
8181
PGTDE::psql($node, 'postgres',
8282
"SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);"
8383
);
84-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
84+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
8585

8686
PGTDE::append_to_result_file("-- server restart");
8787
$node->restart;
@@ -92,7 +92,7 @@
9292
PGTDE::psql($node, 'postgres',
9393
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
9494
);
95-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
95+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
9696

9797
# TODO: add method to query current info
9898
# And maybe debug tools to show what's in a file keyring?
@@ -101,7 +101,7 @@
101101
PGTDE::psql($node, 'postgres',
102102
"SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false);"
103103
);
104-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
104+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
105105

106106
PGTDE::append_to_result_file("-- server restart");
107107
$node->restart;
@@ -112,10 +112,10 @@
112112
PGTDE::psql($node, 'postgres',
113113
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
114114
);
115-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
115+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
116116

117117
PGTDE::psql($node, 'postgres',
118-
'ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;');
118+
'ALTER SYSTEM SET pg_tde.inherit_global_providers = off;');
119119

120120
# Things still work after a restart
121121
PGTDE::append_to_result_file("-- server restart");
@@ -133,7 +133,7 @@
133133
);
134134

135135
PGTDE::psql($node, 'postgres',
136-
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');"
136+
"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2', 'file-2');"
137137
);
138138
PGTDE::psql($node, 'postgres',
139139
"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();"

‎contrib/pg_tde/t/003_remote_config.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@
6060
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
6161

6262
PGTDE::psql($node, 'postgres',
63-
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8888/hello' ));"
63+
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object('type' VALUE 'remote', 'url' VALUE 'http://localhost:8888/hello'));"
6464
);
6565
PGTDE::psql($node, 'postgres',
66-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');"
66+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-provider');"
6767
);
6868

6969
PGTDE::psql($node, 'postgres',
70-
'CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
70+
'CREATE TABLE test_enc2 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
7171
);
7272

73-
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5),(6);');
73+
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5), (6);');
7474

75-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
75+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
7676

7777
PGTDE::append_to_result_file("-- server restart");
7878
$node->restart;
7979

80-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
80+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
8181

8282
PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc2;');
8383

‎contrib/pg_tde/t/004_file_config.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2222

2323
PGTDE::psql($node, 'postgres',
24-
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'file', 'path' VALUE '/tmp/datafile-location' ));"
24+
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object('type' VALUE 'file', 'path' VALUE '/tmp/datafile-location'));"
2525
);
2626
PGTDE::psql($node, 'postgres',
27-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');"
27+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-provider');"
2828
);
2929

3030
PGTDE::psql($node, 'postgres',
31-
'CREATE TABLE test_enc1(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
31+
'CREATE TABLE test_enc1 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
3232
);
3333

34-
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc1 (k) VALUES (5),(6);');
34+
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc1 (k) VALUES (5), (6);');
3535

36-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id ASC;');
36+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id;');
3737

3838
PGTDE::append_to_result_file("-- server restart");
3939
$node->restart;
4040

41-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id ASC;');
41+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id;');
4242

4343
PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc1;');
4444

‎contrib/pg_tde/t/005_multiple_extensions.pl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,28 +119,28 @@
119119

120120
$node->psql(
121121
'postgres',
122-
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object( 'type' VALUE 'file', 'path' VALUE '/tmp/datafile-location' ));",
122+
"SELECT pg_tde_add_database_key_provider_file('file-provider', json_object('type' VALUE 'file', 'path' VALUE '/tmp/datafile-location'));",
123123
extra_params => ['-a']);
124124
$node->psql(
125125
'postgres',
126-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider');",
126+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'file-provider');",
127127
extra_params => ['-a']);
128128

129129
$stdout = $node->safe_psql(
130130
'postgres',
131-
'CREATE TABLE test_enc1(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;',
131+
'CREATE TABLE test_enc1 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;',
132132
extra_params => ['-a']);
133133
PGTDE::append_to_result_file($stdout);
134134

135135
$stdout = $node->safe_psql(
136136
'postgres',
137-
'INSERT INTO test_enc1 (k) VALUES (5),(6);',
137+
'INSERT INTO test_enc1 (k) VALUES (5), (6);',
138138
extra_params => ['-a']);
139139
PGTDE::append_to_result_file($stdout);
140140

141141
$stdout = $node->safe_psql(
142142
'postgres',
143-
'SELECT * FROM test_enc1 ORDER BY id ASC;',
143+
'SELECT * FROM test_enc1 ORDER BY id;',
144144
extra_params => ['-a']);
145145
PGTDE::append_to_result_file($stdout);
146146

@@ -149,7 +149,7 @@
149149

150150
$stdout = $node->safe_psql(
151151
'postgres',
152-
'SELECT * FROM test_enc1 ORDER BY id ASC;',
152+
'SELECT * FROM test_enc1 ORDER BY id;',
153153
extra_params => ['-a']);
154154
PGTDE::append_to_result_file($stdout);
155155

@@ -162,7 +162,7 @@
162162
# Print PGSM settings
163163
($cmdret, $stdout, $stderr) = $node->psql(
164164
'postgres',
165-
"SELECT name, setting, unit, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, pending_restart FROM pg_settings WHERE name='pg_stat_monitor.pgsm_query_shared_buffer';",
165+
"SELECT name, setting, unit, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, pending_restart FROM pg_settings WHERE name = 'pg_stat_monitor.pgsm_query_shared_buffer';",
166166
extra_params => [ '-a', '-Pformat=aligned', '-Ptuples_only=off' ]);
167167
ok($cmdret == 0, "Print PGTDE EXTENSION Settings");
168168
PGTDE::append_to_debug_file($stdout);
@@ -187,7 +187,7 @@
187187

188188
($cmdret, $stdout, $stderr) = $node->psql(
189189
'postgres',
190-
'SELECT datname, substr(query,0,150) AS query, SUM(calls) AS calls FROM pg_stat_monitor GROUP BY datname, query ORDER BY datname, query, calls;',
190+
'SELECT datname, substr(query, 0, 150) AS query, SUM(calls) AS calls FROM pg_stat_monitor GROUP BY datname, query ORDER BY datname, query, calls;',
191191
extra_params => [ '-a', '-Pformat=aligned', '-Ptuples_only=off' ]);
192192
ok($cmdret == 0, "SELECT XXX FROM pg_stat_monitor");
193193
PGTDE::append_to_debug_file($stdout);

‎contrib/pg_tde/t/006_remote_vault_config.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,24 @@
6969
PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
7070

7171
PGTDE::psql($node, 'postgres',
72-
"SELECT pg_tde_add_database_key_provider_vault_v2('vault-provider', json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/token' ), json_object( 'type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/url' ), to_json('secret'::text), NULL);"
72+
"SELECT pg_tde_add_database_key_provider_vault_v2('vault-provider', json_object('type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/token'), json_object('type' VALUE 'remote', 'url' VALUE 'http://localhost:8889/url'), to_json('secret'::text), NULL);"
7373
);
7474
PGTDE::psql($node, 'postgres',
75-
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key','vault-provider');"
75+
"SELECT pg_tde_set_key_using_database_key_provider('test-db-key', 'vault-provider');"
7676
);
7777

7878
PGTDE::psql($node, 'postgres',
79-
'CREATE TABLE test_enc2(id SERIAL,k INTEGER,PRIMARY KEY (id)) USING tde_heap;'
79+
'CREATE TABLE test_enc2 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
8080
);
8181

82-
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5),(6);');
82+
PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5), (6);');
8383

84-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
84+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
8585

8686
PGTDE::append_to_result_file("-- server restart");
8787
$node->restart;
8888

89-
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
89+
PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
9090

9191
PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc2;');
9292

0 commit comments

Comments
 (0)
0