addressed more comments

dmalan · dmalan · commit 20cc461cdbad · 2019-02-22T11:27:22.000-05:00
diff --git a/src/cs50/sql.py b/src/cs50/sql.py
@@ -64,12 +64,12 @@ def connect(dbapi_connection, connection_record):
             disabled = self._logger.disabled
             self._logger.disabled = True
             self.execute("SELECT 1")
-            self._logger.disabled = disabled
         except sqlalchemy.exc.OperationalError as e:
             e = RuntimeError(_parse_exception(e))
             e.__cause__ = None
-            self._logger.disabled = disabled
             raise e
+        finally:
+            self._logger.disabled = disabled
 
     def execute(self, sql, *args, **kwargs):
         """Execute a SQL statement."""
@@ -137,7 +137,6 @@ def execute(self, sql, *args, **kwargs):
         # In case of errors
         _placeholders = ", ".join([str(tokens[index]) for index in placeholders])
         _args = ", ".join([str(self._escape(arg)) for arg in args])
-        #_kwargs = ", ".join([str(self._escape(arg)) for arg in args])
 
         # qmark
         if paramstyle == "qmark":
@@ -270,6 +269,10 @@ def __escape(value):
                     sqlparse.tokens.Number,
                     sqlalchemy.types.Boolean().literal_processor(self.engine.dialect)(value))
 
+            # bytearray, bytes
+            elif type(value) in [bytearray, bytes]:
+                raise RuntimeError("unsupported value")  # TODO
+
             # datetime.date
             elif type(value) is datetime.date:
                 return sqlparse.sql.Token(
diff --git a/tests/sqlite.py b/tests/sqlite.py
@@ -10,6 +10,9 @@
 db = SQL("sqlite:///sqlite.db")
 db.execute("SELECT 1")
 
+# TODO
+#db.execute("SELECT * FROM Employee WHERE FirstName = ?", b'\x00')
+
 db.execute("SELECT * FROM Employee WHERE FirstName = ?", "' OR 1 = 1")
 
 db.execute("SELECT * FROM Employee WHERE FirstName IN (?)", "Andrew")
