Fixed install on enrollment and connection in the DB upgrade code

brian7704 · Sep 20, 2024 · 861fbf5 · 861fbf5
1 parent 2a445ad
commit 861fbf5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/opentakserver/migrations/versions/34dc96ee805b_changed_device_profile_table.py b/opentakserver/migrations/versions/34dc96ee805b_changed_device_profile_table.py
@@ -18,14 +18,6 @@
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table('data_packages', schema=None) as batch_op:
-        batch_op.alter_column('install_on_enrollment',
-               existing_type=sa.BOOLEAN(),
-               nullable=False)
-        batch_op.alter_column('install_on_connection',
-               existing_type=sa.BOOLEAN(),
-               nullable=False)
-
     with op.batch_alter_table('device_profiles', schema=None) as batch_op:
         batch_op.add_column(sa.Column('id', sa.Integer(), nullable=False))
         batch_op.alter_column('preference_key',
@@ -55,12 +47,4 @@ def downgrade():
                nullable=False)
         batch_op.drop_column('id')
 
-    with op.batch_alter_table('data_packages', schema=None) as batch_op:
-        batch_op.alter_column('install_on_connection',
-               existing_type=sa.BOOLEAN(),
-               nullable=True)
-        batch_op.alter_column('install_on_enrollment',
-               existing_type=sa.BOOLEAN(),
-               nullable=True)
-
     # ### end Alembic commands ###
diff --git a/opentakserver/migrations/versions/414b87c32cc2_added_device_profile_and_package_tables.py b/opentakserver/migrations/versions/414b87c32cc2_added_device_profile_and_package_tables.py
@@ -22,8 +22,8 @@ def upgrade():
     sa.Column('preference_key', sa.String(), nullable=False),
     sa.Column('preference_value', sa.String(), nullable=False),
     sa.Column('value_class', sa.String(), nullable=False),
-    sa.Column('enrollment', sa.Boolean(), nullable=False),
-    sa.Column('connection', sa.Boolean(), nullable=False),
+    sa.Column('enrollment', sa.Boolean(), nullable=True),
+    sa.Column('connection', sa.Boolean(), nullable=True),
     sa.Column('tool', sa.String(), nullable=True),
     sa.Column('active', sa.Boolean(), nullable=False),
     sa.Column('publish_time', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
@@ -45,8 +45,8 @@ def upgrade():
     sa.Column('file_size', sa.Integer(), nullable=False),
     sa.Column('icon', sa.BLOB(), nullable=True),
     sa.Column('icon_filename', sa.String(), nullable=True),
-    sa.Column('install_on_enrollment', sa.Boolean(), nullable=False),
-    sa.Column('install_on_connection', sa.Boolean(), nullable=False),
+    sa.Column('install_on_enrollment', sa.Boolean(), nullable=True),
+    sa.Column('install_on_connection', sa.Boolean(), nullable=True),
     sa.PrimaryKeyConstraint('id'),
     sa.UniqueConstraint('package_name')
     )