Added/Updated tests\bugs\core_6028_test.py: Separated expected output for FB major versions prior/since 6.x.

Author: pavel-zotov

tests/bugs/core_6028_test.py

@@ -37,6 +37,13 @@
   ========
 JIRA:        CORE-6028
 FBTEST:      bugs.core_6028
+NOTES:
+    [18.07.2025] pzotov
+    1. Regression did exist after SQL schemas introduction (letter to Alex and Adriano, 03.07.2025),
+       see also: https://github.com/FirebirdSQL/firebird/issues/6278#issuecomment-3033249058
+    2. Separated expected output for FB major versions prior/since 6.x.
+       No substitutions are used to suppress schema and quotes. Discussed with dimitr, 24.06.2025 12:39.
+    Checked on 6.0.0.1020; 5.0.3.1683; 4.0.6.3221; 3.0.13.33813
 """
 
 import pytest
@@ -50,44 +57,30 @@
 
 act = python_act('db')
 
-expected_stdout = """
-    NO USER-DEFINED TRIGGERS IN JUST RESTORED DATABASE.
-    NO ACTIONS WAS LOGGED IN THE TABLE TLOG.
-    unsuccessful metadata update
-    -CREATE OR ALTER TRIGGER NEW_TRG_RDB_REL_FLDS_BI failed
-    -no permission for ALTER access to TABLE RDB$RELATION_FIELDS
-    -607
-    (335544351, 336397272, 335544352)
-    unsuccessful metadata update
-    -CREATE OR ALTER TRIGGER NEW_TRG_MON_STM_BD failed
-    -no permission for ALTER access to TABLE MON$STATEMENTS
-    -607
-    (335544351, 336397272, 335544352)
-    unsuccessful metadata update
-    -CREATE OR ALTER TRIGGER NEW_TRG_MON_ATT_BD failed
-    -no permission for ALTER access to TABLE MON$ATTACHMENTS
-    -607
-    (335544351, 336397272, 335544352)
-"""
-
 fbk_file = temp_file('core_6028_25.fbk')
 
-ddl_probes = ["""
-    create or alter trigger new_trg_rdb_rel_flds_bi for rdb$relation_fields active before insert position 0 as
-    begin
-       insert into tlog(id, action) values( gen_id(g, 111), 'rdb$relation_fields: record is to be created' );
-    end
-    """, """
-    create or alter trigger new_trg_mon_stm_bd for mon$statements active before delete position 0 as
-    begin
-       insert into tlog(id, action) values( gen_id(g, 222), 'mon$statements: record is to be removed' );
-    end
-    """, """
-    create or alter trigger new_trg_mon_att_bd for mon$attachments active before delete position 0 as
-    begin
-       insert into tlog(id, action) values( gen_id(g, 333), 'mon$attachments: record is to be removed' );
-    end
-    """]
+ddl_probes = ( 
+    """
+        create or alter trigger new_trg_rdb_rel_flds_bi for rdb$relation_fields active before insert position 0 as
+        begin
+           insert into tlog(id, action) values( gen_id(g, 111), 'rdb$relation_fields: record is to be created' );
+        end
+    """
+    ,
+    """
+        create or alter trigger new_trg_mon_stm_bd for mon$statements active before delete position 0 as
+        begin
+           insert into tlog(id, action) values( gen_id(g, 222), 'mon$statements: record is to be removed' );
+        end
+    """
+    ,
+    """
+        create or alter trigger new_trg_mon_att_bd for mon$attachments active before delete position 0 as
+        begin
+           insert into tlog(id, action) values( gen_id(g, 333), 'mon$attachments: record is to be removed' );
+        end
+    """
+)
 
 @pytest.mark.version('>=3.0.5')
 def test_1(act: Action, fbk_file: Path, db_tmp: Database, capsys):
@@ -137,8 +130,45 @@ def test_1(act: Action, fbk_file: Path, db_tmp: Database, capsys):
                 print(e)
                 print(e.sqlcode)
                 print(e.gds_codes)
-    # Check
     act.reset()
-    act.expected_stdout = expected_stdout
+
+    expected_stdout_5x = """
+        NO USER-DEFINED TRIGGERS IN JUST RESTORED DATABASE.
+        NO ACTIONS WAS LOGGED IN THE TABLE TLOG.
+        unsuccessful metadata update
+        -CREATE OR ALTER TRIGGER NEW_TRG_RDB_REL_FLDS_BI failed
+        -no permission for ALTER access to TABLE RDB$RELATION_FIELDS
+        -607
+        (335544351, 336397272, 335544352)
+        unsuccessful metadata update
+        -CREATE OR ALTER TRIGGER NEW_TRG_MON_STM_BD failed
+        -no permission for ALTER access to TABLE MON$STATEMENTS
+        -607
+        (335544351, 336397272, 335544352)
+        unsuccessful metadata update
+        -CREATE OR ALTER TRIGGER NEW_TRG_MON_ATT_BD failed
+        -no permission for ALTER access to TABLE MON$ATTACHMENTS
+        -607
+        (335544351, 336397272, 335544352)
+    """
+
+    expected_stdout_6x = """
+        NO USER-DEFINED TRIGGERS IN JUST RESTORED DATABASE.
+        NO ACTIONS WAS LOGGED IN THE TABLE TLOG.
+        CREATE OR ALTER TRIGGER "SYSTEM"."NEW_TRG_RDB_REL_FLDS_BI" failed
+        -Cannot CREATE/ALTER/DROP TRIGGER in SYSTEM schema
+        -901
+        (336397272, 336068927)
+        CREATE OR ALTER TRIGGER "SYSTEM"."NEW_TRG_MON_STM_BD" failed
+        -Cannot CREATE/ALTER/DROP TRIGGER in SYSTEM schema
+        -901
+        (336397272, 336068927)
+        CREATE OR ALTER TRIGGER "SYSTEM"."NEW_TRG_MON_ATT_BD" failed
+        -Cannot CREATE/ALTER/DROP TRIGGER in SYSTEM schema
+        -901
+        (336397272, 336068927)
+    """
+
+    act.expected_stdout = expected_stdout_5x if act.is_version('<6') else expected_stdout_6x
     act.stdout = capsys.readouterr().out
     assert act.clean_stdout == act.clean_expected_stdout