Merge branch 'main' into oidc

Author: kitsuta

.pythonstartup.py

@@ -11,7 +11,7 @@
     initialize_db()
 
     # Make it easier to do session stuff at the command line
-    session = Session().session
+    session = Session()
 
     if c.DEV_BOX:
         admin = session.query(AdminAccount).filter(

alembic/env.py

@@ -2,11 +2,11 @@
 
 import logging
 import sys
+import sqlmodel
 from logging.config import fileConfig
 from alembic import context
 
 import uber
-from residue import CoerceUTF8, UTCDateTime, UUID
 from uber.migration import version_locations_option
 from uber.models import Choice, MultiChoice, Session
 
@@ -25,28 +25,21 @@
 logger = logging.getLogger('alembic.env')
 
 # Add the model's MetaData object here for "autogenerate" support.
-target_metadata = Session.BaseClass.metadata
+target_metadata = uber.models.MagModel.metadata
 
 
 def include_object(object, name, type_, reflected, compare_to):
     """Exclude alembic's own version tables from alembic's consideration."""
-    return not name.startswith('alembic_version')
+    return not name or not name.startswith('alembic_version')
 
 
 def render_item(type_, obj, autogen_context):
     """Apply custom rendering for selected items."""
     if type_ == 'type':
         if isinstance(obj, Choice):
             return 'sa.Integer()'
-        elif isinstance(obj, UTCDateTime):
-            autogen_context.imports.add('import residue')
-            return 'residue.UTCDateTime()'
-        elif isinstance(obj, (CoerceUTF8, MultiChoice)):
+        if isinstance(obj, sqlmodel.sql.sqltypes.AutoString):
             return 'sa.Unicode()'
-        elif isinstance(obj, UUID):
-            autogen_context.imports.add('import residue')
-            return 'residue.UUID()'
-
     # Default rendering for other objects
     return False
 

alembic/versions/05009fad3d3c_convert_approvedemail_to_automatedemail.py

@@ -20,7 +20,6 @@
 from sqlalchemy.schema import ForeignKey
 from sqlalchemy.sql import table
 from sqlalchemy.types import String
-import residue
 
 
 try:
@@ -57,20 +56,20 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 approved_email_table = table(
     'approved_email',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', sa.Uuid(as_uuid=False)),
     sa.Column('ident', sa.Unicode()),
 )
 
 email_table = table(
     'email',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', sa.Uuid(as_uuid=False)),
     sa.Column('ident', sa.Unicode()),
-    sa.Column('automated_email_id', residue.UUID(), ForeignKey('automated_email.id')),
+    sa.Column('automated_email_id', sa.Uuid(as_uuid=False), ForeignKey('automated_email.id')),
 )
 
 automated_email_table = table(
     'automated_email',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', sa.Uuid(as_uuid=False)),
     sa.Column('ident', sa.Unicode()),
     sa.Column('approved', sa.Boolean()),
 )
@@ -114,8 +113,8 @@ def upgrade():
             batch_op.add_column(sa.Column('unapproved_count', sa.Integer(), server_default='0', nullable=False))
             batch_op.add_column(sa.Column('allow_post_con', sa.Boolean(), server_default='False', nullable=False))
             batch_op.add_column(sa.Column('allow_at_the_con', sa.Boolean(), server_default='False', nullable=False))
-            batch_op.add_column(sa.Column('active_after', residue.UTCDateTime(), nullable=True))
-            batch_op.add_column(sa.Column('active_before', residue.UTCDateTime(), nullable=True))
+            batch_op.add_column(sa.Column('active_after', sa.DateTime(timezone=True), nullable=True))
+            batch_op.add_column(sa.Column('active_before', sa.DateTime(timezone=True), nullable=True))
             if 'pk_approved_email' in existing_primarykeys:
                 batch_op.drop_constraint('pk_approved_email', type_='primary')
             if 'approved_email_pkey' in existing_primarykeys:
@@ -138,8 +137,8 @@ def upgrade():
         op.add_column('automated_email', sa.Column('unapproved_count', sa.Integer(), server_default='0', nullable=False))
         op.add_column('automated_email', sa.Column('allow_post_con', sa.Boolean(), server_default='False', nullable=False))
         op.add_column('automated_email', sa.Column('allow_at_the_con', sa.Boolean(), server_default='False', nullable=False))
-        op.add_column('automated_email', sa.Column('active_after', residue.UTCDateTime(), nullable=True))
-        op.add_column('automated_email', sa.Column('active_before', residue.UTCDateTime(), nullable=True))
+        op.add_column('automated_email', sa.Column('active_after', sa.DateTime(timezone=True), nullable=True))
+        op.add_column('automated_email', sa.Column('active_before', sa.DateTime(timezone=True), nullable=True))
         if 'pk_approved_email' in existing_primarykeys:
             op.drop_constraint('pk_approved_email', 'automated_email', type_='primary')
         if 'approved_email_pkey' in existing_primarykeys:
@@ -154,14 +153,14 @@ def upgrade():
             batch_op.alter_column('dest', new_column_name='to')
             batch_op.add_column(sa.Column('bcc', sa.Unicode(), server_default='', nullable=False))
             batch_op.add_column(sa.Column('cc', sa.Unicode(), server_default='', nullable=False))
-            batch_op.add_column(sa.Column('automated_email_id', residue.UUID(), nullable=True))
+            batch_op.add_column(sa.Column('automated_email_id', sa.Uuid(as_uuid=False), nullable=True))
             batch_op.add_column(sa.Column('sender', sa.Unicode(), server_default='', nullable=False))
             batch_op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'automated_email', ['automated_email_id'], ['id'], ondelete='set null')
     else:
         op.alter_column('email', 'dest', new_column_name='to')
         op.add_column('email', sa.Column('bcc', sa.Unicode(), server_default='', nullable=False))
         op.add_column('email', sa.Column('cc', sa.Unicode(), server_default='', nullable=False))
-        op.add_column('email', sa.Column('automated_email_id', residue.UUID(), nullable=True))
+        op.add_column('email', sa.Column('automated_email_id', sa.Uuid(as_uuid=False), nullable=True))
         op.add_column('email', sa.Column('sender', sa.Unicode(), server_default='', nullable=False))
         op.create_foreign_key(op.f('fk_email_automated_email_id_automated_email'), 'email', 'automated_email', ['automated_email_id'], ['id'], ondelete='set null')
 

alembic/versions/116e5aad3a5c_adds_attendee_hotel_pin_unique_.py

@@ -14,7 +14,6 @@
 depends_on = None
 
 from alembic import op
-import residue
 import sqlalchemy as sa
 from sqlalchemy import func
 from sqlalchemy.sql import and_, table, select
@@ -55,19 +54,19 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 attendee_table = table(
     'attendee',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', sa.Uuid(as_uuid=False)),
     sa.Column('hotel_pin', sa.Unicode()),
 )
 
 
 def upgrade():
     if not is_sqlite:
         connection = op.get_bind()
-        attendees = connection.execute(select([
+        attendees = connection.execute(select(
             attendee_table.c.hotel_pin,
             func.count(attendee_table.c.id),
             func.array_agg(attendee_table.c.id),
-        ]).where(and_(
+        ).where(and_(
             attendee_table.c.hotel_pin != None,
             attendee_table.c.hotel_pin != '',
         )).group_by(

alembic/versions/181ceea98b62_add_art_show_sales_tables.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -53,23 +52,23 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 def upgrade():
     op.create_table('art_show_receipt',
-    sa.Column('id', residue.UUID(), nullable=False),
+    sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
     sa.Column('invoice_num', sa.Integer(), server_default='0', nullable=False),
-    sa.Column('attendee_id', residue.UUID(), nullable=True),
-    sa.Column('closed', residue.UTCDateTime(), nullable=True),
+    sa.Column('attendee_id', sa.Uuid(as_uuid=False), nullable=True),
+    sa.Column('closed', sa.DateTime(timezone=True), nullable=True),
     sa.ForeignKeyConstraint(['attendee_id'], ['attendee.id'], name=op.f('fk_art_show_receipt_attendee_id_attendee'), ondelete='SET NULL'),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_art_show_receipt'))
     )
     op.create_table('art_show_payment',
-    sa.Column('id', residue.UUID(), nullable=False),
-    sa.Column('receipt_id', residue.UUID(), nullable=True),
+    sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
+    sa.Column('receipt_id', sa.Uuid(as_uuid=False), nullable=True),
     sa.Column('amount', sa.Integer(), server_default='0', nullable=False),
     sa.Column('type', sa.Integer(), server_default='180350097', nullable=False),
-    sa.Column('when', residue.UTCDateTime(), nullable=False),
+    sa.Column('when', sa.DateTime(timezone=True), nullable=False),
     sa.ForeignKeyConstraint(['receipt_id'], ['art_show_receipt.id'], name=op.f('fk_art_show_payment_receipt_id_art_show_receipt'), ondelete='SET NULL'),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_art_show_payment'))
     )
-    op.add_column('art_show_piece', sa.Column('receipt_id', residue.UUID(), nullable=True))
+    op.add_column('art_show_piece', sa.Column('receipt_id', sa.Uuid(as_uuid=False), nullable=True))
     op.add_column('art_show_piece', sa.Column('winning_bid', sa.Integer(), server_default='0', nullable=True))
     op.create_foreign_key(op.f('fk_art_show_piece_receipt_id_art_show_receipt'), 'art_show_piece', 'art_show_receipt', ['receipt_id'], ['id'], ondelete='SET NULL')
 

alembic/versions/1ad8716bfc74_add_start_and_end_time_to_access_groups.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -52,8 +51,8 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 
 def upgrade():
-    op.add_column('access_group', sa.Column('start_time', residue.UTCDateTime(), nullable=True))
-    op.add_column('access_group', sa.Column('end_time', residue.UTCDateTime(), nullable=True))
+    op.add_column('access_group', sa.Column('start_time', sa.DateTime(timezone=True), nullable=True))
+    op.add_column('access_group', sa.Column('end_time', sa.DateTime(timezone=True), nullable=True))
 
 
 def downgrade():

alembic/versions/1c87fd8da02e_adds_job_visibility_column.py

@@ -16,7 +16,6 @@
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.sql import table
-import residue
 
 
 
@@ -55,9 +54,9 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 dept_membership_request_table = table(
     'dept_membership_request',
-    sa.Column('id', residue.UUID()),
-    sa.Column('attendee_id', residue.UUID()),
-    sa.Column('department_id', residue.UUID()),
+    sa.Column('id', sa.Uuid(as_uuid=False)),
+    sa.Column('attendee_id', sa.Uuid(as_uuid=False)),
+    sa.Column('department_id', sa.Uuid(as_uuid=False)),
 )
 
 

alembic/versions/1d2599479473_add_attendee_accounts.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -53,14 +52,14 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 def upgrade():
     op.create_table('attendee_account',
-    sa.Column('id', residue.UUID(), nullable=False),
+    sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
     sa.Column('email', sa.Unicode(), server_default='', nullable=False),
     sa.Column('hashed', sa.Unicode(), server_default='', nullable=False),
     sa.PrimaryKeyConstraint('id', name=op.f('pk_attendee_account'))
     )
     op.create_table('attendee_attendee_account',
-    sa.Column('attendee_id', residue.UUID(), nullable=False),
-    sa.Column('attendee_account_id', residue.UUID(), nullable=False),
+    sa.Column('attendee_id', sa.Uuid(as_uuid=False), nullable=False),
+    sa.Column('attendee_account_id', sa.Uuid(as_uuid=False), nullable=False),
     sa.ForeignKeyConstraint(['attendee_account_id'], ['attendee_account.id'], name=op.f('fk_attendee_attendee_account_attendee_account_id_attendee_account')),
     sa.ForeignKeyConstraint(['attendee_id'], ['attendee.id'], name=op.f('fk_attendee_attendee_account_attendee_id_attendee')),
     sa.UniqueConstraint('attendee_id', 'attendee_account_id', name=op.f('uq_attendee_attendee_account_attendee_id'))

alembic/versions/1dc129c4c4f0_add_guest_hospitality_checklist_step.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -53,8 +52,8 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 def upgrade():
     op.create_table('guest_hospitality',
-        sa.Column('id', residue.UUID(), nullable=False),
-        sa.Column('guest_id', residue.UUID(), nullable=False),
+        sa.Column('id', sa.Uuid(as_uuid=False), nullable=False),
+        sa.Column('guest_id', sa.Uuid(as_uuid=False), nullable=False),
         sa.Column('completed', sa.Boolean(), server_default='False', nullable=False),
         sa.ForeignKeyConstraint(['guest_id'], ['guest_group.id'], name=op.f('fk_guest_hospitality_guest_id_guest_group')),
         sa.PrimaryKeyConstraint('id', name=op.f('pk_guest_hospitality')),

alembic/versions/1f862611ba04_make_sure_agents_are_attendees.py

@@ -15,7 +15,6 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
 
 
 try:
@@ -53,7 +52,7 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 def upgrade():
     op.add_column('art_show_application', sa.Column('agent_code', sa.Unicode(), server_default='', nullable=False))
-    op.add_column('art_show_application', sa.Column('agent_id', residue.UUID(), nullable=True))
+    op.add_column('art_show_application', sa.Column('agent_id', sa.Uuid(as_uuid=False), nullable=True))
     op.create_foreign_key(op.f('fk_art_show_application_agent_id_attendee'), 'art_show_application', 'attendee', ['agent_id'], ['id'], ondelete='SET NULL')
     op.drop_column('art_show_application', 'agent_name')