aboutsummaryrefslogtreecommitdiff
path: root/ext/wasm/api/sqlite3-api-oo1.js
diff options
context:
space:
mode:
authorstephan <stephan@noemail.net>2022-11-24 02:35:03 +0000
committerstephan <stephan@noemail.net>2022-11-24 02:35:03 +0000
commitf46091d73fb059de729fe780a8d2eb4ff8056ddc (patch)
tree60b2138bdec1e0663a3a72d7820a0cb9a7d43405 /ext/wasm/api/sqlite3-api-oo1.js
parentf1ce4f40c7a01fd272662ab42d24b1f3ba747069 (diff)
downloadsqlite-f46091d73fb059de729fe780a8d2eb4ff8056ddc.tar.gz
sqlite-f46091d73fb059de729fe780a8d2eb4ff8056ddc.zip
Add sqlite3.oo1.DB.prototype.checkRc() and tests for both that method and its class-level counterpart.
FossilOrigin-Name: f7eaa6ba2147bfd6dbdc2444d0f919d846aa7f9b68cccab17ef585ffdacf3d60
Diffstat (limited to 'ext/wasm/api/sqlite3-api-oo1.js')
-rw-r--r--ext/wasm/api/sqlite3-api-oo1.js27
1 files changed, 19 insertions, 8 deletions
diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 02ce9c0ce..fc0f7372b 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -55,12 +55,13 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
if(sqliteResultCode){
if(dbPtr instanceof DB) dbPtr = dbPtr.pointer;
toss3(
- "sqlite result code",sqliteResultCode+":",
+ "sqlite3 result code",sqliteResultCode+":",
(dbPtr
? capi.sqlite3_errmsg(dbPtr)
: capi.sqlite3_errstr(sqliteResultCode))
);
}
+ return arguments[0];
};
/**
@@ -462,14 +463,16 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
Expects to be given a DB instance or an `sqlite3*` pointer (may
be null) and an sqlite3 API result code. If the result code is
not falsy, this function throws an SQLite3Error with an error
- message from sqlite3_errmsg(), using dbPtr as the db handle, or
- sqlite3_errstr() if dbPtr is falsy. Note that if it's passed a
- non-error code like SQLITE_ROW or SQLITE_DONE, it will still
- throw but the error string might be "Not an error." The various
- non-0 non-error codes need to be checked for in
- client code where they are expected.
+ message from sqlite3_errmsg(), using db (or, if db is-a DB,
+ db.pointer) as the db handle, or sqlite3_errstr() if db is
+ falsy. Note that if it's passed a non-error code like SQLITE_ROW
+ or SQLITE_DONE, it will still throw but the error string might be
+ "Not an error." The various non-0 non-error codes need to be
+ checked for in client code where they are expected.
+
+ If it does not throw, it returns its first argument.
*/
- DB.checkRc = checkSqlite3Rc;
+ DB.checkRc = (db,resultCode)=>checkSqlite3Rc(db,resultCode);
DB.prototype = {
/** Returns true if this db handle is open, else false. */
@@ -1130,6 +1133,14 @@ self.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
this.exec("ROLLBACK to SAVEPOINT oo1; RELEASE SAVEPOINT oo1");
throw e;
}
+ },
+
+ /**
+ A convenience form of DB.checkRc(this,resultCode). If it does
+ not throw, it returns this object.
+ */
+ checkRc: function(resultCode){
+ return DB.checkRc(this, resultCode);
}
}/*DB.prototype*/;