Merge branch 'master' into singularity

2014-11-29 21:53:22 -05:00
parent 88ee1d60be 9a8642e789
commit 7100e8997b
21 changed files with 976 additions and 651 deletions
--- a/eos/db/gamedata/metaData.py
+++ b/eos/db/gamedata/metaData.py
@@ -23,7 +23,7 @@ from eos.types import MetaData
 from eos.db import gamedata_meta

 metadata_table = Table("metadata", gamedata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                           Column("field_name", String, primary_key=True),
+                           Column("field_value", String))

 mapper(MetaData, metadata_table)