Fix previous commit

Django wasn't initialized, this lead to exception when filtering with
foreign key.
Also fixing foreign column name "conf" in "Measure". And changing
initialization to use class names for foreign key columns.

diff --git a/scripts/database/__init__.py b/scripts/database/__init__.py
index c67d001091a4a316aac089d9734ec2c0e05fdaa3..cd8354109eeebbcd5f16c9d0fa88dccace356a61 100644 (file)
--- a/scripts/database/__init__.py
+++ b/scripts/database/__init__.py
@@ -2,3 +2,6 @@ import os
 import sys
 from .settings import *
 from .models import *
+
+import django
+django.setup()

diff --git a/scripts/database/models.py b/scripts/database/models.py
index d9b5fdd5f196e6792b8a52b47216cb0fdfdb13df..5a6fd4c209b947f915042f9913a44ec05b9ffd6c 100644 (file)
--- a/scripts/database/models.py
+++ b/scripts/database/models.py
@@ -3,40 +3,45 @@ import sys
 from django.db import models
 
 class ToolsGit(models.Model):
+    id = models.AutoField(primary_key=True)
     git_describe = models.TextField()
     git_commit = models.TextField()
     class Meta:
         db_table = "toolsgit"
 
 class LinuxGit(models.Model):
+    id = models.AutoField(primary_key=True)
     git_describe = models.TextField()
     git_commit = models.TextField()
     class Meta:
         db_table = "linuxgit"
 
 class Configurations(models.Model):
+    id = models.AutoField(primary_key=True)
     hash = models.CharField(max_length=32)
     generator = models.TextField()
     config = models.TextField()
     gtime = models.DateTimeField()
-    linuxgit = models.ForeignKey('linuxgit', db_column='linuxgit')
-    toolgit = models.ForeignKey('toolsgit', db_column='toolgit')
+    linuxgit = models.ForeignKey(LinuxGit, db_column='linuxgit')
+    toolgit = models.ForeignKey(ToolsGit, db_column='toolgit')
     class Meta:
         db_table = "configurations"
 
 class Measure(models.Model):
-    conf = models.ForeignKey('configurations')
+    id = models.AutoField(primary_key=True)
+    conf = models.ForeignKey(Configurations, db_column = 'conf')
     measurement = models.TextField()
     output = models.TextField()
     result = models.TextField()
     value = models.FloatField()
     mtime = models.DateTimeField()
-    linuxgit = models.ForeignKey('linuxgit', db_column='linuxgit')
-    toolgit = models.ForeignKey('toolsgit', db_column='toolgit')
+    linuxgit = models.ForeignKey(LinuxGit, db_column='linuxgit')
+    toolgit = models.ForeignKey(ToolsGit, db_column='toolgit')
     class Meta:
         db_table = "measure"
 
 class Configopt(models.Model):
+    id = models.AutoField(primary_key=True)
     configopt = models.TextField()
     class Meta:
         db_table = "configopt"