Qt Metrics 2: project_run.build_key type

Code changes regarding the changed type of
project_run.build_key to bigint in the database,
as the new-CI uses 64 bit integer (unix timestamp)
here.

Change-Id: I03d431b0d36839cd5b5779f1d12cc8062ec36522
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>

4 files changed, 141 insertions, 135 deletions

diff --git a/non-puppet/qtmetrics2/src/Database.php b/non-puppet/qtmetrics2/src/Database.php
index beabfff..57f7e42 100644
--- a/non-puppet/qtmetrics2/src/Database.php
+++ b/non-puppet/qtmetrics2/src/Database.php
@@ -34,7 +34,7 @@
 
 /**
  * Database class
- * @since     24-09-2015
+ * @since     25-09-2015
  * @author    Juha Sippola
  */
 
@@ -325,7 +325,7 @@ class Database {
      * Get the latest build result by branch for given project and state
      * @param string $runProject
      * @param string $runState
-     * @return array (string name, string result, string buildKey, string timestamp, string duration)
+     * @return array (string name, string result, int buildKey, string timestamp, string duration)
      */
     public function getLatestProjectBranchBuildResults($runProject, $runState)
     {
@@ -372,7 +372,7 @@ class Database {
      * @param string $conf
      * @param string $runProject
      * @param string $runState
-     * @return array (string name, string result, string buildKey, string timestamp, string duration)
+     * @return array (string name, string result, int buildKey, string timestamp, string duration)
      */
     public function getLatestConfBranchBuildResults($conf, $runProject, $runState)
     {
@@ -402,11 +402,13 @@ class Database {
             ");
             $query->execute(array(
                 $conf,
+
                 $runProject,
                 $runState,
                 $build['name'],
                 $build['key']
             ));
+
             while($row = $query->fetch(PDO::FETCH_ASSOC)) {
                 $result[] = array(
                     'name' => $row['name'],
@@ -426,7 +428,7 @@ class Database {
      * Get the latest testset result by branch for given project and state
      * @param string $runProject
      * @param string $runState
-     * @return array (string project, string branch, string buildKey, string timestamp, int passed, int failed)
+     * @return array (string project, string branch, int buildKey, string timestamp, int passed, int failed)
      */
     public function getLatestProjectBranchTestsetResults($runProject, $runState)
     {
@@ -462,6 +464,7 @@ class Database {
                 $build['name'],
                 $build['key']
             ));
+
             while($row = $query->fetch(PDO::FETCH_ASSOC)) {
                 $result[] = array(
                     'project' => $row['project'],
@@ -482,7 +485,7 @@ class Database {
      * @param string $testsetProject
      * @param string $runProject
      * @param string $runState
-     * @return array (string project, string branch, string buildKey, string timestamp, int passed, int failed)
+     * @return array (string project, string branch, int buildKey, string timestamp, int passed, int failed)
      */
     public function getLatestTestsetProjectBranchTestsetResults($testsetProject, $runProject, $runState)
     {
@@ -520,6 +523,7 @@ class Database {
                 $build['name'],
                 $build['key']
             ));
+
             while($row = $query->fetch(PDO::FETCH_ASSOC)) {
                 $result[] = array(
                     'project' => $row['project'],
@@ -567,12 +571,14 @@ class Database {
             ");
             $query->execute(array(
                 $testset,
+
                 $testsetProject,
                 $runProject,
                 $runState,
                 $build['name'],
                 $build['key']
             ));
+
             while($row = $query->fetch(PDO::FETCH_ASSOC)) {
                 $result[] = array(
                     'name' => $row['conf'],
@@ -818,7 +824,7 @@ class Database {
      * @param string $runState
      * @param string $date
      * @param string $durationLimitSec
-     * @return array (string testset, string project, string branch, string conf, string buildKey, string timestamp, string result, int duration)
+     * @return array (string testset, string project, string branch, string conf, int buildKey, string timestamp, string result, int duration)
      */
     public function getTestsetMaxDuration($testsetId, $runProject, $runState, $date, $durationLimitSec)
     {
@@ -878,7 +884,7 @@ class Database {
      * @param string $runState
      * @param string $date
      * @param string $durationLimitSec
-     * @return array (string testfunction, string testset, string project, string branch, string conf, string buildKey, string timestamp, string result, int duration)
+     * @return array (string testfunction, string testset, string project, string branch, string conf, int buildKey, string timestamp, string result, int duration)
      */
     public function getTestfunctionMaxDuration($testfunctionId, $testsetId, $runProject, $runState, $date, $durationLimitSec)
     {
@@ -1184,7 +1190,7 @@ class Database {
      * Get project run data by branch
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string buildKey, string timestamp)
+     * @return array (string branch, int buildKey, string timestamp)
      */
     public function getProjectBuildsByBranch($runProject, $runState)
     {
@@ -1220,7 +1226,7 @@ class Database {
      * Get conf run data by branch
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string conf, string buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
+     * @return array (string branch, string conf, int buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
      */
     public function getConfBuildsByBranch($runProject, $runState)
     {
@@ -1269,7 +1275,7 @@ class Database {
      * @param string $runProject
      * @param string $runState
      * @param string $targetOs
-     * @return array (string branch, string conf, string buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
+     * @return array (string branch, string conf, int buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
      */
     public function getConfOsBuildsByBranch($runProject, $runState, $targetOs)
     {
@@ -1320,7 +1326,7 @@ class Database {
      * @param string $runProject
      * @param string $runState
      * @param string $conf
-     * @return array (string branch, string conf, string buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
+     * @return array (string branch, string conf, int buildKey, bool forcesuccess, bool insignificant, string result, string timestamp, string duration)
      */
     public function getConfBuildByBranch($runProject, $runState, $conf)
     {
@@ -1372,7 +1378,7 @@ class Database {
      * @param string $testsetProject
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string conf, string buildKey, string result, string timestamp, string duration, int run)
+     * @return array (string branch, string conf, int buildKey, string result, string timestamp, string duration, int run)
      */
     public function getTestsetResultsByBranchConf($testset, $testsetProject, $runProject, $runState)
     {
@@ -1426,7 +1432,7 @@ class Database {
      * @param string $testsetProject
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string conf, string buildKey, int passed, int ipassed, int failed, int ifailed)
+     * @return array (string branch, string conf, int buildKey, int passed, int ipassed, int failed, int ifailed)
      */
     public function getTestsetProjectResultsByBranchConf($testsetProject, $runProject, $runState)
     {
@@ -1480,7 +1486,7 @@ class Database {
      * @param string $conf
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string buildKey, string testset, string project, string result, string timestamp, string duration, int run)
+     * @return array (string branch, int buildKey, string testset, string project, string result, string timestamp, string duration, int run)
      */
     public function getTestsetConfResultsByBranch($conf, $runProject, $runState)
     {
@@ -1537,7 +1543,7 @@ class Database {
      * @param string $testsetProject
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string buildKey, string testset, string project, string result, string timestamp, string duration, int run)
+     * @return array (string branch, int buildKey, string testset, string project, string result, string timestamp, string duration, int run)
      */
     public function getTestsetConfProjectResultsByBranch($conf, $testsetProject, $runProject, $runState)
     {
@@ -1597,7 +1603,7 @@ class Database {
      * @param string $conf
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string buildKey, string testfunction, string result, string timestamp, string duration)
+     * @return array (string branch, int buildKey, string testfunction, string result, string timestamp, string duration)
      */
     public function getTestfunctionConfResultsByBranch($testset, $testsetProject, $conf, $runProject, $runState)
     {
@@ -1658,7 +1664,7 @@ class Database {
      * @param string $conf
      * @param string $runProject
      * @param string $runState
-     * @return array (string branch, string buildKey, string testrow, string result, string timestamp)
+     * @return array (string branch, int buildKey, string testrow, string result, string timestamp)
      */
     public function getTestrowConfResultsByBranch($testfunction, $testset, $testsetProject, $conf, $runProject, $runState)
     {
diff --git a/non-puppet/qtmetrics2/src/test/DatabaseTest.php b/non-puppet/qtmetrics2/src/test/DatabaseTest.php
index 8605365..fcc95ef 100644
--- a/non-puppet/qtmetrics2/src/test/DatabaseTest.php
+++ b/non-puppet/qtmetrics2/src/test/DatabaseTest.php
@@ -279,7 +279,7 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
      * Test getLatestProjectBranchBuildKeys
      * @dataProvider testGetLatestProjectBranchBuildKeysData
      */
-    public function testGetLatestProjectBranchBuildKeys($project, $state, $exp_branch, $exp_build_key, $exp_archived)
+    public function testGetLatestProjectBranchBuildKeys($project, $state, $exp_branch, $exp_key, $exp_archived)
     {
         $branches = array();
         $db = Factory::db();
@@ -289,7 +289,7 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
             if ($row['name'] === $exp_branch) {
                 $this->assertArrayHasKey('name', $row);
                 $this->assertArrayHasKey('key', $row);
-                $this->assertEquals($exp_build_key, $row['key']);
+                $this->assertEquals($exp_key, $row['key']);
                 $branches[] = $row['name'];
             }
         }
@@ -301,10 +301,10 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetLatestProjectBranchBuildKeysData()
     {
         return array(
-            array('Qt5', 'state', 'master', '4777', 0),                         // based on test data
-            array('Qt5', 'state', 'dev', 'BuildKeyInStringFormat12345', 0),
-            array('Qt5', 'state', 'release', '157', 1),
-            array('Qt5', 'state', 'stable', '1348', 0)
+            array('Qt5', 'state', 'master', 4777, 0),                         // based on test data
+            array('Qt5', 'state', 'dev', 18446744073709551615, 0),
+            array('Qt5', 'state', 'release', 157, 1),
+            array('Qt5', 'state', 'stable', 1348, 0)
         );
     }
 
@@ -312,7 +312,7 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
      * Test getLatestProjectBranchBuildKey
      * @dataProvider testGetLatestProjectBranchBuildKeyData
      */
-    public function testGetLatestProjectBranchBuildKey($project, $branch, $state, $exp_build_key, $exp_archived)
+    public function testGetLatestProjectBranchBuildKey($project, $branch, $state, $exp_key, $exp_archived)
     {
         $db = Factory::db();
         $result = $db->getLatestProjectBranchBuildKey($project, $branch, $state);
@@ -320,16 +320,16 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
             $this->assertEmpty($result);
         } else {
             $this->assertNotEmpty($result);
-            $this->assertEquals($exp_build_key, $result);
+            $this->assertEquals($exp_key, $result);
         }
     }
     public function testGetLatestProjectBranchBuildKeyData()
     {
         return array(
-            array('Qt5', 'master', 'state', '4777', 0),                         // based on test data
-            array('Qt5', 'dev', 'state', 'BuildKeyInStringFormat12345', 0),
-            array('Qt5', 'release', 'state', '157', 1),
-            array('Qt5', 'stable', 'state', '1348', 0)
+            array('Qt5', 'master', 'state', 4777, 0),                         // based on test data
+            array('Qt5', 'dev', 'state', 18446744073709551615, 0),
+            array('Qt5', 'release', 'state', 157, 1),
+            array('Qt5', 'stable', 'state', 1348, 0)
         );
     }
 
@@ -923,13 +923,13 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetProjectBuildsByBranchData()
     {
         return array(
-            array('Qt5', 'state', 'dev', '1023', 0, 1),
-            array('Qt5', 'state', 'stable', '1348', 0, 1),
-            array('Qt5', 'state', 'stable', '1348', 0, 1),
-            array('Qt5', 'state', 'stable', '1348', 0, 1),
-            array('Qt5', 'state', 'dev', 'BuildKeyInStringFormat12345', 0, 1),
-            array('Qt5', 'state', 'release', '157', 1, 1),
-            array('Qt5', 'invalid', '', '', 0, 0)
+            array('Qt5', 'state', 'dev', 1023, 0, 1),
+            array('Qt5', 'state', 'stable', 1348, 0, 1),
+            array('Qt5', 'state', 'stable', 1348, 0, 1),
+            array('Qt5', 'state', 'stable', 1348, 0, 1),
+            array('Qt5', 'state', 'dev', 18446744073709551615, 0, 1),
+            array('Qt5', 'state', 'release', 157, 1, 1),
+            array('Qt5', 'invalid', '', 0, 0, 0)
         );
     }
 
@@ -976,12 +976,12 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetConfBuildsByBranchData()
     {
         return array(
-            array('Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', '1023', 'FAILURE', 0, 1),
-            array('Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 'SUCCESS', 0, 1),
-            array('Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'SUCCESS', 0, 1),
-            array('Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'BuildKeyInStringFormat12345', 'FAILURE', 0, 1),
-            array('Qt5', 'state', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', '157', 'SUCCESS', 1, 1),
-            array('Qt5', 'invalid', '', '', '', '', 0, 0)
+            array('Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 1023, 'FAILURE', 0, 1),
+            array('Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 'SUCCESS', 0, 1),
+            array('Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'SUCCESS', 0, 1),
+            array('Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 18446744073709551615, 'FAILURE', 0, 1),
+            array('Qt5', 'state', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 157, 'SUCCESS', 1, 1),
+            array('Qt5', 'invalid', '', '', 0, '', 0, 0)
         );
     }
 
@@ -1031,13 +1031,13 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetConfOsBuildsByBranchData()
     {
         return array(
-            array('Qt5', 'state', 'linux', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', '1023', 'FAILURE', 0, 1, 1),
-            array('Qt5', 'state', 'linux', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'BuildKeyInStringFormat12345', 'FAILURE', 0, 1, 1),
-            array('Qt5', 'state', 'windows', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 'SUCCESS', 0, 1, 1),
-            array('Qt5', 'state', 'osx', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'SUCCESS', 0, 1, 1),
-            array('Qt5', 'state', 'linux', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'SUCCESS', 0, 1, 0),
-            array('Qt5', 'state', 'linux', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', '157', 'SUCCESS', 1, 1, 1),
-            array('Qt5', 'state', 'invalid', '', '', '', '', 0, 0, 0)
+            array('Qt5', 'state', 'linux', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 1023, 'FAILURE', 0, 1, 1),
+            array('Qt5', 'state', 'linux', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 18446744073709551615, 'FAILURE', 0, 1, 1),
+            array('Qt5', 'state', 'windows', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 'SUCCESS', 0, 1, 1),
+            array('Qt5', 'state', 'osx', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'SUCCESS', 0, 1, 1),
+            array('Qt5', 'state', 'linux', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'SUCCESS', 0, 1, 0),
+            array('Qt5', 'state', 'linux', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 157, 'SUCCESS', 1, 1, 1),
+            array('Qt5', 'state', 'invalid', '', '', 0, '', 0, 0, 0)
         );
     }
 
@@ -1087,13 +1087,13 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetConfBuildByBranchData()
     {
         return array(
-            array('Qt5', 'state', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', '1023', 'FAILURE', 0, 1, 1),
-            array('Qt5', 'state', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'BuildKeyInStringFormat12345', 'FAILURE', 0, 1, 1),
-            array('Qt5', 'state', 'win32-msvc2010_developer-build_angle_Windows_7', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 'SUCCESS', 0, 1, 1),
-            array('Qt5', 'state', 'macx-clang_developer-build_OSX_10.8', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'SUCCESS', 0, 1, 1),
-            array('Qt5', 'state', 'win32-msvc2010_developer-build_angle_Windows_7', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'SUCCESS', 0, 1, 0),
-            array('Qt5', 'state', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', '157', 'SUCCESS', 1, 1, 0),
-            array('Qt5', 'state', 'invalid', '', '', '', '', 0, 0, 0)
+            array('Qt5', 'state', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 1023, 'FAILURE', 0, 1, 1),
+            array('Qt5', 'state', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 18446744073709551615, 'FAILURE', 0, 1, 1),
+            array('Qt5', 'state', 'win32-msvc2010_developer-build_angle_Windows_7', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 'SUCCESS', 0, 1, 1),
+            array('Qt5', 'state', 'macx-clang_developer-build_OSX_10.8', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'SUCCESS', 0, 1, 1),
+            array('Qt5', 'state', 'win32-msvc2010_developer-build_angle_Windows_7', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'SUCCESS', 0, 1, 0),
+            array('Qt5', 'state', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'release', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 157, 'SUCCESS', 1, 1, 0),
+            array('Qt5', 'state', 'invalid', '', '', 0, '', 0, 0, 0)
         );
     }
 
@@ -1136,11 +1136,11 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     {
         return array(
             array('tst_qftp', 'Qt5', 'Qt5', 'state', '', '', '', '', 0),
-            array('tst_qftp', 'QtBase', 'Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', '1023', 'ifailed', 1),
-            array('tst_qftp', 'QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 'ipassed', 1),
-            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 'failed', 1),
-            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 'passed', 1),
-            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'BuildKeyInStringFormat12345', 'failed', 1)
+            array('tst_qftp', 'QtBase', 'Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 1023, 'ifailed', 1),
+            array('tst_qftp', 'QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 'ipassed', 1),
+            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 'failed', 1),
+            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 'passed', 1),
+            array('tst_qfont', 'QtBase', 'Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 18446744073709551615, 'failed', 1)
         );
     }
 
@@ -1179,12 +1179,12 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetTestsetProjectResultsByBranchConfData()
     {
         return array(
-            array('QtBase', 'Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', '1023', 1),
-            array('QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 1),
-            array('QtBase', 'Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', '1348', 1),
-            array('QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', '1348', 1),
-            array('QtBase', 'Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'BuildKeyInStringFormat12345', 1),
-            array('Qt5', 'Qt5', 'invalid', '', '', '', '', 0)
+            array('QtBase', 'Qt5', 'state', 'dev', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 1023, 1),
+            array('QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 1),
+            array('QtBase', 'Qt5', 'state', 'stable', 'macx-clang_developer-build_OSX_10.8', 1348, 1),
+            array('QtBase', 'Qt5', 'state', 'stable', 'win32-msvc2010_developer-build_angle_Windows_7', 1348, 1),
+            array('QtBase', 'Qt5', 'state', 'dev', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 18446744073709551615, 1),
+            array('Qt5', 'Qt5', 'invalid', '', '', '', 0, 0)
         );
     }
 
@@ -1228,11 +1228,11 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetTestsetConfResultsByBranchData()
     {
         return array(
-            array('linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', '1023', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'Qt5', 'state', 'stable', 'tst_qftp', 'na', 'qtbase', '1348', 1),
-            array('macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'tst_qfont', 'tst_networkselftest', 'qtbase', '1348', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 'BuildKeyInStringFormat12345', 1),
-            array('invalid', 'Qt5', 'state', '', '', '', '', '', 0)
+            array('linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 1023, 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'Qt5', 'state', 'stable', 'tst_qftp', 'na', 'qtbase', 1348, 1),
+            array('macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'tst_qfont', 'tst_networkselftest', 'qtbase', 1348, 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 18446744073709551615, 1),
+            array('invalid', 'Qt5', 'state', '', '', '', '', 0, 0)
         );
     }
 
@@ -1276,12 +1276,12 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetTestsetConfProjectResultsByBranchData()
     {
         return array(
-            array('linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'qtbase', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', '1023', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'stable', 'tst_qftp', 'na', 'qtbase', '1348', 1),
-            array('macx-clang_developer-build_OSX_10.8', 'qtbase', 'Qt5', 'state', 'stable', 'tst_qfont', 'tst_networkselftest', 'qtbase', '1348', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 'BuildKeyInStringFormat12345', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'invalid', 'Qt5', 'state', '', '', '', '', '', 0),
-            array('invalid', 'qtbase', 'Qt5', 'state', '', '', '', '', '', 0)
+            array('linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'qtbase', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 1023, 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'stable', 'tst_qftp', 'na', 'qtbase', 1348, 1),
+            array('macx-clang_developer-build_OSX_10.8', 'qtbase', 'Qt5', 'state', 'stable', 'tst_qfont', 'tst_networkselftest', 'qtbase', 1348, 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'dev', 'tst_qftp', 'na', 'qtbase', 18446744073709551615, 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'invalid', 'Qt5', 'state', '', '', '', '', 0, 0),
+            array('invalid', 'qtbase', 'Qt5', 'state', '', '', '', '', 0, 0)
         );
     }
 
@@ -1322,12 +1322,12 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetTestfunctionConfResultsByBranchData()
     {
         return array(
-            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'exactMatch', 'fail', '1348', 1),
-            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'lastResortFont', 'skip', '1348', 1),
-            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'lastResortFont', 'bpass', '1346', 1),
-            array('tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'smbServer', 'skip', '1348', 1),
-            array('tst_qftp', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', '', '', 0),                                      // no fail or skip
-            array('tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', '', '', 0)
+            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'exactMatch', 'fail', 1348, 1),
+            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'lastResortFont', 'skip', 1348, 1),
+            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'lastResortFont', 'bpass', 1346, 1),
+            array('tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'smbServer', 'skip', 1348, 1),
+            array('tst_qftp', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', '', 0, 0),                                      // no fail or skip
+            array('tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', '', 0, 0)
         );
     }
 
@@ -1364,12 +1364,12 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
     public function testGetTestrowConfResultsByBranchData()
     {
         return array(
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'monospace', '1346', 1),     // xpass
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'sans-serif', '1346', 1),    // xfail
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'serif', '1346', 1),         // bskip
-            array('binaryAscii', 'tst_qftp', 'qtbase', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', 'WithSocks5ProxyAndSession', '1023', 1), // fail
-            array('httpServerFiles', 'tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', '', 0),            // no fail or skip
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', '', 0)
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'monospace', 1346, 1),     // xpass
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'sans-serif', 1346, 1),    // xfail
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 'serif', 1346, 1),         // bskip
+            array('binaryAscii', 'tst_qftp', 'qtbase', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', 'WithSocks5ProxyAndSession', 1023, 1), // fail
+            array('httpServerFiles', 'tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', 0, 0),           // no fail or skip
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', 0, 0)
         );
     }
 
diff --git a/non-puppet/qtmetrics2/src/test/FactoryTest.php b/non-puppet/qtmetrics2/src/test/FactoryTest.php
index 9940d4a..2c2632c 100644
--- a/non-puppet/qtmetrics2/src/test/FactoryTest.php
+++ b/non-puppet/qtmetrics2/src/test/FactoryTest.php
@@ -360,10 +360,10 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateProjectRunsData()
     {
         return array(
-            array('Qt5', 'state', 'stable', '1348', 1),
-            array('Qt5', 'state', 'dev', 'BuildKeyInStringFormat12345', 1),
-            array('invalid', 'state', '', '', '', 0),
-            array('Qt5', 'invalid', '', '', '', 0)
+            array('Qt5', 'state', 'stable', 1348, 1),
+            array('Qt5', 'state', 'dev', 18446744073709551615, 1),
+            array('invalid', 'state', '', 0, 0),
+            array('Qt5', 'invalid', '', 0, 0)
         );
     }
 
@@ -394,16 +394,16 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateConfRunsData()
     {
         return array(
-            array('Qt5', 'state', '', '', 'stable', '1348', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
-            array('Qt5', 'state', '', '', 'stable', '1348', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('Qt5', 'state', 'windows', '', 'stable', '1348', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
-            array('Qt5', 'state', 'linux', '', 'stable', '1348', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('Qt5', 'state', 'linux', '', 'dev', 'BuildKeyInStringFormat12345', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('Qt5', 'state', 'invalid', '', '', '', '', 0),
-            array('Qt5', 'state', '', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 'stable', '1348', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
-            array('Qt5', 'state', '', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'stable', '1348', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('Qt5', 'state', '', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'dev', 'BuildKeyInStringFormat12345', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('Qt5', 'state', '', 'invalid', '', '', '', 0)
+            array('Qt5', 'state', '', '', 'stable', 1348, 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
+            array('Qt5', 'state', '', '', 'stable', 1348, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('Qt5', 'state', 'windows', '', 'stable', 1348, 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
+            array('Qt5', 'state', 'linux', '', 'stable', 1348, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('Qt5', 'state', 'linux', '', 'dev', 18446744073709551615, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('Qt5', 'state', 'invalid', '', '', 0, '', 0),
+            array('Qt5', 'state', '', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 'stable', 1348, 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
+            array('Qt5', 'state', '', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'stable', 1348, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('Qt5', 'state', '', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 'dev', 18446744073709551615, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('Qt5', 'state', '', 'invalid', '', 0, '', 0)
         );
     }
 
@@ -434,10 +434,10 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestsetRunsData()
     {
         return array(
-            array('tst_qftp', 'qtbase', 'Qt5', 'state', 'stable', '1348', 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
-            array('tst_qfont', 'qtbase', 'Qt5', 'state', 'dev', 'BuildKeyInStringFormat12345', 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
-            array('invalid', 'qtbase', 'Qt5', 'state', '', '', '', 0),
-            array('tst_qftp', 'invalid', 'Qt5', 'state', '', '', '', 0)
+            array('tst_qftp', 'qtbase', 'Qt5', 'state', 'stable', 1348, 'win64-msvc2012_developer-build_qtnamespace_Windows_8', 1),
+            array('tst_qfont', 'qtbase', 'Qt5', 'state', 'dev', 18446744073709551615, 'linux-g++-32_developer-build_Ubuntu_10.04_x86', 1),
+            array('invalid', 'qtbase', 'Qt5', 'state', '', 0, '', 0),
+            array('tst_qftp', 'invalid', 'Qt5', 'state', '', 0, '', 0)
         );
     }
 
@@ -468,13 +468,13 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestsetRunsInConfData()
     {
         return array(
-            array('win64-msvc2012_developer-build_qtnamespace_Windows_8', '', 'Qt5', 'state', 'stable', '1348', 'tst_qftp', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', '', 'Qt5', 'state', 'stable', 'BuildKeyInStringFormat12345', 'tst_qftp', 1),
-            array('invalid', '', 'Qt5', 'state', '', '', '', 0),
-            array('win64-msvc2012_developer-build_qtnamespace_Windows_8', 'qtbase', 'Qt5', 'state', 'stable', '1348', 'tst_qftp', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'stable', 'BuildKeyInStringFormat12345', 'tst_qftp', 1),
-            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'invalid', 'Qt5', 'state', '', '', '', 0),
-            array('invalid', 'qtbase', 'Qt5', 'state', '', '', '', 0)
+            array('win64-msvc2012_developer-build_qtnamespace_Windows_8', '', 'Qt5', 'state', 'stable', 1348, 'tst_qftp', 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', '', 'Qt5', 'state', 'stable', 18446744073709551615, 'tst_qftp', 1),
+            array('invalid', '', 'Qt5', 'state', '', 0, '', 0),
+            array('win64-msvc2012_developer-build_qtnamespace_Windows_8', 'qtbase', 'Qt5', 'state', 'stable', 1348, 'tst_qftp', 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'qtbase', 'Qt5', 'state', 'stable', 18446744073709551615, 'tst_qftp', 1),
+            array('linux-g++-32_developer-build_Ubuntu_10.04_x86', 'invalid', 'Qt5', 'state', '', 0, '', 0),
+            array('invalid', 'qtbase', 'Qt5', 'state', '', 0, '', 0)
         );
     }
 
@@ -500,10 +500,10 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestsetRunsMaxDurationData()
     {
         return array(
-            array('Qt5', 'state', 'tst_qftp', '1348', 813, 999),
-            array('Qt5', 'state', 'tst_qfont', 'BuildKeyInStringFormat12345', 814, 999),
-            array('Qt5', 'state', 'tst_networkselftest', '1348', 729, 999),
-            array('Qt5', 'state', 'invalid', '', 0, 999)
+            array('Qt5', 'state', 'tst_qftp', 1348, 813, 999),
+            array('Qt5', 'state', 'tst_qfont', 18446744073709551615, 814, 999),
+            array('Qt5', 'state', 'tst_networkselftest', 1348, 729, 999),
+            array('Qt5', 'state', 'invalid', 0, 0, 999)
         );
     }
 
@@ -529,10 +529,10 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestfunctionRunsMaxDurationData()
     {
         return array(
-            array('tst_qftp', 'qtbase', 'Qt5', 'state', 'binaryAscii', '1023', 31.1, 999),
-            array('tst_qfont', 'qtbase', 'Qt5', 'state', 'resetFont', '1346', 6.1, 999),
-            array('tst_networkselftest', 'qtbase', 'Qt5', 'state', 'socks5Proxy', '1348', 0.2, 999),
-            array('tst_networkselftest', 'qtbase', 'Qt5', 'state', 'invalid', '', 0, 999)
+            array('tst_qftp', 'qtbase', 'Qt5', 'state', 'binaryAscii', 1023, 31.1, 999),
+            array('tst_qfont', 'qtbase', 'Qt5', 'state', 'resetFont', 1346, 6.1, 999),
+            array('tst_networkselftest', 'qtbase', 'Qt5', 'state', 'socks5Proxy', 1348, 0.2, 999),
+            array('tst_networkselftest', 'qtbase', 'Qt5', 'state', 'invalid', 0, 0, 999)
         );
     }
 
@@ -563,11 +563,11 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestfunctionRunsInConfData()
     {
         return array(
-            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1348', 'exactMatch', 1),             // fail
-            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1348', 'lastResortFont', 1),         // skip
-            array('tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1348', 'smbServer', 1),    // skip
-            array('tst_qftp', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', '', 0),                                  // no fail or skip
-            array('tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', '', 0)
+            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1348, 'exactMatch', 1),             // fail
+            array('tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1348, 'lastResortFont', 1),         // skip
+            array('tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1348, 'smbServer', 1),    // skip
+            array('tst_qftp', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', 0, '', 0),                                 // no fail or skip
+            array('tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', 0, '', 0)
         );
     }
 
@@ -598,12 +598,12 @@ class FactoryTest extends PHPUnit_Framework_TestCase
     public function testCreateTestrowRunsInConfData()
     {
         return array(
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1346', 'monospace', 1),     // xpass
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1346', 'sans-serif', 1),    // xfail
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', '1346', 'serif', 1),         // bskip
-            array('binaryAscii', 'tst_qftp', 'qtbase', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', '1023', 'WithSocks5ProxyAndSession', 1), // fail
-            array('httpServerFiles', 'tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', '', '', 0),            // no fail or skip
-            array('defaultFamily', 'tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', '', '', 0)
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1346, 'monospace', 1),     // xpass
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1346, 'sans-serif', 1),    // xfail
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', 'stable', 1346, 'serif', 1),         // bskip
+            array('binaryAscii', 'tst_qftp', 'qtbase', 'linux-g++_developer-build_qtnamespace_qtlibinfix_Ubuntu_11.10_x64', 'Qt5', 'state', 'dev', 1023, 'WithSocks5ProxyAndSession', 1), // fail
+            array('httpServerFiles', 'tst_networkselftest', 'qtbase', 'macx-clang_developer-build_OSX_10.8', 'Qt5', 'state', '', 0, '', 0),           // no fail or skip
+            array('defaultFamily', 'tst_qfont', 'qtbase', 'invalid', 'Qt5', 'state', '', 0, '', 0)
         );
     }
 
diff --git a/non-puppet/qtmetrics2/testparser.pl b/non-puppet/qtmetrics2/testparser.pl
index b66928d..fb9aea8 100644
--- a/non-puppet/qtmetrics2/testparser.pl
+++ b/non-puppet/qtmetrics2/testparser.pl
@@ -1360,7 +1360,7 @@ sub sql_create_tables
                 project_id            TINYINT UNSIGNED      NOT NULL,
                 branch_id             TINYINT UNSIGNED      NOT NULL,
                 state_id              TINYINT UNSIGNED      NOT NULL,
-                build_key             VARCHAR(256)          NOT NULL,
+                build_key             BIGINT UNSIGNED       NOT NULL,
                 result                ENUM('SUCCESS','FAILURE','ABORTED')    NOT NULL,
                 timestamp             TIMESTAMP             NOT NULL,
                 duration              TIME                  NOT NULL,