(docsrc) Multiple small changes (10)
(1) By brickviking on 2025-05-28 10:27:37 [source]
Some more trunk file patches for
- lang_returning.in,
- loadext.in,
- recovery.in,
- rescode.in,
- rowidtable.in and
- rowvalue.in.
As requested, these are all now in one block.
Index: pages/lang_returning.in
==================================================================
--- pages/lang_returning.in
+++ pages/lang_returning.in
@@ -111,5 +111,5 @@
those database changes. RETURNING clause outputs are all computed and
placed in temporary storage during the first call to sqlite3_step()
-but the specific order of when those output are computed and the
+but the specific order of when those outputs are computed and the
order in which database changes occur is unspecified. The order
can change from one query to the next.
@@ -116,5 +116,5 @@
<p>
-Hence if column of RETURNING output contains a
+Hence if a column of RETURNING output contains a
subquery that references the table being modified, then the result
of that subquery might depend on unspecified behavior and hence
Index: pages/loadext.in
==================================================================
--- pages/loadext.in
+++ pages/loadext.in
@@ -50,5 +50,5 @@
and the extension loader logic will attempt to figure out the entry point
on its own. It will first try the generic extension name
-"sqlite3_extension_init". If that does not work, it constructs a
+"sqlite3_extension_init". If that does not work, it constructs an
entry point using the template "sqlite3_X_init" where the X is replaced
by the lowercase equivalent of every ASCII character in the filename
@@ -146,6 +146,6 @@
<li><p>
-Add an extension loading entry point routine that looks like
-something the following:
+Add an extension loading entry point routine that looks something like
+the following:
<codeblock>
Index: pages/recovery.in
==================================================================
--- pages/recovery.in
+++ pages/recovery.in
@@ -6,5 +6,5 @@
<p>
-SQLite databases are remarkably rebust. Application faults and
+SQLite databases are remarkably robust. Application faults and
power failures typically leave the content of the database intact.
However, it is possible to [how to corrupt|corrupt an SQLite database].
@@ -166,5 +166,5 @@
</td><td>
This file implements two virtual tables name "sqlite_dbdata" and
-"sqlite_dbptr" that required by sqlite3recover.c.
+"sqlite_dbptr" that are required by sqlite3recover.c.
</td>
</tr>
@@ -173,5 +173,5 @@
<p>
-The two C source file above need to be linked into your application in the
+The two C source files above need to be linked into your application in the
same way as "sqlite3.c" is linked in. And the header file needs to be
accessible to the compiler when the C files are being compiled.
@@ -187,5 +187,5 @@
<p>These are the basic steps needed to recover content from a corrupt
-Database:
+database:
<ol>
Index: pages/rescode.in
==================================================================
--- pages/rescode.in
+++ pages/rescode.in
@@ -106,5 +106,5 @@
RESCODE SQLITE_ABORT 4 {
The SQLITE_ABORT result code indicates that an operation was aborted
- prior to completion, usually be application request.
+ prior to completion, usually by application request.
See also: [SQLITE_INTERRUPT].
<p>
@@ -231,5 +231,5 @@
abundance of primary disk space because the error occurs when writing
into [temporary disk files] on a system where temporary files are stored
- on a separate partition with much less space that the primary disk.
+ on a separate partition with much less space than the primary disk.
}
RESCODE SQLITE_CANTOPEN 14 {
@@ -266,5 +266,5 @@
[SQLITE_MAX_SCHEMA_RETRY] times (default: 50). The [sqlite3_step()]
interface will only return SQLITE_SCHEMA back to the application if
- the failure persists after these many retries.
+ the failure persists after this many retries.
}
RESCODE SQLITE_TOOBIG 18 {
@@ -279,5 +279,5 @@
The SQLITE_TOOBIG error code can also result when an oversized SQL
statement is passed into one of the [sqlite3_prepare_v2()] interfaces.
- The maximum length of an SQL statement defaults to a much smaller
+ The maximum length of an SQL statement defaults to a similar
value of 1,000,000,000 bytes. The maximum SQL statement length can be
set at compile-time using [SQLITE_MAX_SQL_LENGTH] or at run-time
@@ -383,5 +383,5 @@
of SQLITE_OK, then the extension remains loaded into the process address
space after the database connection closes. In other words, the
- xDlClose methods of the [sqlite3_vfs] object is not called for the
+ xDlClose method of the [sqlite3_vfs] object is not called for the
extension when the database connection closes.
<p>
@@ -398,5 +398,5 @@
for [SQLITE_IOERR] indicating an I/O error in the [VFS] layer
while trying to read from a file on disk. This error might result
- from a hardware malfunction or because a filesystem came unmounted
+ from a hardware malfunction or because a filesystem became unmounted
while the file was open.
}
@@ -411,5 +411,5 @@
for [SQLITE_IOERR] indicating an I/O error in the [VFS] layer
while trying to write into a file on disk. This error might result
- from a hardware malfunction or because a filesystem came unmounted
+ from a hardware malfunction or because a filesystem became unmounted
while the file was open. This error should not occur if the filesystem
is full as there is a separate error code (SQLITE_FULL) for that purpose.
@@ -446,5 +446,5 @@
The SQLITE_IOERR_UNLOCK error code is an [ext-v-prim|extended error code]
for [SQLITE_IOERR] indicating an I/O error
- within xUnlock method on the [sqlite3_io_methods] object.
+ within the xUnlock method on the [sqlite3_io_methods] object.
}
RESCODE SQLITE_IOERR_RDLOCK {SQLITE_IOERR | (9<<8)} {
@@ -451,5 +451,5 @@
The SQLITE_IOERR_RDLOCK error code is an [ext-v-prim|extended error code]
for [SQLITE_IOERR] indicating an I/O error
- within xLock method on the [sqlite3_io_methods] object while trying
+ within the xLock method on the [sqlite3_io_methods] object while trying
to obtain a read lock.
}
@@ -457,5 +457,5 @@
The SQLITE_IOERR_DELETE error code is an [ext-v-prim|extended error code]
for [SQLITE_IOERR] indicating an I/O error
- within xDelete method on the [sqlite3_vfs] object.
+ within the xDelete method on the [sqlite3_vfs] object.
}
RESCODE SQLITE_IOERR_BLOCKED {SQLITE_IOERR | (11<<8)} {
@@ -561,5 +561,5 @@
RESCODE SQLITE_IOERR_BEGIN_ATOMIC {SQLITE_IOERR | (29<<8)} {
The SQLITE_IOERR_BEGIN_ATOMIC error code indicates that the
- underlying operating system reported and error on the
+ underlying operating system reported an error on the
[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] file-control. This only comes
up when [SQLITE_ENABLE_ATOMIC_WRITE] is enabled and the database
@@ -568,5 +568,5 @@
RESCODE SQLITE_IOERR_COMMIT_ATOMIC {SQLITE_IOERR | (30<<8)} {
The SQLITE_IOERR_COMMIT_ATOMIC error code indicates that the
- underlying operating system reported and error on the
+ underlying operating system reported an error on the
[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] file-control. This only comes
up when [SQLITE_ENABLE_ATOMIC_WRITE] is enabled and the database
@@ -575,5 +575,5 @@
RESCODE SQLITE_IOERR_ROLLBACK_ATOMIC {SQLITE_IOERR | (31<<8)} {
The SQLITE_IOERR_ROLLBACK_ATOMIC error code indicates that the
- underlying operating system reported and error on the
+ underlying operating system reported an error on the
[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] file-control. This only comes
up when [SQLITE_ENABLE_ATOMIC_WRITE] is enabled and the database
@@ -582,5 +582,5 @@
RESCODE SQLITE_IOERR_DATA {SQLITE_IOERR | (32<<8)} {
The SQLITE_IOERR_DATA error code is an [ext-v-prim|extended error code]
- for [SQLITE_IOERR] used only by [checksum VFS shim] to indicate that
+ for [SQLITE_IOERR] used only by the [checksum VFS shim] to indicate that
the checksum on a page of the database file is incorrect.
}
@@ -630,5 +630,5 @@
<ol>
<li> Process A starts a read transaction on the database and does one
- or more SELECT statement. Process A keeps the transaction open.
+ or more SELECT statements. Process A keeps the transaction open.
<li> Process B updates the database, changing values previous read by
process A.
@@ -644,5 +644,5 @@
Blocking Posix advisory locks are only
available as a proprietary SQLite extension and even then are only
- supported if SQLite is compiled with the SQLITE_EANBLE_SETLK_TIMEOUT
+ supported if SQLite is compiled with the SQLITE_ENABLE_SETLK_TIMEOUT
compile-time option.
}
@@ -782,5 +782,5 @@
is an [ext-v-prim|extended error code]
for [SQLITE_CONSTRAINT] indicating that an [UPDATE trigger] attempted
- do delete the row that was being updated in the middle of the update.
+ to delete the row that was being updated in the middle of the update.
}
RESCODE SQLITE_CONSTRAINT_DATATYPE {SQLITE_CONSTRAINT |(12<<8)} {
Index: pages/rowidtable.in
==================================================================
--- pages/rowidtable.in
+++ pages/rowidtable.in
@@ -44,5 +44,5 @@
The [rowid] of a rowid table can be accessed (or changed) by reading or
writing to any of the "rowid" or "oid" or "_rowid_" columns. Except,
-if there is a declared columns in the table that use those
+if there are declared columns in the table that use any of those
special names, then those names refer to the declared columns, not to
the underlying [rowid].
Index: pages/rowvalue.in
==================================================================
--- pages/rowvalue.in
+++ pages/rowvalue.in
@@ -42,5 +42,5 @@
<p>Two row values are compared by looking at the constituent scalar
values from left to right.
-A NULL means of "unknown".
+A NULL means "unknown".
The overall result of comparison is NULL if it is possible to make the
result either true or false by substituting alternative values in place
@@ -64,8 +64,8 @@
true if we replaced NULL→2 or false if we replaced NULL→9.
The result of "(1,2,3)=(1,NULL,4)" is not NULL because there is no
-substitutions of the constituent NULL that will make the expression true,
+substitution of the constituent NULL that will make the expression true,
since 3 will never equal 4 in the third column.
-<p>Any of the row values in the previous example could be replace by a
+<p>Any of the row values in the previous example could be replaced by a
subquery that returns three columns and the same answer would result.
For example:
@@ -113,5 +113,5 @@
<p>Suppose an application wants to display a list of contacts
in alphabetical order by lastname, firstname, in a scrolling window
-that can only show 7 contacts at a time. Initialize the scrolling
+that can only show 7 contacts at a time. Initializing the scrolling
window to the first 7 entries is easy:
@@ -159,5 +159,5 @@
<p>The usual way of storing a date in a database table is as a single
field, as either a unix timestamp, a julian day number, or an ISO-8601
-dates string. But some application store dates as three separate
+dates string. But some applications store dates as three separate
fields for the year, month, and day.
@@ -219,5 +219,5 @@
<p>This later query generates exactly the same [bytecode] as the previous
-scalar formulation, but using syntax that it cleaner and
+scalar formulation, but using syntax that is cleaner and
easier to read.
Thanks again.
Have a happy day, RTDoc brickviking
('73s)
(2) By Stephan Beal (stephan) on 2025-05-28 13:30:26 in reply to 1 [link] [source]
As requested, these are all now in one block.
Thank you, that's much easier to work with :). These are now also applied.