[Firebird-checkins] SF.net SVN: firebird:[61494] qa/fbt-repository/trunk/tests/bugs/core_2826. fbt

[<ta...@us...>]

Revision: 61494
          http://sourceforge.net/p/firebird/code/61494
Author:   tabloid
Date:     2015-05-06 14:51:56 +0000 (Wed, 06 May 2015)
Log Message:
-----------
Refactored according to ticket issues, removed `SHOW TABLE` statement due to its own fail on windows builds, see core-4782

Modified Paths:
--------------
    qa/fbt-repository/trunk/tests/bugs/core_2826.fbt

Modified: qa/fbt-repository/trunk/tests/bugs/core_2826.fbt
===================================================================
--- qa/fbt-repository/trunk/tests/bugs/core_2826.fbt	2015-05-06 13:47:27 UTC (rev 61493)
+++ qa/fbt-repository/trunk/tests/bugs/core_2826.fbt	2015-05-06 14:51:56 UTC (rev 61494)
@@ -2,7 +2,7 @@
 'id': 'bugs.core_2826',
 'qmid': None,
 'tracker_id': 'CORE-2816',
-'title': 'oin condition fails for UTF-8 databases.',
+'title': 'Join condition fails for UTF-8 databases.',
 'description': '',
 'min_versions': '2.1.4',
 'versions': [
@@ -11,52 +11,57 @@
  'platform': 'All',
  'database_character_set': 'UTF8',
  'connection_character_set': 'UTF8',
+ 'test_type': 'ISQL',
  'page_size': '4096',
- 'init_script': """CREATE COLLATION UNICODE_NOPAD FOR UTF8 FROM UNICODE NO PAD;
-COMMIT;
-RECREATE TABLE tst1_nopad (
-  k1 VARCHAR(3) COLLATE UNICODE_NOPAD,
-  k2 INT,
-  k3 CHAR(1) COLLATE UNICODE_NOPAD,
-  PRIMARY KEY (k1, k2, k3)
-);
-COMMIT;
-INSERT INTO tst1_nopad VALUES ('AP', 123, ' ');
-INSERT INTO tst1_nopad VALUES ('HEL', 666, 'V');
-COMMIT;
-""",
- 'test_type': 'ISQL',
- 'test_script': """SELECT t1.*
-  FROM tst1_nopad t1
- WHERE t1.k1 = 'AP'
-   AND t1.k2 = 123
-   AND t1.k3 = ' '
-PLAN (T1 NATURAL);
-SELECT t1.*
-  FROM tst1_nopad t1
- WHERE t1.k1 = 'AP'
-   AND t1.k2 = 123
-   AND t1.k3 = ' ';
-SHOW TABLE tst1_nopad;""",
- 'expected_stdout': """Database:  localhost:C:\fbtest2\tmp\bugs.core_2826.fdb, User: SYSDBA
-SQL> CON> CON> CON> CON> CON>
-K1                     K2 K3
-============ ============ ======
-AP                    123
+ 'test_script': 
+  """
+    set autoddl off;
+    commit;
 
-SQL> CON> CON> CON> CON>
-K1                     K2 K3
-============ ============ ======
-AP                    123
+    create collation unicode_nopad for utf8 from unicode no pad;
+    -- !!! >>> COMMENTED THIS ACCORDING TO NOTES IN THE TICKET: >>> commit; <<<
+    -- Table is created in the same transaction as collation:
+    create table tst1_nopad (
+      k1 varchar(3) character set utf8 collate unicode_nopad,
+      k2 int,
+      k3 char(1)  character set utf8 collate unicode_nopad,
+      primary key (k1, k2, k3) using index txt1_nopad_pk
+    );
+    commit;
 
-SQL> K1                              VARCHAR(3) CHARACTER SET UTF8 Not Null
-                                 COLLATE UNICODE_NOPAD
-K2                              INTEGER Not Null
-K3                              CHAR(1) CHARACTER SET UTF8 Not Null
-                                 COLLATE UNICODE_NOPAD
-CONSTRAINT INTEG_1:
-  Primary key (K1, K2, K3)
-SQL>"""
+    insert into tst1_nopad values ('ap', 123, ' ');
+    insert into tst1_nopad values ('hel', 666, 'v');
+    commit;
+    
+    set list on;
+    set plan on;
+    select t1.*
+      from tst1_nopad t1
+     where t1.k1 = 'ap'
+       and t1.k2 = 123
+       and t1.k3 = ' '
+    plan (t1 natural);
+    
+    select t1.*
+      from tst1_nopad t1
+     where t1.k1 = 'ap'
+       and t1.k2 = 123
+       and t1.k3 = ' ';
+  
+     -- 'show table' was removed, see CORE-4782 ("Command `SHOW TABLE` fails..." - reproduced on Windows builds 2.5 and 3.0 only)
+  """,
+ 'expected_stdout': 
+  """
+    PLAN (T1 NATURAL)
+    K1                              ap
+    K2                              123
+    K3                                  
+
+    PLAN (T1 INDEX (TXT1_NOPAD_PK))
+    K1                              ap
+    K2                              123
+    K3                                  
+  """
 }
 ]
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.