Launchpad itself

Merge ~cjwatson/launchpad:translations-dbenum into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. translations-dbenum
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 6991d09aa4cf7c55b2dae4895d087c685846bedb
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:translations-dbenum
Merge into: launchpad:master
Diff against target: 78 lines (+13/-12)
3 files modified
lib/lp/translations/model/potemplate.py (+5/-4)
lib/lp/translations/model/translationmessage.py (+6/-6)
lib/lp/translations/model/translationsharingjob.py (+2/-2)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+412098@code.launchpad.net

Commit message

lp.translations: Use DBEnum rather than EnumCol

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/translations/model/potemplate.py b/lib/lp/translations/model/potemplate.py
2index 45f6a99..d9b92ad 100644
3--- a/lib/lp/translations/model/potemplate.py
4+++ b/lib/lp/translations/model/potemplate.py
5@@ -47,7 +47,7 @@ from lp.services.database.collection import Collection
6 from lp.services.database.constants import DEFAULT
7 from lp.services.database.datetimecol import UtcDateTimeCol
8 from lp.services.database.decoratedresultset import DecoratedResultSet
9-from lp.services.database.enumcol import EnumCol
10+from lp.services.database.enumcol import DBEnum
11 from lp.services.database.interfaces import (
12 IMasterStore,
13 IStore,
14@@ -214,9 +214,10 @@ class POTemplate(SQLBase, RosettaStats):
15 path = StringCol(dbName='path', notNull=True)
16 source_file = ForeignKey(foreignKey='LibraryFileAlias',
17 dbName='source_file', notNull=False, default=None)
18- source_file_format = EnumCol(dbName='source_file_format',
19- schema=TranslationFileFormat, default=TranslationFileFormat.PO,
20- notNull=True)
21+ source_file_format = DBEnum(
22+ name='source_file_format',
23+ enum=TranslationFileFormat, default=TranslationFileFormat.PO,
24+ allow_none=False)
25 iscurrent = BoolCol(dbName='iscurrent', notNull=True, default=True)
26 messagecount = IntCol(dbName='messagecount', notNull=True, default=0)
27 owner = ForeignKey(
28diff --git a/lib/lp/translations/model/translationmessage.py b/lib/lp/translations/model/translationmessage.py
29index 564cfa8..f07e088 100644
30--- a/lib/lp/translations/model/translationmessage.py
31+++ b/lib/lp/translations/model/translationmessage.py
32@@ -36,7 +36,7 @@ from lp.services.database.constants import (
33 UTC_NOW,
34 )
35 from lp.services.database.datetimecol import UtcDateTimeCol
36-from lp.services.database.enumcol import EnumCol
37+from lp.services.database.enumcol import DBEnum
38 from lp.services.database.interfaces import IStore
39 from lp.services.database.sqlbase import (
40 quote,
41@@ -281,11 +281,11 @@ class TranslationMessage(SQLBase, TranslationMessageMixIn):
42
43 comment = StringCol(
44 dbName='comment', notNull=False, default=None)
45- origin = EnumCol(
46- dbName='origin', notNull=True, schema=RosettaTranslationOrigin)
47- validation_status = EnumCol(
48- dbName='validation_status', notNull=True,
49- schema=TranslationValidationStatus)
50+ origin = DBEnum(
51+ name='origin', allow_none=False, enum=RosettaTranslationOrigin)
52+ validation_status = DBEnum(
53+ name='validation_status', allow_none=False,
54+ enum=TranslationValidationStatus)
55 is_current_ubuntu = BoolCol(
56 dbName='is_current_ubuntu', notNull=True, default=False)
57 is_current_upstream = BoolCol(
58diff --git a/lib/lp/translations/model/translationsharingjob.py b/lib/lp/translations/model/translationsharingjob.py
59index 24c9762..bd3b402 100644
60--- a/lib/lp/translations/model/translationsharingjob.py
61+++ b/lib/lp/translations/model/translationsharingjob.py
62@@ -23,7 +23,7 @@ from storm.locals import (
63 from lp.registry.model.distroseries import DistroSeries
64 from lp.registry.model.productseries import ProductSeries
65 from lp.registry.model.sourcepackagename import SourcePackageName
66-from lp.services.database.enumcol import EnumCol
67+from lp.services.database.enumcol import DBEnum
68 from lp.services.database.interfaces import IStore
69 from lp.services.database.stormbase import StormBase
70 from lp.services.job.interfaces.job import (
71@@ -74,7 +74,7 @@ class TranslationSharingJob(StormBase):
72
73 job = Reference(job_id, Job.id)
74
75- job_type = EnumCol(enum=TranslationSharingJobType, notNull=True)
76+ job_type = DBEnum(enum=TranslationSharingJobType, allow_none=False)
77
78 productseries_id = Int('productseries')
79

Subscribers

People subscribed via source and target branches

to status/vote changes: