diff --git a/eos/db/gamedata/attribute.py b/eos/db/gamedata/attribute.py index f24989a6c..8a668b051 100644 --- a/eos/db/gamedata/attribute.py +++ b/eos/db/gamedata/attribute.py @@ -40,7 +40,7 @@ attributes_table = Table("dgmattribs", gamedata_meta, Column("highIsGood", Boolean), Column("iconID", Integer), Column("attributeCategory", Integer), - Column("tooltipDescription", Integer), # deprecated...? + # Column("tooltipDescription", Integer), # deprecated...? Column("unitID", Integer, ForeignKey("dgmunits.unitID"))) mapper(Attribute, typeattributes_table, diff --git a/eos/db/gamedata/category.py b/eos/db/gamedata/category.py index 20e6ac126..79ae9c989 100644 --- a/eos/db/gamedata/category.py +++ b/eos/db/gamedata/category.py @@ -27,7 +27,7 @@ import eos.config categories_table = Table("invcategories", gamedata_meta, Column("categoryID", Integer, primary_key=True), *[Column("name{}".format(lang), String) for lang in eos.config.translation_mapping.values()], - Column("description", String), # deprecated + # Column("description", String), # deprecated Column("published", Boolean), Column("iconID", Integer)) @@ -35,5 +35,5 @@ mapper(Category, categories_table, properties={ "ID" : synonym("categoryID"), "displayName": synonym("name{}".format(eos.config.lang)), - "description": deferred(categories_table.c.description) # deprecated + # "description": deferred(categories_table.c.description) # deprecated }) diff --git a/eos/db/gamedata/marketGroup.py b/eos/db/gamedata/marketGroup.py index 039973dac..1bf281ed8 100644 --- a/eos/db/gamedata/marketGroup.py +++ b/eos/db/gamedata/marketGroup.py @@ -33,14 +33,16 @@ marketgroups_table = Table("invmarketgroups", gamedata_meta, ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)), Column("iconID", Integer)) -mapper(MarketGroup, marketgroups_table, - properties={ - "items" : relation(Item, backref="marketGroup"), - "parent" : relation(MarketGroup, backref="children", - remote_side=[marketgroups_table.c.marketGroupID]), - "ID" : synonym("marketGroupID"), - "name" : synonym("marketGroupName{}".format(eos.config.lang)), - # "name_en-us" : synonym("marketGroupName_en-us"), - "description": deferred(marketgroups_table.c["marketGroupDescription{}".format(eos.config.lang)]), - }) +mapper( + MarketGroup, + marketgroups_table, + properties={ + "items" : relation(Item, backref="marketGroup"), + "parent" : relation(MarketGroup, backref="children", + remote_side=[marketgroups_table.c.marketGroupID]), + "ID" : synonym("marketGroupID"), + "name" : synonym("marketGroupName{}".format(eos.config.lang)), + "description": deferred(marketgroups_table.c["marketGroupDescription{}".format(eos.config.lang)]), + } +) diff --git a/eos/db/gamedata/metaGroup.py b/eos/db/gamedata/metaGroup.py index d2f87a736..f08b4364f 100644 --- a/eos/db/gamedata/metaGroup.py +++ b/eos/db/gamedata/metaGroup.py @@ -24,13 +24,18 @@ from eos.db import gamedata_meta from eos.gamedata import MetaGroup import eos.config -metagroups_table = Table("invmetagroups", gamedata_meta, - Column("metaGroupID", Integer, primary_key=True), - Column("metaGroupName", String), - Column("metaGroupName_zh", String), - ) +metagroups_table = Table( + "invmetagroups", + gamedata_meta, + Column("metaGroupID", Integer, primary_key=True), + *[Column("metaGroupName{}".format(lang), String) for lang in eos.config.translation_mapping.values()], +) -mapper(MetaGroup, metagroups_table, - properties={ - "ID" : synonym("metaGroupID"), - "name": synonym("metaGroupName{}".format(eos.config.lang))}) +mapper( + MetaGroup, + metagroups_table, + properties={ + "ID" : synonym("metaGroupID"), + "name": synonym("metaGroupName{}".format(eos.config.lang)) + } +)