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.

contrib/pg_tde/t/001_basic.pl

@@ -17,8 +17,7 @@ $node->start;
 PGTDE::psql($node, 'postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
 
 PGTDE::psql($node, 'postgres',
-	'SELECT extname, extversion FROM pg_extension WHERE extname = \'pg_tde\';'
-);
+	"SELECT extname, extversion FROM pg_extension WHERE extname = 'pg_tde';");
 
 PGTDE::psql($node, 'postgres',
 	'CREATE TABLE test_enc (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;'
@@ -37,14 +36,14 @@ PGTDE::psql($node, 'postgres',
 );
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc (k) VALUES ('foobar'), ('barfoo');");
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 # Verify that we can't see the data in the file
 my $tablefile = $node->data_dir . '/'

contrib/pg_tde/t/002_rotate_key.pl

@@ -42,12 +42,12 @@ PGTDE::psql($node, 'postgres',
 
 PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc (k) VALUES (5), (6);');
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 # Rotate key
 PGTDE::psql($node, 'postgres',
 	"SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');");
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
@@ -58,13 +58,13 @@ PGTDE::psql($node, 'postgres',
 PGTDE::psql($node, 'postgres',
 	"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 # Again rotate key
 PGTDE::psql($node, 'postgres',
 	"SELECT pg_tde_set_key_using_database_key_provider('rotated-key2', 'file-2');"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
@@ -75,13 +75,13 @@ PGTDE::psql($node, 'postgres',
 PGTDE::psql($node, 'postgres',
 	"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 # Again rotate key
 PGTDE::psql($node, 'postgres',
 	"SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
@@ -92,7 +92,7 @@ PGTDE::psql($node, 'postgres',
 PGTDE::psql($node, 'postgres',
 	"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 # TODO: add method to query current info
 # And maybe debug tools to show what's in a file keyring?
@@ -101,7 +101,7 @@ PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
 PGTDE::psql($node, 'postgres',
 	"SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false);"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
@@ -112,10 +112,10 @@ PGTDE::psql($node, 'postgres',
 PGTDE::psql($node, 'postgres',
 	"SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();"
 );
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc ORDER BY id;');
 
 PGTDE::psql($node, 'postgres',
-	'ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;');
+	'ALTER SYSTEM SET pg_tde.inherit_global_providers = off;');
 
 # Things still work after a restart
 PGTDE::append_to_result_file("-- server restart");

contrib/pg_tde/t/003_remote_config.pl

@@ -72,12 +72,12 @@ PGTDE::psql($node, 'postgres',
 
 PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5), (6);');
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
 
 PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc2;');
 

contrib/pg_tde/t/004_file_config.pl

@@ -33,12 +33,12 @@ PGTDE::psql($node, 'postgres',
 
 PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc1 (k) VALUES (5), (6);');
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id;');
 
 PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc1;');
 

contrib/pg_tde/t/005_multiple_extensions.pl

@@ -140,7 +140,7 @@ PGTDE::append_to_result_file($stdout);
 
 $stdout = $node->safe_psql(
 	'postgres',
-	'SELECT * FROM test_enc1 ORDER BY id ASC;',
+	'SELECT * FROM test_enc1 ORDER BY id;',
 	extra_params => ['-a']);
 PGTDE::append_to_result_file($stdout);
 
@@ -149,7 +149,7 @@ $node->restart;
 
 $stdout = $node->safe_psql(
 	'postgres',
-	'SELECT * FROM test_enc1 ORDER BY id ASC;',
+	'SELECT * FROM test_enc1 ORDER BY id;',
 	extra_params => ['-a']);
 PGTDE::append_to_result_file($stdout);
 

contrib/pg_tde/t/006_remote_vault_config.pl

@@ -81,12 +81,12 @@ PGTDE::psql($node, 'postgres',
 
 PGTDE::psql($node, 'postgres', 'INSERT INTO test_enc2 (k) VALUES (5), (6);');
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
 
 PGTDE::psql($node, 'postgres', 'DROP TABLE test_enc2;');
 

contrib/pg_tde/t/007_tde_heap.pl

@@ -30,9 +30,9 @@ PGTDE::psql($node, 'postgres',
 );
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc1 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc1 (k) VALUES ('foobar'), ('barfoo');");
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc1 ORDER BY id;');
 
 ######################### test_enc2 (create heap + alter to tde_heap)
 
@@ -40,12 +40,12 @@ PGTDE::psql($node, 'postgres',
 	'CREATE TABLE test_enc2 (id SERIAL, k VARCHAR(32), PRIMARY KEY (id));');
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc2 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc2 (k) VALUES ('foobar'), ('barfoo');");
 
 PGTDE::psql($node, 'postgres',
 	'ALTER TABLE test_enc2 SET ACCESS METHOD tde_heap;');
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc2 ORDER BY id;');
 
 ######################### test_enc3 (default_table_access_method)
 
@@ -54,9 +54,9 @@ PGTDE::psql($node, 'postgres',
 );
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc3 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc3 (k) VALUES ('foobar'), ('barfoo');");
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc3 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc3 ORDER BY id;');
 
 ######################### test_enc4 (create heap + alter default)
 
@@ -65,13 +65,13 @@ PGTDE::psql($node, 'postgres',
 );
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc4 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc4 (k) VALUES ('foobar'), ('barfoo');");
 
 PGTDE::psql($node, 'postgres',
 	'SET default_table_access_method = "tde_heap"; ALTER TABLE test_enc4 SET ACCESS METHOD DEFAULT;'
 );
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc4 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc4 ORDER BY id;');
 
 ######################### test_enc5 (create tde_heap + truncate)
 
@@ -80,16 +80,16 @@ PGTDE::psql($node, 'postgres',
 );
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc5 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc5 (k) VALUES ('foobar'), ('barfoo');");
 
 PGTDE::psql($node, 'postgres', 'CHECKPOINT;');
 
 PGTDE::psql($node, 'postgres', 'TRUNCATE test_enc5;');
 
 PGTDE::psql($node, 'postgres',
-	'INSERT INTO test_enc5 (k) VALUES (\'foobar\'),(\'barfoo\');');
+	"INSERT INTO test_enc5 (k) VALUES ('foobar'), ('barfoo');");
 
-PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc5 ORDER BY id ASC;');
+PGTDE::psql($node, 'postgres', 'SELECT * FROM test_enc5 ORDER BY id;');
 
 PGTDE::append_to_result_file("-- server restart");
 $node->restart;
@@ -103,10 +103,10 @@ sub verify_table
 	my $tablefile =
 	  $node->data_dir . '/'
 	  . $node->safe_psql('postgres',
-		'SELECT pg_relation_filepath(\'' . $table . '\');');
+		"SELECT pg_relation_filepath('" . $table . "');");
 
 	PGTDE::psql($node, 'postgres',
-		'SELECT * FROM ' . $table . ' ORDER BY id ASC;');
+		'SELECT * FROM ' . $table . ' ORDER BY id;');
 
 	PGTDE::append_to_result_file('TABLEFILE FOR '
 		  . $table

contrib/pg_tde/t/expected/001_basic.out

@@ -22,7 +22,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
 
 CREATE TABLE test_enc (id SERIAL, k VARCHAR(32), PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc (k) VALUES ('foobar'), ('barfoo');
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -30,7 +30,7 @@ SELECT * FROM test_enc ORDER BY id ASC;
 (2 rows)
 
 -- server restart
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar

contrib/pg_tde/t/expected/002_rotate_key.out

@@ -38,7 +38,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
 
 CREATE TABLE test_enc (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc (k) VALUES (5), (6);
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -51,7 +51,7 @@ SELECT pg_tde_set_key_using_database_key_provider('rotated-key1');
  
 (1 row)
 
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -68,7 +68,7 @@ SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
 SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
 psql:<stdin>:1: ERROR:  Principal key does not exists for the database
 HINT:  Use set_key interface to set the principal key
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -81,7 +81,7 @@ SELECT pg_tde_set_key_using_database_key_provider('rotated-key2','file-2');
  
 (1 row)
 
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -98,7 +98,7 @@ SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
 SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
 psql:<stdin>:1: ERROR:  Principal key does not exists for the database
 HINT:  Use set_key interface to set the principal key
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -111,7 +111,7 @@ SELECT pg_tde_set_key_using_global_key_provider('rotated-key', 'file-3', false);
  
 (1 row)
 
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -128,7 +128,7 @@ SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
 SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
 psql:<stdin>:1: ERROR:  Principal key does not exists for the database
 HINT:  Use set_key interface to set the principal key
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -141,7 +141,7 @@ SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX', 'file-2', false)
  
 (1 row)
 
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -158,14 +158,14 @@ SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_key_info();
 SELECT key_provider_id, key_provider_name, key_name FROM pg_tde_server_key_info();
 psql:<stdin>:1: ERROR:  Principal key does not exists for the database
 HINT:  Use set_key interface to set the principal key
-SELECT * FROM test_enc ORDER BY id ASC;
+SELECT * FROM test_enc ORDER BY id;
  id | k 
 ----+---
   1 | 5
   2 | 6
 (2 rows)
 
-ALTER SYSTEM SET pg_tde.inherit_global_providers = OFF;
+ALTER SYSTEM SET pg_tde.inherit_global_providers = off;
 -- server restart
 SELECT pg_tde_set_key_using_global_key_provider('rotated-keyX2', 'file-2', false);
 psql:<stdin>:1: ERROR:  Usage of global key providers is disabled. Enable it with pg_tde.inherit_global_providers = ON

contrib/pg_tde/t/expected/003_remote_config.out

@@ -13,7 +13,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider')
 
 CREATE TABLE test_enc2 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc2 (k) VALUES (5), (6);
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -21,7 +21,7 @@ SELECT * FROM test_enc2 ORDER BY id ASC;
 (2 rows)
 
 -- server restart
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id | k 
 ----+---
   1 | 5

contrib/pg_tde/t/expected/004_file_config.out

@@ -13,7 +13,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-provider')
 
 CREATE TABLE test_enc1 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc1 (k) VALUES (5), (6);
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -21,7 +21,7 @@ SELECT * FROM test_enc1 ORDER BY id ASC;
 (2 rows)
 
 -- server restart
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
  id | k 
 ----+---
   1 | 5

contrib/pg_tde/t/expected/005_multiple_extensions.out

@@ -1,11 +1,11 @@
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 CREATE TABLE test_enc1 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc1 (k) VALUES (5), (6);
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
 1|5
 2|6
 -- server restart
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
 1|5
 2|6
 DROP TABLE test_enc1;

contrib/pg_tde/t/expected/006_remote_vault_config.out

@@ -13,7 +13,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','vault-provider'
 
 CREATE TABLE test_enc2 (id SERIAL, k INTEGER, PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc2 (k) VALUES (5), (6);
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id | k 
 ----+---
   1 | 5
@@ -21,7 +21,7 @@ SELECT * FROM test_enc2 ORDER BY id ASC;
 (2 rows)
 
 -- server restart
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id | k 
 ----+---
   1 | 5

contrib/pg_tde/t/expected/007_tde_heap.out

@@ -13,7 +13,7 @@ SELECT pg_tde_set_key_using_database_key_provider('test-db-key','file-vault');
 
 CREATE TABLE test_enc1 (id SERIAL, k VARCHAR(32), PRIMARY KEY (id)) USING tde_heap;
 INSERT INTO test_enc1 (k) VALUES ('foobar'), ('barfoo');
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -23,7 +23,7 @@ SELECT * FROM test_enc1 ORDER BY id ASC;
 CREATE TABLE test_enc2 (id SERIAL, k VARCHAR(32), PRIMARY KEY (id));
 INSERT INTO test_enc2 (k) VALUES ('foobar'), ('barfoo');
 ALTER TABLE test_enc2 SET ACCESS METHOD tde_heap;
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -32,7 +32,7 @@ SELECT * FROM test_enc2 ORDER BY id ASC;
 
 SET default_table_access_method = "tde_heap"; CREATE TABLE test_enc3 (id SERIAL, k VARCHAR(32), PRIMARY KEY (id));
 INSERT INTO test_enc3 (k) VALUES ('foobar'), ('barfoo');
-SELECT * FROM test_enc3 ORDER BY id ASC;
+SELECT * FROM test_enc3 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -42,7 +42,7 @@ SELECT * FROM test_enc3 ORDER BY id ASC;
 CREATE TABLE test_enc4 (id SERIAL, k VARCHAR(32), PRIMARY KEY (id)) USING heap;
 INSERT INTO test_enc4 (k) VALUES ('foobar'), ('barfoo');
 SET default_table_access_method = "tde_heap"; ALTER TABLE test_enc4 SET ACCESS METHOD DEFAULT;
-SELECT * FROM test_enc4 ORDER BY id ASC;
+SELECT * FROM test_enc4 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -54,7 +54,7 @@ INSERT INTO test_enc5 (k) VALUES ('foobar'),('barfoo');
 CHECKPOINT;
 TRUNCATE test_enc5;
 INSERT INTO test_enc5 (k) VALUES ('foobar'), ('barfoo');
-SELECT * FROM test_enc5 ORDER BY id ASC;
+SELECT * FROM test_enc5 ORDER BY id;
  id |   k    
 ----+--------
   3 | foobar
@@ -63,7 +63,7 @@ SELECT * FROM test_enc5 ORDER BY id ASC;
 
 -- server restart
 ###########################
-SELECT * FROM test_enc1 ORDER BY id ASC;
+SELECT * FROM test_enc1 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -73,7 +73,7 @@ SELECT * FROM test_enc1 ORDER BY id ASC;
 TABLEFILE FOR test_enc1 FOUND: yes
 CONTAINS FOO (should be empty): 
 ###########################
-SELECT * FROM test_enc2 ORDER BY id ASC;
+SELECT * FROM test_enc2 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -83,7 +83,7 @@ SELECT * FROM test_enc2 ORDER BY id ASC;
 TABLEFILE FOR test_enc2 FOUND: yes
 CONTAINS FOO (should be empty): 
 ###########################
-SELECT * FROM test_enc3 ORDER BY id ASC;
+SELECT * FROM test_enc3 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -93,7 +93,7 @@ SELECT * FROM test_enc3 ORDER BY id ASC;
 TABLEFILE FOR test_enc3 FOUND: yes
 CONTAINS FOO (should be empty): 
 ###########################
-SELECT * FROM test_enc4 ORDER BY id ASC;
+SELECT * FROM test_enc4 ORDER BY id;
  id |   k    
 ----+--------
   1 | foobar
@@ -103,7 +103,7 @@ SELECT * FROM test_enc4 ORDER BY id ASC;
 TABLEFILE FOR test_enc4 FOUND: yes
 CONTAINS FOO (should be empty): 
 ###########################
-SELECT * FROM test_enc5 ORDER BY id ASC;
+SELECT * FROM test_enc5 ORDER BY id;
  id |   k    
 ----+--------
   3 | foobar