Merge pull request #166 from cs50/logging

using INFO, WARNING, and ERROR instead of DEBUG

Author: dmalan

setup.py

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

src/cs50/sql.py

@@ -382,24 +382,24 @@ def teardown_appcontext(exception):
                 elif command in ["DELETE", "UPDATE"]:
                     ret = result.rowcount
 
-            # If constraint violated, return None
+            # If constraint violated
             except sqlalchemy.exc.IntegrityError as e:
-                self._logger.debug(termcolor.colored(statement, "yellow"))
+                self._logger.error(termcolor.colored(_statement, "red"))
                 e = ValueError(e.orig)
                 e.__cause__ = None
                 raise e
 
             # If user error
             except (sqlalchemy.exc.OperationalError, sqlalchemy.exc.ProgrammingError) as e:
                 self._disconnect()
-                self._logger.debug(termcolor.colored(statement, "red"))
+                self._logger.error(termcolor.colored(_statement, "red"))
                 e = RuntimeError(e.orig)
                 e.__cause__ = None
                 raise e
 
             # Return value
             else:
-                self._logger.debug(termcolor.colored(_statement, "green"))
+                self._logger.info(termcolor.colored(_statement, "green"))
                 if self._autocommit:  # Don't stay connected unnecessarily
                     self._disconnect()
                 return ret

tests/foo.py

@@ -5,23 +5,23 @@
 
 import cs50
 
-"""
 db = cs50.SQL("sqlite:///foo.db")
 
 logging.getLogger("cs50").disabled = False
+logging.getLogger("cs50").setLevel(logging.ERROR)
 
-#db.execute("SELECT ? FROM ? ORDER BY ?", "a", "tbl", "c")
-db.execute("CREATE TABLE IF NOT EXISTS bar (firstname STRING)")
+db.execute("CREATE TABLE IF NOT EXISTS bar (firstname STRING UNIQUE)")
 
+db.execute("INSERT INTO bar VALUES (?)", "baz")
 db.execute("INSERT INTO bar VALUES (?)", "baz")
 db.execute("INSERT INTO bar VALUES (?)", "qux")
 db.execute("SELECT * FROM bar WHERE firstname IN (?)", ("baz", "qux"))
 db.execute("DELETE FROM bar")
+
 """
 
 db = cs50.SQL("postgresql://postgres@localhost/test")
 
-"""
 print(db.execute("DROP TABLE IF EXISTS cs50"))
 print(db.execute("CREATE TABLE cs50 (id SERIAL PRIMARY KEY, val VARCHAR(16), bin BYTEA)"))
 print(db.execute("INSERT INTO cs50 (val) VALUES('foo')"))
@@ -31,7 +31,6 @@
 print(db.execute("CREATE TABLE cs50 (val VARCHAR(16), bin BYTEA)"))
 print(db.execute("INSERT INTO cs50 (val) VALUES('foo')"))
 print(db.execute("SELECT * FROM cs50"))
-"""
 
 print(db.execute("DROP TABLE IF EXISTS cs50"))
 print(db.execute("CREATE TABLE cs50 (id SERIAL PRIMARY KEY, val VARCHAR(16), bin BYTEA)"))
@@ -46,3 +45,5 @@
     pass
 print(db.execute("INSERT INTO cs50 (val) VALUES('qux')"))
 #print(db.execute("DELETE FROM cs50"))
+
+"""