Merge pull request #33 from AnswerDotAI/revert-30-add-returning-to-update

Revert "Add RETURNING to Table.update()"

Author: jph00

README.md

@@ -238,36 +238,13 @@ sqlite-minutils is different from sqlite-utils in that write actions
 affected without relying on `last_rowid`. It does this through the
 `RETURNING` SQL keyword.
 
-Testing `INSERT`
-
 ``` python
 user = users.insert(dict(name='Turkey', age=2, pwd='gravy'))
 user
 ```
 
-    {'id': 6, 'name': 'Turkey', 'age': 2, 'pwd': 'gravy'}
+    {'id': 8, 'name': 'Turkey', 'age': 2, 'pwd': 'gravy'}
 
 ``` python
 test(user['name'], 'Turkey', equals)
 ```
-
-Testing `UPDATE`
-
-``` python
-user = users.insert(dict(name='Flamingo', age=12, pwd='pink'))
-user
-```
-
-    {'id': 8, 'name': 'Flamingo', 'age': 12, 'pwd': 'pink'}
-
-``` python
-user = users.update(user['id'], dict(name='Kiwi', pwd='pumpkin'))
-user
-```
-
-    {'id': 7, 'name': 'Kiwi', 'age': 12, 'pwd': 'pumpkin'}
-
-``` python
-test(user['name'], 'Kiwi', equals)
-test(users.last_pk, user['id'], equals)
-```

nbs/index.ipynb

@@ -4,7 +4,16 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "The autoreload extension is already loaded. To reload it, use:\n",
+      "  %reload_ext autoreload\n"
+     ]
+    }
+   ],
    "source": [
     "#| hide\n",
     "%load_ext autoreload\n",
@@ -572,13 +581,6 @@
     "sqlite-minutils is different from sqlite-utils in that write actions (`INSERT`, `UPDATE`, `UPSERT`) return back the record(s) they have affected without relying on `last_rowid`. It does this through the `RETURNING` SQL keyword."
    ]
   },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Testing `INSERT`"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -587,7 +589,7 @@
     {
      "data": {
       "text/plain": [
-       "{'id': 6, 'name': 'Turkey', 'age': 2, 'pwd': 'gravy'}"
+       "{'id': 8, 'name': 'Turkey', 'age': 2, 'pwd': 'gravy'}"
       ]
      },
      "execution_count": null,
@@ -608,65 +610,6 @@
    "source": [
     "test(user['name'], 'Turkey', equals)"
    ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Testing `UPDATE`"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'id': 8, 'name': 'Flamingo', 'age': 12, 'pwd': 'pink'}"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "user = users.insert(dict(name='Flamingo', age=12, pwd='pink'))\n",
-    "user"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'id': 7, 'name': 'Kiwi', 'age': 12, 'pwd': 'pumpkin'}"
-      ]
-     },
-     "execution_count": null,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "user = users.update(user['id'], dict(name='Kiwi', pwd='pumpkin'))\n",
-    "user"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "test(user['name'], 'Kiwi', equals)\n",
-    "test(users.last_pk, user['id'], equals)"
-   ]
   }
  ],
  "metadata": {

sqlite_minutils/db.py

@@ -2700,7 +2700,7 @@ def update(
         updates: Optional[dict] = None,
         alter: bool = False,
         conversions: Optional[dict] = None,
-    ) -> Dict:
+    ) -> "Table":
         """
         Execute a SQL ``UPDATE`` against the specified row.
 
@@ -2731,27 +2731,23 @@ def update(
             args.append(jsonify_if_needed(value))
         wheres = ["[{}] = ?".format(pk_name) for pk_name in pks]
         args.extend(pk_values)
-        sql = "update [{table}] set {sets} where {wheres} returning *".format(
+        sql = "update [{table}] set {sets} where {wheres}".format(
             table=self.name, sets=", ".join(sets), wheres=" and ".join(wheres)
         )
         try:
-            cursor = self.db.execute(sql, args)
-            cursor.rowcount
+            rowcount = self.db.execute(sql, args).rowcount
         except OperationalError as e:
             if alter and (" column" in e.args[0]):
                 # Attempt to add any missing columns, then try again
                 self.add_missing_columns([updates])
-                cursor = self.db.execute(sql, args)
-                cursor.rowcount
+                rowcount = self.db.execute(sql, args).rowcount
             else:
                 raise
 
         # TODO: Test this works (rolls back) - use better exception:
         # assert rowcount == 1
         self.last_pk = pk_values[0] if len(pks) == 1 else pk_values
-
-        columns = [c[0] for c in cursor.description]
-        return dict(zip(columns, cursor.fetchone()))
+        return self
 
     def build_insert_queries_and_params(
         self,