changeset: 74987:74b2da95c6be branch: 3.2 parent: 74984:662c60d26183 user: Petri Lehtinen date: Thu Feb 16 21:39:03 2012 +0200 files: Doc/includes/sqlite3/shortcut_methods.py Doc/library/sqlite3.rst Misc/NEWS description: sqlite3: Fix documentation errors concerning Cursor.rowcount Closes #13995. diff -r 662c60d26183 -r 74b2da95c6be Doc/includes/sqlite3/shortcut_methods.py --- a/Doc/includes/sqlite3/shortcut_methods.py Thu Feb 16 19:49:48 2012 +0100 +++ b/Doc/includes/sqlite3/shortcut_methods.py Thu Feb 16 21:39:03 2012 +0200 @@ -17,5 +17,4 @@ for row in con.execute("select firstname, lastname from person"): print(row) -# Using a dummy WHERE clause to not let SQLite take the shortcut table deletes. -print("I just deleted", con.execute("delete from person where 1=1").rowcount, "rows") +print("I just deleted", con.execute("delete from person").rowcount, "rows") diff -r 662c60d26183 -r 74b2da95c6be Doc/library/sqlite3.rst --- a/Doc/library/sqlite3.rst Thu Feb 16 19:49:48 2012 +0100 +++ b/Doc/library/sqlite3.rst Thu Feb 16 21:39:03 2012 +0200 @@ -543,18 +543,17 @@ attribute, the database engine's own support for the determination of "rows affected"/"rows selected" is quirky. - For ``DELETE`` statements, SQLite reports :attr:`rowcount` as 0 if you make a - ``DELETE FROM table`` without any condition. - For :meth:`executemany` statements, the number of modifications are summed up into :attr:`rowcount`. As required by the Python DB API Spec, the :attr:`rowcount` attribute "is -1 in case no ``executeXX()`` has been performed on the cursor or the rowcount of the - last operation is not determinable by the interface". + last operation is not determinable by the interface". This includes ``SELECT`` + statements because we cannot determine the number of rows a query produced + until all rows were fetched. - This includes ``SELECT`` statements because we cannot determine the number of - rows a query produced until all rows were fetched. + With SQLite versions before 3.6.5, :attr:`rowcount` is set to 0 if + you make a ``DELETE FROM table`` without any condition. .. attribute:: Cursor.lastrowid diff -r 662c60d26183 -r 74b2da95c6be Misc/NEWS --- a/Misc/NEWS Thu Feb 16 19:49:48 2012 +0100 +++ b/Misc/NEWS Thu Feb 16 21:39:03 2012 +0200 @@ -528,8 +528,8 @@ Documentation ------------- -- Issue #13491: Fix many errors in sqlite3 documentation. Initial - patch by Johannes Vogel. +- Issues #13491 and #13995: Fix many errors in sqlite3 documentation. + Initial patch for #13491 by Johannes Vogel. - Issue #13402: Document absoluteness of sys.executable.