Launchpad itself

Merge ~cjwatson/launchpad:misc-jobs-dbenum into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. misc-jobs-dbenum
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 603e8c12382a8d6352f99b2ed92fd53fd5f48c55
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:misc-jobs-dbenum
Merge into: launchpad:master
Diff against target: 65 lines (+6/-6)
3 files modified
lib/lp/answers/model/questionjob.py (+2/-2)
lib/lp/charms/model/charmrecipebuildjob.py (+2/-2)
lib/lp/oci/model/ocirecipejob.py (+2/-2)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+412126@code.launchpad.net

Commit message

Use DBEnum rather than EnumCol in various jobs

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/answers/model/questionjob.py b/lib/lp/answers/model/questionjob.py
2index 2967daf..7a11475 100644
3--- a/lib/lp/answers/model/questionjob.py
4+++ b/lib/lp/answers/model/questionjob.py
5@@ -34,7 +34,7 @@ from lp.answers.interfaces.questionjob import (
6 from lp.answers.model.question import Question
7 from lp.registry.interfaces.person import IPersonSet
8 from lp.services.config import config
9-from lp.services.database.enumcol import EnumCol
10+from lp.services.database.enumcol import DBEnum
11 from lp.services.database.interfaces import IMasterStore
12 from lp.services.database.stormbase import StormBase
13 from lp.services.job.model.job import Job
14@@ -61,7 +61,7 @@ class QuestionJob(StormBase):
15 job_id = Int(name='job')
16 job = Reference(job_id, Job.id)
17
18- job_type = EnumCol(enum=QuestionJobType, notNull=True)
19+ job_type = DBEnum(enum=QuestionJobType, allow_none=False)
20
21 question_id = Int(name='question')
22 question = Reference(question_id, Question.id)
23diff --git a/lib/lp/charms/model/charmrecipebuildjob.py b/lib/lp/charms/model/charmrecipebuildjob.py
24index a0f7993..dba0e4a 100644
25--- a/lib/lp/charms/model/charmrecipebuildjob.py
26+++ b/lib/lp/charms/model/charmrecipebuildjob.py
27@@ -46,7 +46,7 @@ from lp.charms.interfaces.charmrecipebuildjob import (
28 )
29 from lp.charms.mail.charmrecipebuild import CharmRecipeBuildMailer
30 from lp.services.config import config
31-from lp.services.database.enumcol import EnumCol
32+from lp.services.database.enumcol import DBEnum
33 from lp.services.database.interfaces import (
34 IMasterStore,
35 IStore,
36@@ -83,7 +83,7 @@ class CharmRecipeBuildJob(StormBase):
37 build_id = Int(name="build", allow_none=False)
38 build = Reference(build_id, "CharmRecipeBuild.id")
39
40- job_type = EnumCol(enum=CharmRecipeBuildJobType, notNull=True)
41+ job_type = DBEnum(enum=CharmRecipeBuildJobType, allow_none=False)
42
43 metadata = JSON("json_data", allow_none=False)
44
45diff --git a/lib/lp/oci/model/ocirecipejob.py b/lib/lp/oci/model/ocirecipejob.py
46index 1f604a9..33f3429 100644
47--- a/lib/lp/oci/model/ocirecipejob.py
48+++ b/lib/lp/oci/model/ocirecipejob.py
49@@ -42,7 +42,7 @@ from lp.registry.interfaces.person import IPersonSet
50 from lp.services.config import config
51 from lp.services.database.bulk import load_related
52 from lp.services.database.decoratedresultset import DecoratedResultSet
53-from lp.services.database.enumcol import EnumCol
54+from lp.services.database.enumcol import DBEnum
55 from lp.services.database.interfaces import (
56 IMasterStore,
57 IStore,
58@@ -81,7 +81,7 @@ class OCIRecipeJob(StormBase):
59 recipe_id = Int(name='recipe', allow_none=False)
60 recipe = Reference(recipe_id, 'OCIRecipe.id')
61
62- job_type = EnumCol(enum=OCIRecipeJobType, notNull=True)
63+ job_type = DBEnum(enum=OCIRecipeJobType, allow_none=False)
64
65 metadata = JSON('json_data', allow_none=False)
66

Subscribers

People subscribed via source and target branches

to status/vote changes: