@@ -1,7 +1,7 @@
 -- CREATE TABLE IF NOT EXISTS keys (
---        id INTEGER PRIMARY KEY,
+--        id SERIAL PRIMARY KEY,
 --        fieldname TEXT,
 --        fieldtype TEXT,
 --        CONSTRAINT keyconstraint UNIQUE (fieldname));
 
 DROP TABLE IF EXISTS areas;
@@ -21,24 +21,24 @@
 DROP TABLE IF EXISTS test_data;
 DROP TABLE IF EXISTS test_rundat;
 DROP TABLE IF EXISTS archives;
 
 CREATE TABLE IF NOT EXISTS areas (
-       id INTEGER PRIMARY KEY,
-       area_name TEXT DEFAULT 'local',
-       area_path TEXT DEFAULT '.',
+       id SERIAL PRIMARY KEY,
+       area_name TEXT NOT NULL,
+       area_path TEXT NOT NULL,
        last_sync INTEGER DEFAULT 0,
        CONSTRAINT areaconstraint UNIQUE (area_name));
 
 INSERT INTO areas (id,area_name,area_path) VALUES (0,'local','.');
 
 CREATE TABLE IF NOT EXISTS ttype (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        target_spec TEXT DEFAULT '');
        
 CREATE TABLE IF NOT EXISTS runs (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        target     TEXT DEFAULT '',
        ttype_id   INTEGER DEFAULT 0,
        runname    TEXT DEFAULT 'norun',
        state      TEXT DEFAULT '',
        status     TEXT DEFAULT '',
@@ -50,19 +50,19 @@
        last_update INTEGER DEFAULT extract(epoch from now()),
        area_id     INTEGER DEFAULT 0,
        CONSTRAINT runsconstraint UNIQUE (runname));
 
 CREATE TABLE IF NOT EXISTS run_stats (
-       id     INTEGER PRIMARY KEY,
+       id     SERIAL PRIMARY KEY,
        run_id INTEGER,
        state  TEXT,
        status TEXT,
        count  INTEGER,
        last_update INTEGER DEFAULT extract(epoch from now()));
 
 CREATE TABLE IF NOT EXISTS test_meta (
-       id          INTEGER PRIMARY KEY,
+       id          SERIAL PRIMARY KEY,
        testname    TEXT DEFAULT '',
        author      TEXT DEFAULT '',
        owner       TEXT DEFAULT '',
        description TEXT DEFAULT '',
        reviewed    TEXT,
@@ -72,11 +72,11 @@
        tags        TEXT DEFAULT '',
        jobgroup    TEXT DEFAULT 'default',
        CONSTRAINT test_meta_constraint UNIQUE (testname));
 
 CREATE TABLE IF NOT EXISTS tasks_queue (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        action TEXT DEFAULT '',
        owner TEXT,
        state TEXT DEFAULT 'new',
        target TEXT DEFAULT '',
        name TEXT DEFAULT '',
@@ -85,51 +85,51 @@
        params TEXT,
        creation_time INTEGER DEFAULT extract(epoch from now()),
        execution_time INTEGER);
 
 CREATE TABLE IF NOT EXISTS archive_disks (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        archive_area_name TEXT,
        disk_path TEXT,
        last_df INTEGER DEFAULT -1,
        last_df_time INTEGER DEFAULT extract(epoch from now()),
        creation_time INTEGER DEFAULT extract(epoch from now()));
 
 CREATE TABLE IF NOT EXISTS archive_blocks (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        archive_disk_id INTEGER,
        disk_path TEXT,
        last_du INTEGER DEFAULT -1,
        last_du_time INTEGER DEFAULT extract(epoch from now()),
        creation_time INTEGER DEFAULT extract(epoch from now()));
 
 CREATE TABLE IF NOT EXISTS archive_allocations (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        archive_block_id INTEGER,
        testname TEXT,
        item_path TEXT,
        creation_time INTEGER DEFAULT extract(epoch from now()));
 
 CREATE TABLE IF NOT EXISTS extradat (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        run_id INTEGER,
        key TEXT,
        val TEXT);
 
 CREATE TABLE IF NOT EXISTS metadat (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        var TEXT,
        val TEXT);
 
 CREATE TABLE IF NOT EXISTS access_log (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        "user" TEXT,
        accessed TIMESTAMP,
        args TEXT);
 
 CREATE TABLE IF NOT EXISTS tests  (
-       id INTEGER PRIMARY KEY,                                                                            
+       id SERIAL PRIMARY KEY,                                                                            
        run_id       INTEGER   DEFAULT -1,                                                                 
        testname     TEXT      DEFAULT 'noname',                                                           
        host         TEXT      DEFAULT 'n/a',                                                              
        cpuload      REAL      DEFAULT -1,                                                                 
        diskfree     INTEGER   DEFAULT -1,                                                                 
@@ -150,11 +150,11 @@
        archived     INTEGER   DEFAULT 0, -- 0=no, > 1=archive block id where test data can be found       
        last_update  INTEGER DEFAULT extract(epoch from now()),                                               
        CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path));  
 
 CREATE TABLE IF NOT EXISTS test_steps (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        test_id INTEGER, 
        stepname TEXT, 
        state TEXT DEFAULT 'NOT_STARTED', 
        status TEXT DEFAULT 'n/a',
        event_time INTEGER DEFAULT extract(epoch from now()),
@@ -162,11 +162,11 @@
        logfile TEXT DEFAULT '',
        last_update  INTEGER DEFAULT extract(epoch from now()),
        CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));
 
 CREATE TABLE IF NOT EXISTS test_data (
-       id INTEGER PRIMARY KEY,
+       id SERIAL PRIMARY KEY,
        test_id INTEGER,
        category TEXT DEFAULT '',
        variable TEXT,
        value REAL,
        expected REAL,
@@ -177,26 +177,26 @@
        type TEXT DEFAULT '',
        last_update  INTEGER DEFAULT extract(epoch from now()),
        CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));
 
 CREATE TABLE IF NOT EXISTS test_rundat (
-       id           INTEGER PRIMARY KEY,
+       id           SERIAL PRIMARY KEY,
        test_id      INTEGER,
        update_time  INTEGER,
        cpuload      INTEGER DEFAULT -1,
        diskfree     INTEGER DEFAULT -1,
        diskusage    INTEGER DEFAULT -1,
        run_duration INTEGER DEFAULT 0);
 
 CREATE TABLE IF NOT EXISTS archives (
-       id           INTEGER PRIMARY KEY,
+       id           SERIAL PRIMARY KEY,
        test_id      INTEGER,
        state        TEXT DEFAULT 'new',
        status       TEXT DEFAULT 'n/a',
        archive_type TEXT DEFAULT 'bup',
        du           INTEGER,
        archive_path TEXT);
  
 
-TRUNCATE archive_blocks, archive_allocations, extradat, metadat,
-access_log, tests, test_steps, test_data, test_rundat, archives, runs,
-run_stats, test_meta, tasks_queue, archive_disks;
+-- TRUNCATE archive_blocks, archive_allocations, extradat, metadat,
+-- access_log, tests, test_steps, test_data, test_rundat, archives, runs,
+-- run_stats, test_meta, tasks_queue, archive_disks;