|
14 | 14 | import query_farm_flight_server.auth as auth |
15 | 15 | import query_farm_flight_server.auth_manager as auth_manager |
16 | 16 | import query_farm_flight_server.auth_manager_naive as auth_manager_naive |
| 17 | +import query_farm_flight_server.exceptions as exceptions |
17 | 18 | import query_farm_flight_server.flight_handling as flight_handling |
18 | 19 | import query_farm_flight_server.flight_inventory as flight_inventory |
19 | 20 | import query_farm_flight_server.middleware as base_middleware |
@@ -669,28 +670,12 @@ def exchange_insert( |
669 | 670 | duplicates_struct = pc.filter(value_counts, pc.greater(value_counts.field("counts"), 1)) |
670 | 671 | duplicates = duplicates_struct.field("values") |
671 | 672 | if len(duplicates) > 0: |
672 | | - raise flight.FlightServerError( |
673 | | - f"Cannot insert rows with duplicate values in primary key column {column_name}: {duplicates}", |
674 | | - extra_info=msgpack.packb( |
675 | | - { |
676 | | - "exception_type": "ConstraintException", |
677 | | - "message": f"""Duplicate key "{column_name}: {duplicates[0]}" violates primary key constraint.""", |
678 | | - } |
679 | | - ), |
680 | | - ) |
| 673 | + raise exceptions.ConstraintException(column_name, duplicates) |
681 | 674 |
|
682 | 675 | already_exists = pc.is_in(insert_values, value_set=existing_table.column(column_name)) |
683 | 676 | existing_rows = pc.filter(insert_values, already_exists) |
684 | 677 | if len(existing_rows) > 0: |
685 | | - raise flight.FlightServerError( |
686 | | - f"Cannot insert rows with duplicate values in primary key column {column_name}: {duplicates}", |
687 | | - extra_info=msgpack.packb( |
688 | | - { |
689 | | - "exception_type": "ConstraintException", |
690 | | - "message": f"""Duplicate key "{column_name}: {existing_rows[0]}" violates primary key constraint.""", |
691 | | - } |
692 | | - ), |
693 | | - ) |
| 678 | + raise exceptions.ConstraintException(column_name, existing_rows[0]) |
694 | 679 |
|
695 | 680 | assert new_rows.num_rows > 0 |
696 | 681 |
|
|
0 commit comments