Extend the refactoring into extensions. Clean up stray newlines.

FossilOrigin-Name: 7a876209a678a34c198b54ceef9e3c041f128a14dc73357f6a57cadadaa6cf7b

5 files changed, 5 insertions, 10 deletions

diff --git a/test/atrc.c b/test/atrc.c
index c6e4ce3d0..673f12cc4 100644
--- a/test/atrc.c
+++ b/test/atrc.c
@@ -75,7 +75,7 @@ int rename_all_tables(
   int cnt = 0;
 
   rc = sqlite3_prepare_v2(db,
-         "SELECT name FROM sqlite_master WHERE type='table'"
+         "SELECT name FROM sqlite_schema WHERE type='table'"
          " AND name NOT LIKE 'sqlite_%';",
          -1, &pStmt, 0);
   if( rc ) return rc;
diff --git a/test/dbfuzz2.c b/test/dbfuzz2.c
index 804222ce4..e35162937 100644
--- a/test/dbfuzz2.c
+++ b/test/dbfuzz2.c
@@ -54,7 +54,7 @@
 */
 static const char *azSql[] = {
   "PRAGMA integrity_check;",
-  "SELECT * FROM sqlite_master;",
+  "SELECT * FROM sqlite_schema;",
   "SELECT sum(length(name)) FROM dbstat;",
   "UPDATE t1 SET b=a, a=b WHERE a<b;",
   "ALTER TABLE t1 RENAME TO alkjalkjdfiiiwuer987lkjwer82mx97sf98788s9789s;",
diff --git a/test/kvtest.c b/test/kvtest.c
index 8c73caf1d..04dc01045 100644
--- a/test/kvtest.c
+++ b/test/kvtest.c
@@ -907,7 +907,7 @@ static int runMain(int argc, char **argv){
   if( eType==PATH_DB ){
     /* Recover any prior crashes prior to starting the timer */
     sqlite3_open(zDb, &db);
-    sqlite3_exec(db, "SELECT rowid FROM sqlite_master LIMIT 1", 0, 0, 0);
+    sqlite3_exec(db, "SELECT rowid FROM sqlite_schema LIMIT 1", 0, 0, 0);
     sqlite3_close(db);
     db = 0;
   }
diff --git a/test/optfuzz-db01.c b/test/optfuzz-db01.c
index 1cd3867e1..e11f15cc2 100644
--- a/test/optfuzz-db01.c
+++ b/test/optfuzz-db01.c
@@ -945,4 +945,3 @@ unsigned char data001[] = {
   78, 32,116, 49, 32, 79, 78, 32, 40,116, 49, 46, 97, 61, 53, 48, 45, 99, 48,
   46,120, 41,
 };
-
diff --git a/test/tt3_stress.c b/test/tt3_stress.c
index cdfab9c09..be917b732 100644
--- a/test/tt3_stress.c
+++ b/test/tt3_stress.c
@@ -41,7 +41,7 @@ static char *stress_thread_2(int iTid, void *pArg){
   Sqlite db = {0};                /* SQLite database connection */
   while( !timetostop(&err) ){
     opendb(&err, &db, "test.db", 0);
-    sql_script(&err, &db, "SELECT * FROM sqlite_master;");
+    sql_script(&err, &db, "SELECT * FROM sqlite_schema;");
     clear_error(&err, SQLITE_LOCKED);
     closedb(&err, &db);
   }
@@ -266,7 +266,7 @@ static char *stress2_workload19(int iTid, void *pArg){
   const char *zDb = (const char*)pArg;
   while( !timetostop(&err) ){
     opendb(&err, &db, zDb, 0);
-    sql_script(&err, &db, "SELECT * FROM sqlite_master;");
+    sql_script(&err, &db, "SELECT * FROM sqlite_schema;");
     clear_error(&err, SQLITE_LOCKED);
     closedb(&err, &db);
   }
@@ -362,7 +362,3 @@ static void stress2(int nMs){
   sqlite3_enable_shared_cache(0);
   print_and_free_err(&err);
 }
-
-
-
-