[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  088d389 Add id column to host.
      from  7645665 Add test for Kai's wrong culprit mail.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 088d3890082900cdbef6c22b62c74ee658793a4e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Nov 17 11:49:13 2010 +0100

    Add id column to host.

-----------------------------------------------------------------------

Summary of changes:
 .bzrignore         |    1 +
 buildfarm/sqldb.py |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.bzrignore b/.bzrignore
index 222c794..a34bfd1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,2 +1,3 @@
 hostdb.sqlite
 _trial_temp
+db
diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index 11994c0..4542c8a 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -73,7 +73,8 @@ class StormBuild(Build):
 class StormHost(Host):
     __storm_table__ = "host"
 
-    name = RawStr(primary=True)
+    id = Int(primary=True)
+    name = RawStr()
     owner_name = Unicode(name="owner")
     owner_email = Unicode()
     password = Unicode()
@@ -258,7 +259,7 @@ class StormCachingBuildFarm(BuildFarm):
 
 
 def setup_schema(db):
-    db.execute("CREATE TABLE IF NOT EXISTS host (name blob, owner text, owner_email text, password text, ssh_access int, fqdn text, platform text, permission text, last_dead_mail int, join_time int);", noresult=True)
+    db.execute("CREATE TABLE IF NOT EXISTS host (id integer primary key autoincrement, name blob, owner text, owner_email text, password text, ssh_access int, fqdn text, platform text, permission text, last_dead_mail int, join_time int);", noresult=True)
     db.execute("CREATE UNIQUE INDEX IF NOT EXISTS unique_hostname ON host (name);", noresult=True)
     db.execute("CREATE TABLE IF NOT EXISTS build (id integer primary key autoincrement, tree blob, revision blob, host blob, compiler blob, checksum blob, age int, status blob, commit_revision blob);", noresult=True)
     db.execute("CREATE UNIQUE INDEX IF NOT EXISTS unique_checksum ON build (checksum);", noresult=True)


-- 
build.samba.org