diff --git a/unittest-logs/dbschema.py b/unittest-logs/dbschema.py index bc45132..67aaf29 100755 --- a/unittest-logs/dbschema.py +++ b/unittest-logs/dbschema.py @@ -65,7 +65,7 @@ def CreateDBSchema(conn): """) conn.execute(""" - CREATE TABLE IF NOT EXISTS tests (buildid INT, name TEXT, description TEXT) + CREATE TABLE IF NOT EXISTS tests (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, buildid INT, name TEXT, description TEXT) """) conn.execute(""" CREATE INDEX tests_name ON tests (name(1024)) diff --git a/unittest-logs/dbschema.pyc b/unittest-logs/dbschema.pyc index f3d84dd..87f5079 100644 Binary files a/unittest-logs/dbschema.pyc and b/unittest-logs/dbschema.pyc differ diff --git a/unittest-logs/unittest-log.py b/unittest-logs/unittest-log.py index 48b36f0..be2e6b1 100755 --- a/unittest-logs/unittest-log.py +++ b/unittest-logs/unittest-log.py @@ -141,9 +141,8 @@ def GetOrInsertTree(conn, tree): table, insert a new row and return the id.""" conn.execute("""SELECT id FROM trees WHERE name = %s""", (tree)) - rows = conn.fetchone() - if len(rows) > 0: - return rows[0] + if conn.rowcount > 0: + return conn.lastrowid # need to insert it conn.execute("""INSERT INTO trees (name) VALUES (%s)""", (tree,)) diff --git a/unittest-logs/unittestweb/settings.pyc b/unittest-logs/unittestweb/settings.pyc index 5bfabf9..c26d17a 100644 Binary files a/unittest-logs/unittestweb/settings.pyc and b/unittest-logs/unittestweb/settings.pyc differ diff --git a/unittest-logs/unittestweb/settings.py~ b/unittest-logs/unittestweb/settings.py~ index 1fb0629..71c2b47 100755 --- a/unittest-logs/unittestweb/settings.py~ +++ b/unittest-logs/unittestweb/settings.py~ @@ -14,7 +14,7 @@ DATABASE_NAME = 'topfailsdb' # Or path to database file if using sql DATABASE_USER = 'root' # Not used with sqlite3. DATABASE_PASSWORD = 'mkngama' # Not used with sqlite3. DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '3306' # Set to empty string for default. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/unittest-logs/unittestweb/viewer/models.py b/unittest-logs/unittestweb/viewer/models.py index 0edcea7..ca67484 100755 --- a/unittest-logs/unittestweb/viewer/models.py +++ b/unittest-logs/unittestweb/viewer/models.py @@ -75,6 +75,6 @@ class Tests(models.Model): def get_most_failing_tests(): cursor = connection.cursor() - cursor.execute("select count(*), name from (select builds.id, name from builds inner join tests on builds.id = tests.buildid group by builds.id, name) group by name order by count(*) desc limit 250") + cursor.execute("select count(*), name from (select builds.id, name from builds inner join tests on builds.id = tests.buildid group by builds.id, name) aaa group by name order by count(*) desc limit 250") for row in cursor: yield row diff --git a/unittest-logs/unittestweb/viewer/models.pyc b/unittest-logs/unittestweb/viewer/models.pyc index 20d7cb4..cf0b2b5 100644 Binary files a/unittest-logs/unittestweb/viewer/models.pyc and b/unittest-logs/unittestweb/viewer/models.pyc differ