dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Some clean up and commenting out unused columns [I think]

Browse Source
This commit is contained in:
blitzmann
2020-06-25 22:01:27 -04:00
parent 45dae7a031
commit 853b65d6aa
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eos/db/gamedata/attribute.py
View File

@@ -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,

4
eos/db/gamedata/category.py
View File

@@ -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
})

22
eos/db/gamedata/marketGroup.py
View File

@@ -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)]),
}
)

23
eos/db/gamedata/metaGroup.py
View File

@@ -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))
}
)