Tweak naming: connection_txn_stmt => connection_exec_stmt

erlend-aasland · erlend-aasland · commit c37ebb5ed699 · 2022-08-16T00:14:38.000+02:00
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -157,7 +157,7 @@ new_statement_cache(pysqlite_Connection *self, pysqlite_state *state,
 }
 
 static inline int
-connection_txn_stmt(pysqlite_Connection *self, const char *sql)
+connection_exec_stmt(pysqlite_Connection *self, const char *sql)
 {
     int rc;
     Py_BEGIN_ALLOW_THREADS
@@ -311,7 +311,7 @@ pysqlite_connection_init_impl(pysqlite_Connection *self, PyObject *database,
     self->initialized = 1;
 
     if (autocommit == AUTOCOMMIT_DISABLED) {
-        (void)connection_txn_stmt(self, "BEGIN");
+        (void)connection_exec_stmt(self, "BEGIN");
     }
     return 0;
 
@@ -385,7 +385,7 @@ connection_close(pysqlite_Connection *self)
         if (self->autocommit == AUTOCOMMIT_DISABLED &&
             !sqlite3_get_autocommit(self->db))
         {
-            (void)connection_txn_stmt(self, "ROLLBACK");
+            (void)connection_exec_stmt(self, "ROLLBACK");
         }
 
         free_callback_contexts(self);
@@ -603,16 +603,16 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self)
 
     if (self->autocommit == AUTOCOMMIT_COMPAT) {
         if (!sqlite3_get_autocommit(self->db)) {
-            if (connection_txn_stmt(self, "COMMIT") < 0) {
+            if (connection_exec_stmt(self, "COMMIT") < 0) {
                 return NULL;
             }
         }
     }
     else if (self->autocommit == AUTOCOMMIT_DISABLED) {
-        if (connection_txn_stmt(self, "COMMIT") < 0) {
+        if (connection_exec_stmt(self, "COMMIT") < 0) {
             return NULL;
         }
-        if (connection_txn_stmt(self, "BEGIN") < 0) {
+        if (connection_exec_stmt(self, "BEGIN") < 0) {
             return NULL;
         }
     }
@@ -637,16 +637,16 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)
 
     if (self->autocommit == AUTOCOMMIT_COMPAT) {
         if (!sqlite3_get_autocommit(self->db)) {
-            if (connection_txn_stmt(self, "ROLLBACK") < 0) {
+            if (connection_exec_stmt(self, "ROLLBACK") < 0) {
                 return NULL;
             }
         }
     }
     else if (self->autocommit == AUTOCOMMIT_DISABLED) {
-        if (connection_txn_stmt(self, "ROLLBACK") < 0) {
+        if (connection_exec_stmt(self, "ROLLBACK") < 0) {
             return NULL;
         }
-        if (connection_txn_stmt(self, "BEGIN") < 0) {
+        if (connection_exec_stmt(self, "BEGIN") < 0) {
             return NULL;
         }
     }
@@ -2352,18 +2352,18 @@ set_autocommit(pysqlite_Connection *self, PyObject *val, void *Py_UNUSED(ctx))
     }
     if (self->autocommit == AUTOCOMMIT_ENABLED) {
         if (!sqlite3_get_autocommit(self->db)) {
-            if (connection_txn_stmt(self, "COMMIT") < 0) {
+            if (connection_exec_stmt(self, "COMMIT") < 0) {
                 return -1;
             }
         }
     }
     else if (self->autocommit == AUTOCOMMIT_DISABLED) {
         if (!sqlite3_get_autocommit(self->db)) {
-            if (connection_txn_stmt(self, "COMMIT") < 0) {
+            if (connection_exec_stmt(self, "COMMIT") < 0) {
                 return -1;
             }
         }
-        if (connection_txn_stmt(self, "BEGIN") < 0) {
+        if (connection_exec_stmt(self, "BEGIN") < 0) {
             return -1;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ new_statement_cache(pysqlite_Connection self, pysqlite_state state,`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`static inline int`
`160`		`-connection_txn_stmt(pysqlite_Connection self, const char sql)`
	`160`	`+connection_exec_stmt(pysqlite_Connection self, const char sql)`
`161`	`161`	`{`
`162`	`162`	`int rc;`
`163`	`163`	`Py_BEGIN_ALLOW_THREADS`
`@@ -311,7 +311,7 @@ pysqlite_connection_init_impl(pysqlite_Connection self, PyObject database,`
`311`	`311`	`self->initialized = 1;`
`312`	`312`
`313`	`313`	`if (autocommit == AUTOCOMMIT_DISABLED) {`
`314`		`- (void)connection_txn_stmt(self, "BEGIN");`
	`314`	`+ (void)connection_exec_stmt(self, "BEGIN");`
`315`	`315`	`}`
`316`	`316`	`return 0;`
`317`	`317`
`@@ -385,7 +385,7 @@ connection_close(pysqlite_Connection *self)`
`385`	`385`	`if (self->autocommit == AUTOCOMMIT_DISABLED &&`
`386`	`386`	`!sqlite3_get_autocommit(self->db))`
`387`	`387`	`{`
`388`		`- (void)connection_txn_stmt(self, "ROLLBACK");`
	`388`	`+ (void)connection_exec_stmt(self, "ROLLBACK");`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`free_callback_contexts(self);`
`@@ -603,16 +603,16 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self)`
`603`	`603`
`604`	`604`	`if (self->autocommit == AUTOCOMMIT_COMPAT) {`
`605`	`605`	`if (!sqlite3_get_autocommit(self->db)) {`
`606`		`- if (connection_txn_stmt(self, "COMMIT") < 0) {`
	`606`	`+ if (connection_exec_stmt(self, "COMMIT") < 0) {`
`607`	`607`	`return NULL;`
`608`	`608`	`}`
`609`	`609`	`}`
`610`	`610`	`}`
`611`	`611`	`else if (self->autocommit == AUTOCOMMIT_DISABLED) {`
`612`		`- if (connection_txn_stmt(self, "COMMIT") < 0) {`
	`612`	`+ if (connection_exec_stmt(self, "COMMIT") < 0) {`
`613`	`613`	`return NULL;`
`614`	`614`	`}`
`615`		`- if (connection_txn_stmt(self, "BEGIN") < 0) {`
	`615`	`+ if (connection_exec_stmt(self, "BEGIN") < 0) {`
`616`	`616`	`return NULL;`
`617`	`617`	`}`
`618`	`618`	`}`
`@@ -637,16 +637,16 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self)`
`637`	`637`
`638`	`638`	`if (self->autocommit == AUTOCOMMIT_COMPAT) {`
`639`	`639`	`if (!sqlite3_get_autocommit(self->db)) {`
`640`		`- if (connection_txn_stmt(self, "ROLLBACK") < 0) {`
	`640`	`+ if (connection_exec_stmt(self, "ROLLBACK") < 0) {`
`641`	`641`	`return NULL;`
`642`	`642`	`}`
`643`	`643`	`}`
`644`	`644`	`}`
`645`	`645`	`else if (self->autocommit == AUTOCOMMIT_DISABLED) {`
`646`		`- if (connection_txn_stmt(self, "ROLLBACK") < 0) {`
	`646`	`+ if (connection_exec_stmt(self, "ROLLBACK") < 0) {`
`647`	`647`	`return NULL;`
`648`	`648`	`}`
`649`		`- if (connection_txn_stmt(self, "BEGIN") < 0) {`
	`649`	`+ if (connection_exec_stmt(self, "BEGIN") < 0) {`
`650`	`650`	`return NULL;`
`651`	`651`	`}`
`652`	`652`	`}`
`@@ -2352,18 +2352,18 @@ set_autocommit(pysqlite_Connection self, PyObject val, void *Py_UNUSED(ctx))`
`2352`	`2352`	`}`
`2353`	`2353`	`if (self->autocommit == AUTOCOMMIT_ENABLED) {`
`2354`	`2354`	`if (!sqlite3_get_autocommit(self->db)) {`
`2355`		`- if (connection_txn_stmt(self, "COMMIT") < 0) {`
	`2355`	`+ if (connection_exec_stmt(self, "COMMIT") < 0) {`
`2356`	`2356`	`return -1;`
`2357`	`2357`	`}`
`2358`	`2358`	`}`
`2359`	`2359`	`}`
`2360`	`2360`	`else if (self->autocommit == AUTOCOMMIT_DISABLED) {`
`2361`	`2361`	`if (!sqlite3_get_autocommit(self->db)) {`
`2362`		`- if (connection_txn_stmt(self, "COMMIT") < 0) {`
	`2362`	`+ if (connection_exec_stmt(self, "COMMIT") < 0) {`
`2363`	`2363`	`return -1;`
`2364`	`2364`	`}`
`2365`	`2365`	`}`
`2366`		`- if (connection_txn_stmt(self, "BEGIN") < 0) {`
	`2366`	`+ if (connection_exec_stmt(self, "BEGIN") < 0) {`
`2367`	`2367`	`return -1;`
`2368`	`2368`	`}`
`2369`	`2369`	`}`