Update model_core and harvester to explicit foreign keys id_projects and id_teams (web2py 2.18.3)

modules/model_core.py

@@ -466,6 +466,7 @@ class Core(object):
 
             Field("id_projects",
                   "reference projects",
+                  default=UNDEF_ID,
                   label="Project",
                   notnull=True),
 
@@ -503,12 +504,16 @@ class Core(object):
 
         # rule: 30 Dec 2012
         table.defense.requires = IS_EMPTY_OR(IS_MATCH(REG_DEFENSE))
-        table.id_publishers.requires = IS_IN_DB(db, "publishers.abbreviation")
 
         # rule: 10-14 Dec 2012 or 28 Jun - 4 Jul 2012
         table.conference_dates.requires = IS_EMPTY_OR(IS_MATCH(REG_CONF_DATES))
 
         table.conference_url.requires = IS_EMPTY_OR(IS_URL())
+
+        table.id_publishers.requires = IS_IN_DB(db, "publishers.abbreviation")
+        table.id_projects.requires = IS_IN_DB(db, "projects.project")
+        table.id_teams.requires = IS_IN_DB(db, "teams.team")
+
         table.origin.requires = IS_EMPTY_OR(IS_MATCH(REG_VALID_ORIGIN))
         table.publication_url.requires = IS_EMPTY_OR(IS_URL())
 

modules/model_harvester.py

@@ -204,6 +204,11 @@ class Harvester(object):
         table.host.filter_in = CLEAN_SPACES
 
         table.controller.requires = IS_IN_DB(db, "controllers.controller")
+
+        table.id_categories.requires = IS_IN_DB(db, "categories.code")
+        table.id_projects.requires = IS_IN_DB(db, "projects.project")
+        table.id_teams.requires = IS_IN_DB(db, "teams.team")
+
         table.host.requires = IS_IN_SET(STORES)
 
         return table
@@ -239,6 +244,9 @@ class Harvester(object):
             Field("authors", "text", comment=tp_authors_cppm, notnull=True),
             migrate="my_authors.table")
 
+        table.id_projects.requires = IS_IN_DB(db, "projects.project")
+        table.id_teams.requires = IS_IN_DB(db, "teams.team")
+
         table.year.requires = IS_INT_IN_RANGE(1900, year+1)
 
         return table