Merge branch 'release/1.5.4'

CHANGELOG.md

@@ -1,4 +1,7 @@
 #Changelog
+* 1.5.4:
+  * Fixes:
+    * Corrected error in databases scheme to represent dogma attributes, which blocked imports
 * 1.5.3:
   * Fixes:
     * Fixed exception during ESI error handling, by calling a none existant method

migrations/versions/5d4aee209354_.py

@@ -0,0 +1,33 @@
+"""empty message
+
+Revision ID: 5d4aee209354
+Revises: 99cd2a081a3c
+Create Date: 2018-11-16 15:15:44.885014
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# revision identifiers, used by Alembic.
+revision = '5d4aee209354'
+down_revision = '99cd2a081a3c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ##
+    op.alter_column('dogma_attributes', 'value',
+               existing_type=sa.Integer(),
+               type_=sa.Float(),
+               existing_nullable=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ##
+    op.alter_column('dogma_attributes', 'value',
+               existing_type=sa.Float(),
+               type_=sa.Integer(),
+               existing_nullable=True)
+    # ### end Alembic commands ###

waitlist/data/version.py

@@ -1 +1 @@
-version = "1.5.3-$Format:%h$"
+version = "1.5.4-$Format:%h$"

waitlist/storage/database.py

@@ -347,7 +347,7 @@ class InvTypeDogmaAttribute(Base):
                                ondelete='CASCADE'),
                     primary_key=True, autoincrement=False)
     attributeID = Column('attribute_id', Integer, primary_key=True)
-    value = Column('value', Integer)
+    value = Column('value', Float)
 
 
 class InvTypeDogmaEffect(Base):