Skip to content

bpo-36859: Use sqlite3_stmt_readonly API when possible to determine if statement is DML.K #13216

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
coleifer wants to merge 9 commits into from
Closed

bpo-36859: Use sqlite3_stmt_readonly API when possible to determine if statement is DML.K #13216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c51aab0
Use sqlite3_stmt_readonly API to determine is statement is DML.
coleifer May 9, 2019
aa42615
Skip dml detection + sql comment for old sqlite.
coleifer May 9, 2019
56dc71b
Add news item.
coleifer May 9, 2019
d54ce97
Address review comments, additional regression test.
coleifer May 9, 2019
afb7b6c
Fix rest markup
berkerpeksag May 9, 2019
cc49a97
cosmetic fixes
berkerpeksag May 9, 2019
8b1cced
Ensure all non-DML statements that write are covered.
coleifer May 9, 2019
3ab2ba8
Move DML detection tests into transactions test module.
coleifer May 10, 2019
6667caa
Fix version-check for sqlite3_stmt_readonly availability.
coleifer May 11, 2019
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
Ensure all non-DML statements that write are covered.
  • Loading branch information
@coleifer
coleifer committed May 9, 2019
commit 8b1cceda1f92723f749da4e79632f163859416e5
5 changes: 5 additions & 0 deletions Lib/sqlite3/test/regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,11 @@ def test_dml_detection_begin_exclusive(self):
conn.execute('ROLLBACK')
self.assertFalse(conn.in_transaction)

def test_dml_detection_vacuum(self):
conn = sqlite.connect(':memory:')
conn.execute('vacuum')
self.assertFalse(conn.in_transaction)


def suite():
regression_suite = unittest.makeSuite(RegressionTests, "Check")
Expand Down
6 changes: 5 additions & 1 deletion Modules/_sqlite/statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,11 @@ static int pysqlite_statement_is_dml(sqlite3_stmt *statement, const char *sql)

is_dml = (PyOS_strnicmp(p, "begin", 5) &&
PyOS_strnicmp(p, "create", 6) &&
PyOS_strnicmp(p, "drop", 4));
PyOS_strnicmp(p, "drop", 4) &&
PyOS_strnicmp(p, "alter", 5) &&
PyOS_strnicmp(p, "analyze", 7) &&
PyOS_strnicmp(p, "reindex", 7) &&
PyOS_strnicmp(p, "vacuum", 6));
break;
}
}
Expand Down