Added import DatabaseError needed to proper handling possible exception

pavel-zotov · pavel-zotov · commit c8ba8b3804de · 2025-07-16T18:54:01.000+03:00
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_01.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_01.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """CREATE TABLE Colors (
   ColorID INTEGER NOT NULL,
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_02.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_02.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """CREATE TABLE Colors (
   ColorID INTEGER NOT NULL,
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_03.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_03.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_04.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_04.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_05.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_05.py
@@ -20,6 +20,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_06.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_06.py
@@ -20,6 +20,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_07.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_07.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_08.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_08.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_09.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_09.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_10.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_10.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_11.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_11.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_12.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_12.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_13.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_13.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_aggregate_distribution_14.py b/tests/functional/arno/optimizer/test_opt_aggregate_distribution_14.py
@@ -21,6 +21,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_full_join_01.py b/tests/functional/arno/optimizer/test_opt_full_join_01.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     create table relations (
diff --git a/tests/functional/arno/optimizer/test_opt_full_join_02.py b/tests/functional/arno/optimizer/test_opt_full_join_02.py
@@ -27,6 +27,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     create table relations (
diff --git a/tests/functional/arno/optimizer/test_opt_full_join_03.py b/tests/functional/arno/optimizer/test_opt_full_join_03.py
@@ -23,6 +23,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     create table relations (
diff --git a/tests/functional/arno/optimizer/test_opt_full_join_04.py b/tests/functional/arno/optimizer/test_opt_full_join_04.py
@@ -23,6 +23,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     create table relations (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_01.py b/tests/functional/arno/optimizer/test_opt_inner_join_01.py
@@ -18,6 +18,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_02.py b/tests/functional/arno/optimizer/test_opt_inner_join_02.py
@@ -21,6 +21,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_03.py b/tests/functional/arno/optimizer/test_opt_inner_join_03.py
@@ -23,6 +23,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_04.py b/tests/functional/arno/optimizer/test_opt_inner_join_04.py
@@ -16,6 +16,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Countries (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_05.py b/tests/functional/arno/optimizer/test_opt_inner_join_05.py
@@ -29,6 +29,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Countries (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_06.py b/tests/functional/arno/optimizer/test_opt_inner_join_06.py
@@ -20,6 +20,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_07.py b/tests/functional/arno/optimizer/test_opt_inner_join_07.py
@@ -20,6 +20,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_08.py b/tests/functional/arno/optimizer/test_opt_inner_join_08.py
@@ -16,6 +16,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_09.py b/tests/functional/arno/optimizer/test_opt_inner_join_09.py
@@ -21,6 +21,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_10.py b/tests/functional/arno/optimizer/test_opt_inner_join_10.py
@@ -22,6 +22,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_50 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_01.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_01.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_02.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_02.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_03.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_03.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_04.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_04.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_05.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_05.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_inner_join_merge_06.py b/tests/functional/arno/optimizer/test_opt_inner_join_merge_06.py
@@ -25,6 +25,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_01.py b/tests/functional/arno/optimizer/test_opt_left_join_01.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_02.py b/tests/functional/arno/optimizer/test_opt_left_join_02.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_03.py b/tests/functional/arno/optimizer/test_opt_left_join_03.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_04.py b/tests/functional/arno/optimizer/test_opt_left_join_04.py
@@ -18,6 +18,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_05.py b/tests/functional/arno/optimizer/test_opt_left_join_05.py
@@ -22,6 +22,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_08.py b/tests/functional/arno/optimizer/test_opt_left_join_08.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_09.py b/tests/functional/arno/optimizer/test_opt_left_join_09.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_10.py b/tests/functional/arno/optimizer/test_opt_left_join_10.py
@@ -19,6 +19,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_12.py b/tests/functional/arno/optimizer/test_opt_left_join_12.py
@@ -18,6 +18,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_left_join_13.py b/tests/functional/arno/optimizer/test_opt_left_join_13.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Colors (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_01.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_01.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_02.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_02.py
@@ -23,6 +23,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_10 (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_03.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_03.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_04.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_04.py
@@ -17,6 +17,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_05.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_05.py
@@ -22,6 +22,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_mixed_joins_06.py b/tests/functional/arno/optimizer/test_opt_mixed_joins_06.py
@@ -22,6 +22,7 @@
 
 import pytest
 from firebird.qa import *
+from firebird.driver import DatabaseError
 
 init_script = """
     CREATE TABLE Table_1 (
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_01.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_01.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_02.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_02.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_03.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_03.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_04.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_04.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_05.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_05.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_06.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_06.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_07.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_07.py
diff --git a/tests/functional/arno/optimizer/test_opt_multi_index_selection_08.py b/tests/functional/arno/optimizer/test_opt_multi_index_selection_08.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_01.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_01.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_02.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_02.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_03.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_03.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_04.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_04.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_05.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_05.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_06.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_06.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_07.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_07.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_08.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_08.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_09.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_09.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_10.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_10.py
diff --git a/tests/functional/arno/optimizer/test_opt_single_index_selection_11.py b/tests/functional/arno/optimizer/test_opt_single_index_selection_11.py
