Skip to content

[WIP] gh-81040: use sqlite3_stmt_readonly() to detect DML statements #24492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erlend-aasland wants to merge 15 commits into from
Closed

[WIP] gh-81040: use sqlite3_stmt_readonly() to detect DML statements #24492

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
11e9829
Use sqlite3_stmt_readonly API to determine is statement is DML.
coleifer May 9, 2019
29a7e20
Skip dml detection + sql comment for old sqlite.
coleifer May 9, 2019
f20d41b
Add news item.
coleifer May 9, 2019
868b97a
Address review comments, additional regression test.
coleifer May 9, 2019
a13fb71
Fix rest markup
berkerpeksag May 9, 2019
6e1cf06
cosmetic fixes
berkerpeksag May 9, 2019
013e43b
Ensure all non-DML statements that write are covered.
coleifer May 9, 2019
6e6f2a0
Move DML detection tests into transactions test module.
coleifer May 10, 2019
09cac6c
Fix version-check for sqlite3_stmt_readonly availability.
coleifer May 11, 2019
d1efa55
Sync with GH-24106
Feb 9, 2021
3645ccc
Merge branch 'main' into bpo-36859
Jun 5, 2021
dce7ada
PEP 7
Jun 5, 2021
7c01d5a
Merge branch 'main' into bpo-36859
Jun 8, 2021
6eb6ec9
Improve namespace
Jun 8, 2021
1bdefdd
Merge branch 'main' into bpo-36859
Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Sync with GH-24106
  • Loading branch information
Erlend E. Aasland committed Mar 2, 2021
commit d1efa55e0b8630715219161b627f6f928f635da5
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Library/2019-05-09-09-54-00.bpo-36859.CuCkEd.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Use ``sqlite3_stmt_readonly()`` internally to determine if a SQL statement is
data-modifying. Requires sqlite3 3.7.11 or newer. Patch by Charles Leifer.
data-modifying. Patch by Charles Leifer.
25 changes: 0 additions & 25 deletions Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@
#include "prepare_protocol.h"
#include "util.h"

#if SQLITE_VERSION_NUMBER >= 3007004
#define HAVE_SQLITE3_STMT_READONLY
#endif

/* prototypes */
static int pysqlite_check_remaining_sql(const char* tail);

Expand All @@ -57,7 +53,6 @@ static int pysqlite_statement_is_dml(sqlite3_stmt *statement, const char *sql)
const char* p;
int is_dml = 0;

#ifdef HAVE_SQLITE3_STMT_READONLY
is_dml = !sqlite3_stmt_readonly(statement);
if (is_dml) {
/* Retain backwards-compatibility, as sqlite3_stmt_readonly will return
Expand All @@ -81,26 +76,6 @@ static int pysqlite_statement_is_dml(sqlite3_stmt *statement, const char *sql)
break;
}
}
#else
/* Determine if the statement is a DML statement. SELECT is the only
* exception. This is a fallback for older versions of SQLite which do not
* support the sqlite3_stmt_readonly() API. */
for (p = sql; *p != 0; p++) {
switch (*p) {
case ' ':
case '\r':
case '\n':
case '\t':
continue;
}

is_dml = (PyOS_strnicmp(p, "insert", 6) == 0)
|| (PyOS_strnicmp(p, "update", 6) == 0)
|| (PyOS_strnicmp(p, "delete", 6) == 0)
|| (PyOS_strnicmp(p, "replace", 7) == 0);
break;
}
#endif
return is_dml;
}

Expand Down