Address review: fix execute() and executemany() specs

Author: Erlend E. Aasland

Modules/_sqlite/clinic/cursor.c.h

@@ -31,7 +31,7 @@ pysqlite_cursor_init(PyObject *self, PyObject *args, PyObject *kwargs)
 }
 
 PyDoc_STRVAR(pysqlite_cursor_execute__doc__,
-"execute($self, sql, parameters=<unrepresentable>, /)\n"
+"execute($self, sql, parameters=(), /)\n"
 "--\n"
 "\n"
 "Executes a SQL statement.");
@@ -73,7 +73,7 @@ pysqlite_cursor_execute(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t
 }
 
 PyDoc_STRVAR(pysqlite_cursor_executemany__doc__,
-"executemany($self, sql, parameters=<unrepresentable>, /)\n"
+"executemany($self, sql, seq_of_parameters, /)\n"
 "--\n"
 "\n"
 "Repeatedly executes a SQL statement.");
@@ -83,16 +83,16 @@ PyDoc_STRVAR(pysqlite_cursor_executemany__doc__,
 
 static PyObject *
 pysqlite_cursor_executemany_impl(pysqlite_Cursor *self, PyObject *sql,
-                                 PyObject *parameters);
+                                 PyObject *seq_of_parameters);
 
 static PyObject *
 pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *sql;
-    PyObject *parameters = NULL;
+    PyObject *seq_of_parameters;
 
-    if (!_PyArg_CheckPositional("executemany", nargs, 1, 2)) {
+    if (!_PyArg_CheckPositional("executemany", nargs, 2, 2)) {
         goto exit;
     }
     if (!PyUnicode_Check(args[0])) {
@@ -103,12 +103,8 @@ pysqlite_cursor_executemany(pysqlite_Cursor *self, PyObject *const *args, Py_ssi
         goto exit;
     }
     sql = args[0];
-    if (nargs < 2) {
-        goto skip_optional;
-    }
-    parameters = args[1];
-skip_optional:
-    return_value = pysqlite_cursor_executemany_impl(self, sql, parameters);
+    seq_of_parameters = args[1];
+    return_value = pysqlite_cursor_executemany_impl(self, sql, seq_of_parameters);
 
 exit:
     return return_value;
@@ -283,4 +279,4 @@ pysqlite_cursor_close(pysqlite_Cursor *self, PyObject *Py_UNUSED(ignored))
 {
     return pysqlite_cursor_close_impl(self);
 }
-/*[clinic end generated code: output=29b5b24ed34ba996 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=84d4ba48a211657b input=a9049054013a1b77]*/

Modules/_sqlite/cursor.c

@@ -613,7 +613,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation
 _sqlite3.Cursor.execute as pysqlite_cursor_execute
 
     sql: unicode
-    parameters: object = NULL
+    parameters: object(c_default = 'NULL') = ()
     /
 
 Executes a SQL statement.
@@ -622,7 +622,7 @@ Executes a SQL statement.
 static PyObject *
 pysqlite_cursor_execute_impl(pysqlite_Cursor *self, PyObject *sql,
                              PyObject *parameters)
-/*[clinic end generated code: output=d81b4655c7c0bbad input=f146ded55ff8c7d4]*/
+/*[clinic end generated code: output=d81b4655c7c0bbad input=91d7bb36f127f597]*/
 {
     return _pysqlite_query_execute(self, 0, sql, parameters);
 }
@@ -631,16 +631,16 @@ pysqlite_cursor_execute_impl(pysqlite_Cursor *self, PyObject *sql,
 _sqlite3.Cursor.executemany as pysqlite_cursor_executemany
 
     sql: unicode
-    parameters: object = NULL
+    seq_of_parameters: object
     /
 
 Repeatedly executes a SQL statement.
 [clinic start generated code]*/
 
 static PyObject *
 pysqlite_cursor_executemany_impl(pysqlite_Cursor *self, PyObject *sql,
-                                 PyObject *parameters)
-/*[clinic end generated code: output=df8e2d0b7300aab6 input=fa99d0eb3dd5971e]*/
+                                 PyObject *seq_of_parameters)
+/*[clinic end generated code: output=2c65a3c4733fb5d8 input=440707b7af87fba8]*/
 {
     return _pysqlite_query_execute(self, 1, sql, parameters);
 }