From: <mak...@us...> - 2008-02-26 11:13:01
|
Revision: 501 http://firebird.svn.sourceforge.net/firebird/?rev=501&view=rev Author: makowski Date: 2008-02-26 03:13:00 -0800 (Tue, 26 Feb 2008) Log Message: ----------- 2.1RC1 cleanup Modified Paths: -------------- qa/trunk/testsuite/bugs.qms/core_1263.qmt qa/trunk/testsuite/bugs.qms/core_878.qmt qa/trunk/testsuite/functional.qms/basic.qms/db.qms/db_62.qmt qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_12.qmt qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_13.qmt Modified: qa/trunk/testsuite/bugs.qms/core_1263.qmt =================================================================== --- qa/trunk/testsuite/bugs.qms/core_1263.qmt 2008-02-24 17:09:00 UTC (rev 500) +++ qa/trunk/testsuite/bugs.qms/core_1263.qmt 2008-02-26 11:13:00 UTC (rev 501) @@ -1,9 +1,13 @@ -<?xml version="1.0" ?><!DOCTYPE extension PUBLIC '-//QM/2.4/Extension//EN' 'http://www.codesourcery.com/qm/dtds/2.4/-//qm/2.4/extension//en.dtd'><extension class="fbqa.FirebirdTest" kind="test"><argument name="create_db_method"><enumeral>Create New</enumeral></argument><argument name="user_password"><text>masterkey</text></argument><argument name="sql_dialect"><enumeral>3</enumeral></argument><argument name="result_string"><text>GSEC> invalid switch specified in interactive mode -GSEC> invalid switch specified in interactive mode -GSEC> invalid switch specified in interactive mode -GSEC> invalid switch specified in interactive mode -GSEC> invalid switch specified in interactive mode -GSEC> invalid switch specified in interactive mode +<?xml version="1.0" ?> +<!DOCTYPE extension + PUBLIC '-//QM/2.3/Extension//EN' + 'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'> +<extension class="fbqa.FirebirdTest" kind="test"><argument name="create_db_method"><enumeral>Create New</enumeral></argument><argument name="user_password"><text>masterkey</text></argument><argument name="sql_dialect"><enumeral>3</enumeral></argument><argument name="result_string"><text>GSEC> Invalid switch specified in interactive mode +GSEC> Invalid switch specified in interactive mode +GSEC> Invalid switch specified in interactive mode +GSEC> Invalid switch specified in interactive mode +GSEC> Invalid switch specified in interactive mode +GSEC> Invalid switch specified in interactive mode GSEC> </text></argument><argument name="character_set"><enumeral>NONE</enumeral></argument><argument name="author"><text>pcisar</text></argument><argument name="page_size"><enumeral>Default</enumeral></argument><argument name="substitutions"><set/></argument><argument name="backup_file_path"><text/></argument><argument name="user_name"><text>SYSDBA</text></argument><argument name="resources"><set/></argument><argument name="expected_stderr"><text/></argument><argument name="target_version"><text>2.1</text></argument><argument name="description"><text/></argument><argument name="target_group"><text>.*</text></argument><argument name="populate_method"><enumeral>None (manual)</enumeral></argument><argument name="bug_id"><text>CORE-1263</text></argument><argument name="data_tuple"><text/></argument><argument name="db_name"><text>bug.fdb</text></argument><argument name="isql_script"><text/></argument><argument name="source_code"><text>commands = """add BADPARAM -pa PWD add BADPARAM -pas PWD add BADPARAM -password PWD Modified: qa/trunk/testsuite/bugs.qms/core_878.qmt =================================================================== --- qa/trunk/testsuite/bugs.qms/core_878.qmt 2008-02-24 17:09:00 UTC (rev 500) +++ qa/trunk/testsuite/bugs.qms/core_878.qmt 2008-02-26 11:13:00 UTC (rev 501) @@ -5,7 +5,7 @@ <extension class="fbqa.FirebirdTest" kind="test"><argument name="create_db_method"><enumeral>Create New</enumeral></argument><argument name="user_password"><text>masterkey</text></argument><argument name="sql_dialect"><enumeral>3</enumeral></argument><argument name="result_string"><text>I1 INTEGER Not Null I2 INTEGER Nullable CONSTRAINT INTEG_2: - Primary key (I1) uses explicit ascending index RDB$PRIMARY1 + Primary key (I1) I1 INTEGER Not Null I2 INTEGER Nullable CONSTRAINT PK2_PK: @@ -13,7 +13,7 @@ I1 INTEGER Not Null I2 INTEGER Nullable CONSTRAINT INTEG_5: - Primary key (I1) uses explicit ascending index RDB$PRIMARY2 + Primary key (I1) I2 INTEGER Nullable I2 INTEGER Nullable I2 INTEGER Nullable Modified: qa/trunk/testsuite/functional.qms/basic.qms/db.qms/db_62.qmt =================================================================== --- qa/trunk/testsuite/functional.qms/basic.qms/db.qms/db_62.qmt 2008-02-24 17:09:00 UTC (rev 500) +++ qa/trunk/testsuite/functional.qms/basic.qms/db.qms/db_62.qmt 2008-02-26 11:13:00 UTC (rev 501) @@ -46,11 +46,16 @@ RDB$TRIGGER_TYPE 4 POST_MODIFY <null> 1 RDB$TRIGGER_TYPE 5 PRE_ERASE <null> 1 RDB$TRIGGER_TYPE 6 POST_ERASE <null> 1 -RDB$OBJECT_TYPE 0 RELATION <null> 1 -RDB$OBJECT_TYPE 1 VIEW <null> 1 +RDB$TRIGGER_TYPE 8192 CONNECT <null> 1 +RDB$TRIGGER_TYPE 8193 DISCONNECT <null> 1 RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG =============================================================================== ======== =============================================================================== ================= =============== +RDB$TRIGGER_TYPE 8194 TRANSACTION_START <null> 1 +RDB$TRIGGER_TYPE 8195 TRANSACTION_COMMIT <null> 1 +RDB$TRIGGER_TYPE 8196 TRANSACTION_ROLLBACK <null> 1 +RDB$OBJECT_TYPE 0 RELATION <null> 1 +RDB$OBJECT_TYPE 1 VIEW <null> 1 RDB$OBJECT_TYPE 2 TRIGGER <null> 1 RDB$OBJECT_TYPE 3 COMPUTED_FIELD <null> 1 RDB$OBJECT_TYPE 4 VALIDATION <null> 1 @@ -66,14 +71,14 @@ RDB$OBJECT_TYPE 15 UDF <null> 1 RDB$OBJECT_TYPE 16 BLOB_FILTER <null> 1 RDB$OBJECT_TYPE 17 COLLATION <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$TRANSACTION_STATE 1 LIMBO <null> 1 RDB$TRANSACTION_STATE 2 COMMITTED <null> 1 RDB$TRANSACTION_STATE 3 ROLLED_BACK <null> 1 RDB$SYSTEM_FLAG 0 USER <null> 1 RDB$SYSTEM_FLAG 1 SYSTEM <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$SYSTEM_FLAG 2 QLI <null> 1 RDB$SYSTEM_FLAG 3 CHECK_CONSTRAINT <null> 1 RDB$SYSTEM_FLAG 4 REFERENTIAL_CONSTRAINT <null> 1 @@ -89,14 +94,14 @@ RDB$PROCEDURE_TYPE 2 EXECUTABLE <null> 1 RDB$PARAMETER_MECHANISM 0 NORMAL <null> 1 RDB$PARAMETER_MECHANISM 1 TYPE OF <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== MON$STATE 0 IDLE <null> 1 MON$STATE 1 ACTIVE <null> 1 MON$SHUTDOWN_MODE 0 ONLINE <null> 1 MON$SHUTDOWN_MODE 1 MULTI_USER_SHUTDOWN <null> 1 MON$SHUTDOWN_MODE 2 SINGLE_USER_SHUTDOWN <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== MON$SHUTDOWN_MODE 3 FULL_SHUTDOWN <null> 1 MON$ISOLATION_MODE 0 CONSISTENCY <null> 1 MON$ISOLATION_MODE 1 CONCURRENCY <null> 1 @@ -112,14 +117,14 @@ MON$STAT_GROUP 4 CALL <null> 1 RDB$CHARACTER_SET_NAME 0 NONE <null> 1 RDB$CHARACTER_SET_NAME 1 OCTETS <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 1 BINARY <null> 1 RDB$CHARACTER_SET_NAME 2 ASCII <null> 1 RDB$CHARACTER_SET_NAME 2 USASCII <null> 1 RDB$CHARACTER_SET_NAME 2 ASCII7 <null> 1 RDB$CHARACTER_SET_NAME 3 UNICODE_FSS <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 3 UTF_FSS <null> 1 RDB$CHARACTER_SET_NAME 3 SQL_TEXT <null> 1 RDB$CHARACTER_SET_NAME 4 UTF8 <null> 1 @@ -135,14 +140,14 @@ RDB$CHARACTER_SET_NAME 12 DOS865 <null> 1 RDB$CHARACTER_SET_NAME 12 DOS_865 <null> 1 RDB$CHARACTER_SET_NAME 21 ISO8859_1 <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 21 ISO8859_1 <null> 1 RDB$CHARACTER_SET_NAME 21 ISO88591 <null> 1 RDB$CHARACTER_SET_NAME 21 LATIN1 <null> 1 RDB$CHARACTER_SET_NAME 21 ANSI <null> 1 RDB$CHARACTER_SET_NAME 22 ISO8859_2 <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 22 ISO8859_2 <null> 1 RDB$CHARACTER_SET_NAME 22 ISO88592 <null> 1 RDB$CHARACTER_SET_NAME 22 LATIN2 <null> 1 @@ -158,14 +163,14 @@ RDB$CHARACTER_SET_NAME 34 LATIN4 <null> 1 RDB$CHARACTER_SET_NAME 34 ISO-8859-4 <null> 1 RDB$CHARACTER_SET_NAME 35 ISO8859_5 <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 35 ISO8859_5 <null> 1 RDB$CHARACTER_SET_NAME 35 ISO88595 <null> 1 RDB$CHARACTER_SET_NAME 35 ISO-8859-5 <null> 1 RDB$CHARACTER_SET_NAME 36 ISO8859_6 <null> 1 RDB$CHARACTER_SET_NAME 36 ISO8859_6 <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 36 ISO88596 <null> 1 RDB$CHARACTER_SET_NAME 36 ISO-8859-6 <null> 1 RDB$CHARACTER_SET_NAME 37 ISO8859_7 <null> 1 @@ -181,14 +186,14 @@ RDB$CHARACTER_SET_NAME 39 ISO88599 <null> 1 RDB$CHARACTER_SET_NAME 39 LATIN5 <null> 1 RDB$CHARACTER_SET_NAME 39 ISO-8859-9 <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 40 ISO8859_13 <null> 1 RDB$CHARACTER_SET_NAME 40 ISO8859_13 <null> 1 RDB$CHARACTER_SET_NAME 40 ISO885913 <null> 1 RDB$CHARACTER_SET_NAME 40 LATIN7 <null> 1 RDB$CHARACTER_SET_NAME 40 ISO-8859-13 <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 45 DOS852 <null> 1 RDB$CHARACTER_SET_NAME 45 DOS_852 <null> 1 RDB$CHARACTER_SET_NAME 46 DOS857 <null> 1 @@ -204,14 +209,14 @@ RDB$CHARACTER_SET_NAME 9 DOS_737 <null> 1 RDB$CHARACTER_SET_NAME 15 DOS775 <null> 1 RDB$CHARACTER_SET_NAME 15 DOS_775 <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 16 DOS858 <null> 1 RDB$CHARACTER_SET_NAME 16 DOS_858 <null> 1 RDB$CHARACTER_SET_NAME 17 DOS862 <null> 1 RDB$CHARACTER_SET_NAME 17 DOS_862 <null> 1 RDB$CHARACTER_SET_NAME 18 DOS864 <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 18 DOS_864 <null> 1 RDB$CHARACTER_SET_NAME 48 DOS866 <null> 1 RDB$CHARACTER_SET_NAME 48 DOS_866 <null> 1 @@ -227,14 +232,14 @@ RDB$CHARACTER_SET_NAME 54 WIN_1253 <null> 1 RDB$CHARACTER_SET_NAME 55 WIN1254 <null> 1 RDB$CHARACTER_SET_NAME 55 WIN_1254 <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 19 NEXT <null> 1 RDB$CHARACTER_SET_NAME 58 WIN1255 <null> 1 RDB$CHARACTER_SET_NAME 58 WIN_1255 <null> 1 RDB$CHARACTER_SET_NAME 59 WIN1256 <null> 1 RDB$CHARACTER_SET_NAME 59 WIN_1256 <null> 1 - -RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG -=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 60 WIN1257 <null> 1 RDB$CHARACTER_SET_NAME 60 WIN_1257 <null> 1 RDB$CHARACTER_SET_NAME 44 KSC_5601 <null> 1 @@ -250,6 +255,9 @@ RDB$CHARACTER_SET_NAME 57 DOS_936 <null> 1 RDB$CHARACTER_SET_NAME 57 WIN_936 <null> 1 RDB$CHARACTER_SET_NAME 63 KOI8R <null> 1 + +RDB$FIELD_NAME RDB$TYPE RDB$TYPE_NAME RDB$DESCRIPTION RDB$SYSTEM_FLAG +=============================================================================== ======== =============================================================================== ================= =============== RDB$CHARACTER_SET_NAME 64 KOI8U <null> 1 RDB$CHARACTER_SET_NAME 65 WIN1258 <null> 1 RDB$CHARACTER_SET_NAME 66 TIS620 <null> 1 Modified: qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_12.qmt =================================================================== --- qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_12.qmt 2008-02-24 17:09:00 UTC (rev 500) +++ qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_12.qmt 2008-02-26 11:13:00 UTC (rev 501) @@ -10,7 +10,7 @@ CONSTRAINT TEST2: Foreign key (C3) References FK (ID) On Delete Set Null CONSTRAINT INTEG_6: - Primary key (C1) uses explicit ascending index RDB$PRIMARY2 + Primary key (C1) CONSTRAINT INTEG_7: Unique key (C2) CONSTRAINT TEST: Modified: qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_13.qmt =================================================================== --- qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_13.qmt 2008-02-24 17:09:00 UTC (rev 500) +++ qa/trunk/testsuite/functional.qms/table.qms/create.qms/create_table_13.qmt 2008-02-26 11:13:00 UTC (rev 501) @@ -14,7 +14,7 @@ CONSTRAINT INTEG_8: Foreign key (C5) References FK (ID) CONSTRAINT INTEG_7: - Primary key (C4) uses explicit ascending index RDB$PRIMARY3 + Primary key (C4) CONSTRAINT INTEG_5: Unique key (C3) CONSTRAINT INTEG_9: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |