Rename method from PrepareSql to PreparedSql

This name change is motivated to prevent misunderstandings: the callback
is not meant to output a prepared SQL statement. Rather, the callback is
being informed of the SQL statement prepared by SQLite.

Author: lucasvr

src/sqlite.h.in

@@ -7078,7 +7078,7 @@ struct sqlite3_module {
   int (*xShadowName)(const char*);
   /* The methods below relate to features contributed by the community and
   ** are available for version 700 and greater. */
-  int (*xPrepareSql)(sqlite3_vtab_cursor*, const char*);
+  int (*xPreparedSql)(sqlite3_vtab_cursor*, const char*);
 };
 
 /*

src/test8.c

@@ -1298,7 +1298,7 @@ static int echoShadowName(const char *name){
   return SQLITE_OK;
 }
 
-static int echoPrepareSql(sqlite3_vtab_cursor *cur, const char *sql){
+static int echoPreparedSql(sqlite3_vtab_cursor *cur, const char *sql){
   assert( cur );
   assert( sql );
   return SQLITE_OK;
@@ -1356,7 +1356,7 @@ static sqlite3_module echoModuleV2 = {
   echoRelease,
   echoRollbackTo,
   echoShadowName,
-  echoPrepareSql,
+  echoPreparedSql,
 };
 
 /*

src/vdbe.c

@@ -8073,15 +8073,15 @@ case OP_VInitIn: {        /* out2 */
 #endif /* SQLITE_OMIT_VIRTUALTABLE */
 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-/* Opcode: VPrepareSql P1 * * * *
+/* Opcode: VPreparedSql P1 * * * *
 **
 ** P1 is a cursor opened using VOpen.
 **
-** This opcode invokes the xPrepareSql method on the virtual table specified
-** by P1. The SQL text parameter to xPrepareSql is obtained from Vdbe* `p`.
+** This opcode invokes the xPreparedSql method on the virtual table specified
+** by P1. The SQL text parameter to xPreparedSql is obtained from Vdbe* `p`.
 **
 */
-case OP_VPrepareSql: {
+case OP_VPreparedSql: {
   const sqlite3_module *pModule;
   sqlite3_vtab_cursor *pVCur;
   sqlite3_vtab *pVtab;
@@ -8094,10 +8094,10 @@ case OP_VPrepareSql: {
   pVtab = pVCur->pVtab;
   pModule = pVtab->pModule;
 
-  /* Invoke the xPrepareSql method */
+  /* Invoke the xPreparedSql method */
    if( pModule->iVersion>=700 ){
-    if( pModule->xPrepareSql && p->zSql ){
-      rc = pModule->xPrepareSql(pVCur, p->zSql);
+    if( pModule->xPreparedSql && p->zSql ){
+      rc = pModule->xPreparedSql(pVCur, p->zSql);
       if( rc ) goto abort_due_to_error;
     }
   }

src/wherecode.c

@@ -1415,7 +1415,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     int addrNotFound;
     int nConstraint = pLoop->nLTerm;
 
-    sqlite3VdbeAddOp1(v, OP_VPrepareSql, iCur);
+    sqlite3VdbeAddOp1(v, OP_VPreparedSql, iCur);
 
     iReg = sqlite3GetTempRange(pParse, nConstraint+2);
     addrNotFound = pLevel->addrBrk;

test/rowvaluevtab.test

@@ -96,9 +96,9 @@ do_vfilter4_test 1.4f {
   SELECT a FROM e1 WHERE (b, c) IN ( VALUES(2, 2) )
 } {{SELECT rowid, a, b, c FROM 't1' WHERE b = ?}}
 
-######################################################################
-# Test echo_v2. We simply want to ensure that OP_VPrepareSql executes
-######################################################################
+#######################################################################
+# Test echo_v2. We simply want to ensure that OP_VPreparedSql executes
+#######################################################################
 
 do_execsql_test 2.0 {
   CREATE TABLE t2(a, b, c);
@@ -113,10 +113,10 @@ do_execsql_test 2.0 {
   CREATE VIRTUAL TABLE e2 USING echo_v2(t2);
 }
 
-proc do_vpreparesql1_test {tn sql expected} {
+proc do_vpreparedsql1_test {tn sql expected} {
   set rc -1
   db eval "explain $sql" {
-    if {$opcode=="VPrepareSql"} {
+    if {$opcode=="VPreparedSql"} {
       set rc 0
     }
   }
@@ -128,7 +128,7 @@ proc do_vpreparesql1_test {tn sql expected} {
 do_execsql_test 2.1 {
   SELECT a FROM e2 WHERE (b, c) IN ( VALUES(1, 3) )
 } {three}
-do_vpreparesql1_test 2.1f {
+do_vpreparedsql1_test 2.1f {
   SELECT a FROM e2 WHERE (b, c) IN ( VALUES(2, 2) )
 } {0}