Suppress unwanted error messages during recorder migration (#66004)

This commit is contained in:
Erik Montnemery 2022-02-08 00:46:40 +01:00 committed by Paulus Schoutsen
parent ac63a7e01e
commit 7195372616

View File

@ -101,8 +101,8 @@ def _create_index(instance, table_name, index_name):
"be patient!",
index_name,
)
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
index.create(connection)
except (InternalError, OperationalError, ProgrammingError) as err:
@ -129,8 +129,8 @@ def _drop_index(instance, table_name, index_name):
success = False
# Engines like DB2/Oracle
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(text(f"DROP INDEX {index_name}"))
except SQLAlchemyError:
@ -140,8 +140,8 @@ def _drop_index(instance, table_name, index_name):
# Engines like SQLite, SQL Server
if not success:
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -157,8 +157,8 @@ def _drop_index(instance, table_name, index_name):
if not success:
# Engines like MySQL, MS Access
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -203,8 +203,8 @@ def _add_columns(instance, table_name, columns_def):
columns_def = [f"ADD {col_def}" for col_def in columns_def]
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -220,8 +220,8 @@ def _add_columns(instance, table_name, columns_def):
_LOGGER.info("Unable to use quick column add. Adding 1 by 1")
for column_def in columns_def:
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -271,8 +271,8 @@ def _modify_columns(instance, engine, table_name, columns_def):
else:
columns_def = [f"MODIFY {col_def}" for col_def in columns_def]
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -286,8 +286,8 @@ def _modify_columns(instance, engine, table_name, columns_def):
_LOGGER.info("Unable to use quick column modify. Modifying 1 by 1")
for column_def in columns_def:
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(
text(
@ -330,8 +330,8 @@ def _update_states_table_with_foreign_key_options(instance, engine):
)
for alter in alters:
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(DropConstraint(alter["old_fk"]))
for fkc in states_key_constraints:
@ -361,8 +361,8 @@ def _drop_foreign_key_constraints(instance, engine, table, columns):
)
for drop in drops:
try:
with session_scope(session=instance.get_session()) as session:
try:
connection = session.connection()
connection.execute(DropConstraint(drop))
except (InternalError, OperationalError):