Merge pull request #134 from cs50/unpacking

removed support for unpacking dicts and lists in execute

Author: dmalan

setup.py

@@ -16,5 +16,5 @@
     package_dir={"": "src"},
     packages=["cs50"],
     url="https://github.com/cs50/python-cs50",
-    version="5.0.5"
+    version="6.0.0"
 )

src/cs50/sql.py

@@ -127,7 +127,7 @@ def execute(self, sql, *args, **kwargs):
 
         # Ensure named and positional parameters are mutually exclusive
         if len(args) > 0 and len(kwargs) > 0:
-            raise RuntimeError("cannot pass both named and positional parameters")
+            raise RuntimeError("cannot pass both positional and named parameters")
 
         # Infer command from (unflattened) statement
         for token in statements[0]:
@@ -163,18 +163,6 @@ def execute(self, sql, *args, **kwargs):
                 # Remember placeholder's index, name
                 placeholders[index] = name
 
-        # If more placeholders than arguments
-        if len(args) == 1 and len(placeholders) > 1:
-
-            # If user passed args as list or tuple, explode values into args
-            if isinstance(args[0], (list, tuple)):
-                args = args[0]
-
-            # If user passed kwargs as dict, migrate values from args to kwargs
-            elif len(kwargs) == 0 and isinstance(args[0], dict):
-                kwargs = args[0]
-                args = []
-
         # If no placeholders
         if not paramstyle:
 

tests/sql.py

@@ -211,26 +211,16 @@ def test_qmark(self):
         self.db.execute("INSERT INTO foo VALUES ('qux', 'quux')")
         self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = ?", 'qux'), [{"firstname": "qux", "lastname": "quux"}])
         self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = ? AND lastname = ?", "qux", "quux"), [{"firstname": "qux", "lastname": "quux"}])
-        self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = ? AND lastname = ?", ("qux", "quux")), [{"firstname": "qux", "lastname": "quux"}])
-        self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = ? AND lastname = ?", ["qux", "quux"]), [{"firstname": "qux", "lastname": "quux"}])
         self.db.execute("DELETE FROM foo")
 
         self.db.execute("INSERT INTO foo VALUES (?)", ("bar", "baz"))
         self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
         self.db.execute("DELETE FROM foo")
 
-        self.db.execute("INSERT INTO foo VALUES (?, ?)", ("bar", "baz"))
-        self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
-        self.db.execute("DELETE FROM foo")
-
         self.db.execute("INSERT INTO foo VALUES (?)", ["bar", "baz"])
         self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
         self.db.execute("DELETE FROM foo")
 
-        self.db.execute("INSERT INTO foo VALUES (?, ?)", ["bar", "baz"])
-        self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
-        self.db.execute("DELETE FROM foo")
-
         self.db.execute("INSERT INTO foo VALUES (?,?)", "bar", "baz")
         self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
         self.db.execute("DELETE FROM foo")
@@ -308,19 +298,8 @@ def test_numeric(self):
         self.db.execute("INSERT INTO foo VALUES ('qux', 'quux')")
         self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = :1", 'qux'), [{"firstname": "qux", "lastname": "quux"}])
         self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = :1 AND lastname = :2", "qux", "quux"), [{"firstname": "qux", "lastname": "quux"}])
-        self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = :1 AND lastname = :2", ("qux", "quux")), [{"firstname": "qux", "lastname": "quux"}])
-        self.assertEqual(self.db.execute("SELECT * FROM foo WHERE firstname = :1 AND lastname = :2", ["qux", "quux"]), [{"firstname": "qux", "lastname": "quux"}])
         self.db.execute("DELETE FROM foo")
 
-        self.db.execute("INSERT INTO foo VALUES (:1, :2)", ("bar", "baz"))
-        self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
-        self.db.execute("DELETE FROM foo")
-
-        self.db.execute("INSERT INTO foo VALUES (:1, :2)", ["bar", "baz"])
-        self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
-        self.db.execute("DELETE FROM foo")
-
-
         self.db.execute("INSERT INTO foo VALUES (:1,:2)", "bar", "baz")
         self.assertEqual(self.db.execute("SELECT * FROM foo"), [{"firstname": "bar", "lastname": "baz"}])
         self.db.execute("DELETE FROM foo")