Starting to get new sqlalchemy working

alembic/env.py

@@ -6,7 +6,6 @@
 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
 
@@ -33,24 +32,6 @@ def include_object(object, name, type_, reflected, compare_to):
     return 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)):
-            return 'sa.Unicode()'
-        elif isinstance(obj, UUID):
-            autogen_context.imports.add('import residue')
-            return 'residue.UUID()'
-
-    # Default rendering for other objects
-    return False
-
-
 def process_revision_directives(context, revision, directives):
     """If an empty migration is autogenerated, don't create a script."""
     if alembic_config.cmd_opts.autogenerate:
@@ -74,7 +55,6 @@ def run_migrations_offline():
         include_object=include_object,
         url=uber.config.c.SQLALCHEMY_URL,
         target_metadata=target_metadata,
-        render_item=render_item,
         literal_binds=True,
         process_revision_directives=process_revision_directives)
 
@@ -96,7 +76,6 @@ def run_migrations_online():
             include_object=include_object,
             connection=connection,
             target_metadata=target_metadata,
-            render_item=render_item,
             process_revision_directives=process_revision_directives)
 
         with context.begin_transaction():

alembic/versions/05009fad3d3c_convert_approvedemail_to_automatedemail.py

@@ -19,8 +19,7 @@
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.schema import ForeignKey
 from sqlalchemy.sql import table
-from sqlalchemy.types import String
-import residue
+from sqlalchemy.types import String, UUID
 
 
 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', UUID()),
     sa.Column('ident', sa.Unicode()),
 )
 
 email_table = table(
     'email',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', UUID()),
     sa.Column('ident', sa.Unicode()),
-    sa.Column('automated_email_id', residue.UUID(), ForeignKey('automated_email.id')),
+    sa.Column('automated_email_id', UUID(), ForeignKey('automated_email.id')),
 )
 
 automated_email_table = table(
     'automated_email',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', UUID()),
     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', DateTime(), nullable=True))
+            batch_op.add_column(sa.Column('active_before', DateTime(), 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', DateTime(), nullable=True))
+        op.add_column('automated_email', sa.Column('active_before', DateTime(), 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', UUID(), 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', UUID(), 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,10 +14,10 @@
 depends_on = None
 
 from alembic import op
-import residue
 import sqlalchemy as sa
 from sqlalchemy import func
 from sqlalchemy.sql import and_, table, select
+from sqlalchemy.types import UUID
 
 
 
@@ -55,7 +55,7 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 attendee_table = table(
     'attendee',
-    sa.Column('id', residue.UUID()),
+    sa.Column('id', UUID()),
     sa.Column('hotel_pin', sa.Unicode()),
 )
 

alembic/versions/181ceea98b62_add_art_show_sales_tables.py

@@ -15,7 +15,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import UUID
 
 
 try:
@@ -53,23 +53,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', UUID(), 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', UUID(), nullable=True),
+    sa.Column('closed', DateTime(), 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', UUID(), nullable=False),
+    sa.Column('receipt_id', UUID(), 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', DateTime(), 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', UUID(), 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,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import DateTime
 
 
 try:
@@ -52,8 +52,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', DateTime(), nullable=True))
+    op.add_column('access_group', sa.Column('end_time', DateTime(), nullable=True))
 
 
 def downgrade():

alembic/versions/1c87fd8da02e_adds_job_visibility_column.py

@@ -16,7 +16,7 @@
 from alembic import op
 import sqlalchemy as sa
 from sqlalchemy.sql import table
-import residue
+from sqlalchemy.types import UUID
 
 
 
@@ -55,9 +55,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', UUID()),
+    sa.Column('attendee_id', UUID()),
+    sa.Column('department_id', UUID()),
 )
 
 

alembic/versions/1d2599479473_add_attendee_accounts.py

@@ -15,7 +15,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import UUID
 
 
 try:
@@ -54,14 +54,14 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table('attendee_account',
-    sa.Column('id', residue.UUID(), nullable=False),
+    sa.Column('id', UUID(), 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', UUID(), nullable=False),
+    sa.Column('attendee_account_id', UUID(), 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,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import UUID
 
 
 try:
@@ -53,8 +53,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', UUID(), nullable=False),
+        sa.Column('guest_id', UUID(), 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,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import UUID
 
 
 try:
@@ -53,7 +53,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', UUID(), 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')
 

alembic/versions/29acada458c8_add_workstation_assignments_table.py

@@ -15,7 +15,7 @@
 
 from alembic import op
 import sqlalchemy as sa
-import residue
+from sqlalchemy.types import UUID
 
 
 try:
@@ -53,7 +53,7 @@ def sqlite_column_reflect_listener(inspector, table, column_info):
 
 def upgrade():
     op.create_table('workstation_assignment',
-    sa.Column('id', residue.UUID(), nullable=False),
+    sa.Column('id', UUID(), nullable=False),
     sa.Column('reg_station_id', sa.Integer(), nullable=False),
     sa.Column('printer_id', sa.Unicode(), server_default='', nullable=False),
     sa.Column('minor_printer_id', sa.Unicode(), server_default='', nullable=False),