From 72276d013aa4b7b55177d2445dc87205a09fdf11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Magnus=20M=EF=BF=BD=EF=BF=BDtt=EF=BF=BD?= Date: Thu, 10 Mar 2005 02:37:20 +0000 Subject: [PATCH] Add NOT NULL to create so the tests work with Firebird too. --- ext/pdo/tests/pdo_001.inc | 2 +- ext/pdo/tests/pdo_002.inc | 2 +- ext/pdo/tests/pdo_003.inc | 2 +- ext/pdo/tests/pdo_004.inc | 2 +- ext/pdo/tests/pdo_005.inc | 2 +- ext/pdo/tests/pdo_006.inc | 2 +- ext/pdo/tests/pdo_007.inc | 2 +- ext/pdo/tests/pdo_008.inc | 2 +- ext/pdo/tests/pdo_009.inc | 4 ++-- ext/pdo/tests/pdo_010.inc | 4 ++-- ext/pdo/tests/pdo_011.inc | 2 +- ext/pdo/tests/pdo_012.inc | 2 +- ext/pdo/tests/pdo_013.inc | 2 +- ext/pdo/tests/pdo_014.inc | 2 +- ext/pdo/tests/pdo_015.inc | 2 +- ext/pdo/tests/pdo_016.inc | 2 +- ext/pdo/tests/pdo_018.inc | 4 ++-- ext/pdo/tests/pdo_019.inc | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/pdo/tests/pdo_001.inc b/ext/pdo/tests/pdo_001.inc index 87cb8cb0bf..68c61a1746 100755 --- a/ext/pdo/tests/pdo_001.inc +++ b/ext/pdo/tests/pdo_001.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); diff --git a/ext/pdo/tests/pdo_002.inc b/ext/pdo/tests/pdo_002.inc index 46b55eb212..c1bb2b5114 100755 --- a/ext/pdo/tests/pdo_002.inc +++ b/ext/pdo/tests/pdo_002.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); diff --git a/ext/pdo/tests/pdo_003.inc b/ext/pdo/tests/pdo_003.inc index 1617bd24cd..3752a9ad4e 100755 --- a/ext/pdo/tests/pdo_003.inc +++ b/ext/pdo/tests/pdo_003.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); diff --git a/ext/pdo/tests/pdo_004.inc b/ext/pdo/tests/pdo_004.inc index 65ac45a43d..6851ec4ef6 100755 --- a/ext/pdo/tests/pdo_004.inc +++ b/ext/pdo/tests/pdo_004.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); diff --git a/ext/pdo/tests/pdo_005.inc b/ext/pdo/tests/pdo_005.inc index 691d77a596..01649b2cc3 100755 --- a/ext/pdo/tests/pdo_005.inc +++ b/ext/pdo/tests/pdo_005.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'AA\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\', \'BB\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\', \'CC\')'); diff --git a/ext/pdo/tests/pdo_006.inc b/ext/pdo/tests/pdo_006.inc index 5306201e46..30c780bc79 100755 --- a/ext/pdo/tests/pdo_006.inc +++ b/ext/pdo/tests/pdo_006.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'A\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); diff --git a/ext/pdo/tests/pdo_007.inc b/ext/pdo/tests/pdo_007.inc index 9712816bfa..265ffab85c 100755 --- a/ext/pdo/tests/pdo_007.inc +++ b/ext/pdo/tests/pdo_007.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(\'A\', \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(\'B\', \'A\')'); set_sql('insert3', 'INSERT INTO test VALUES(\'C\', \'C\')'); diff --git a/ext/pdo/tests/pdo_008.inc b/ext/pdo/tests/pdo_008.inc index d1b477ee7a..561ebd2a6d 100755 --- a/ext/pdo/tests/pdo_008.inc +++ b/ext/pdo/tests/pdo_008.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id CHAR(1) PRIMARY KEY, val VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id CHAR(1) NOT NULL PRIMARY KEY, val VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(\'A\', \'A\')'); set_sql('insert2', 'INSERT INTO test VALUES(\'B\', \'A\')'); set_sql('insert3', 'INSERT INTO test VALUES(\'C\', \'C\')'); diff --git a/ext/pdo/tests/pdo_009.inc b/ext/pdo/tests/pdo_009.inc index 8dac10203d..d54aa61a66 100755 --- a/ext/pdo/tests/pdo_009.inc +++ b/ext/pdo/tests/pdo_009.inc @@ -2,11 +2,11 @@ require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)'); +set_sql('create1', 'CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) UNIQUE)'); set_sql('insert1', 'INSERT INTO classtypes VALUES(0, \'stdClass\')'); set_sql('insert2', 'INSERT INTO classtypes VALUES(1, \'Test1\')'); set_sql('insert3', 'INSERT INTO classtypes VALUES(2, \'Test2\')'); -set_sql('create2', 'CREATE TABLE test(id int PRIMARY KEY, classtype int, val VARCHAR(10))'); +set_sql('create2', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))'); set_sql('insert4', 'INSERT INTO test VALUES(1, 0, \'A\')'); set_sql('insert5', 'INSERT INTO test VALUES(2, 1, \'B\')'); set_sql('insert6', 'INSERT INTO test VALUES(3, 2, \'C\')'); diff --git a/ext/pdo/tests/pdo_010.inc b/ext/pdo/tests/pdo_010.inc index 24bba605c2..2e4c943508 100755 --- a/ext/pdo/tests/pdo_010.inc +++ b/ext/pdo/tests/pdo_010.inc @@ -2,11 +2,11 @@ require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)'); +set_sql('create1', 'CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) UNIQUE)'); set_sql('insert1', 'INSERT INTO classtypes VALUES(0, \'stdClass\')'); set_sql('insert2', 'INSERT INTO classtypes VALUES(1, \'Test1\')'); set_sql('insert3', 'INSERT INTO classtypes VALUES(2, \'Test2\')'); -set_sql('create2', 'CREATE TABLE test(id int PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))'); +set_sql('create2', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))'); set_sql('insert4', 'INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')'); set_sql('insert5', 'INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')'); set_sql('insert6', 'INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')'); diff --git a/ext/pdo/tests/pdo_011.inc b/ext/pdo/tests/pdo_011.inc index 365427e29d..896abb3575 100755 --- a/ext/pdo/tests/pdo_011.inc +++ b/ext/pdo/tests/pdo_011.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'Group1\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\', \'Group1\')'); set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\', \'Group2\')'); diff --git a/ext/pdo/tests/pdo_012.inc b/ext/pdo/tests/pdo_012.inc index 3b1b36f183..ee07b41143 100755 --- a/ext/pdo/tests/pdo_012.inc +++ b/ext/pdo/tests/pdo_012.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'Group1\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\', \'Group2\')'); set_sql('select1', 'SELECT val, grp FROM test'); diff --git a/ext/pdo/tests/pdo_013.inc b/ext/pdo/tests/pdo_013.inc index 85a3a9e56e..359c2b1cb6 100755 --- a/ext/pdo/tests/pdo_013.inc +++ b/ext/pdo/tests/pdo_013.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'Group1\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\', \'Group2\')'); set_sql('select1', 'SELECT val, grp FROM test'); diff --git a/ext/pdo/tests/pdo_014.inc b/ext/pdo/tests/pdo_014.inc index 512511250d..fe4e435e4e 100755 --- a/ext/pdo/tests/pdo_014.inc +++ b/ext/pdo/tests/pdo_014.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); +set_sql('create', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'Group1\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'B\', \'Group2\')'); set_sql('select1', 'SELECT val, grp FROM test'); diff --git a/ext/pdo/tests/pdo_015.inc b/ext/pdo/tests/pdo_015.inc index c35a5bd021..cbcfb587dc 100755 --- a/ext/pdo/tests/pdo_015.inc +++ b/ext/pdo/tests/pdo_015.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE test(id int PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))'); +set_sql('create1', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))'); set_sql('insert1', 'INSERT INTO test VALUES(1, \'A\', \'A2\')'); set_sql('insert2', 'INSERT INTO test VALUES(2, \'A\', \'B2\')'); set_sql('select1', 'SELECT id, val, val2 FROM test'); diff --git a/ext/pdo/tests/pdo_016.inc b/ext/pdo/tests/pdo_016.inc index a366a3ee3d..3fece6e2ad 100755 --- a/ext/pdo/tests/pdo_016.inc +++ b/ext/pdo/tests/pdo_016.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE test(idx int PRIMARY KEY, txt VARCHAR(20))'); +set_sql('create1', 'CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))'); set_sql('insert1', 'INSERT INTO test VALUES(0, \'String0\')'); set_sql('insert2', 'INSERT INTO test VALUES(1, \'String1\')'); set_sql('insert3', 'INSERT INTO test VALUES(2, \'String2\')'); diff --git a/ext/pdo/tests/pdo_018.inc b/ext/pdo/tests/pdo_018.inc index 993bd688a2..cecfc216f8 100755 --- a/ext/pdo/tests/pdo_018.inc +++ b/ext/pdo/tests/pdo_018.inc @@ -54,13 +54,13 @@ class TestLeaf extends TestDerived require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(20) UNIQUE)'); +set_sql('create1', 'CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(20) UNIQUE)'); set_sql('insert1', 'INSERT INTO classtypes VALUES(0, \'stdClass\')'); set_sql('insert2', 'INSERT INTO classtypes VALUES(1, \'TestBase\')'); set_sql('insert3', 'INSERT INTO classtypes VALUES(2, \'TestDerived\')'); set_sql('selectC', 'SELECT COUNT(*) FROM classtypes'); set_sql('select0', 'SELECT id, name FROM classtypes ORDER by id'); -set_sql('create2', 'CREATE TABLE test(id int PRIMARY KEY, classtype int, val VARCHAR(255))'); +set_sql('create2', 'CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(255))'); set_sql('insert4', 'INSERT INTO test VALUES(:id, :classtype, :val)'); set_sql('select1', 'SELECT id FROM classtypes WHERE name=:cname'); set_sql('select2', 'SELECT test.val FROM test'); diff --git a/ext/pdo/tests/pdo_019.inc b/ext/pdo/tests/pdo_019.inc index 48b6d75f70..a61ebd3eed 100755 --- a/ext/pdo/tests/pdo_019.inc +++ b/ext/pdo/tests/pdo_019.inc @@ -2,7 +2,7 @@ require_once('pdo.inc'); -set_sql('create1', 'CREATE TABLE test(idx int PRIMARY KEY, txt VARCHAR(20))'); +set_sql('create1', 'CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))'); set_sql('insert1', 'INSERT INTO test VALUES(0, \'String0\')'); set_sql('insert2', 'INSERT INTO test VALUES(1, \'String1\')'); set_sql('insert3', 'INSERT INTO test VALUES(2, \'String2\')'); -- 2.50.1