Add NOT NULL to create so the tests work with Firebird too.

diff --git a/ext/pdo/tests/pdo_001.inc b/ext/pdo/tests/pdo_001.inc
index 87cb8cb0bf9d7f0425340b91ff8bd41c3d2e3ee1..68c61a1746fa40149ee69b4d92c45c3122eb9d34 100755 (executable)
--- 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 46b55eb212f3e20a73c5a3b76e8c9292429eeb2a..c1bb2b51147c7daa9dfe90def1ca7fcfa6a36558 100755 (executable)
--- 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 1617bd24cd57952fb704dee633261c090046a520..3752a9ad4ef6fbff3e0897881d53b1ffb3becc80 100755 (executable)
--- 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 65ac45a43d28d0e54e588108dcd1e178bc455045..6851ec4ef6ea6aa842ed43d54639c7eb0a65c5dc 100755 (executable)
--- 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 691d77a596336c94d4253a274f40fff8a948356e..01649b2cc3ccc98cd1b942ed4ba389274da24718 100755 (executable)
--- 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 5306201e466e81f0df3ff4591e2fa5f6bf1221c3..30c780bc790d9e57aec41799fd3050282871e10a 100755 (executable)
--- 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 9712816bfa9add3e55ef6d51dc17c49f996efd3e..265ffab85c6dede3a444ea2b19698bbd83b79443 100755 (executable)
--- 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 d1b477ee7a4387012f693843fea39aaca2eff301..561ebd2a6d8407a8e45811c0d4c6c1aa9852d0d9 100755 (executable)
--- 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 8dac10203df6e2a8e487ccfc522ac5815bf8c804..d54aa61a6618467929701aa1627decadf69dfc8a 100755 (executable)
--- 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 24bba605c2bbfc46c9c833fa696ce96ebaf23df3..2e4c943508a8c8e18d761c5a76b5fddfbcdc9fc2 100755 (executable)
--- 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 365427e29d3add42c51d971f0a24a936b10c88b8..896abb3575be724406c21e1835eb7b78dd9d004e 100755 (executable)
--- 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 3b1b36f183cdd9d2af7f23873fad5094058bc927..ee07b411436c38d7d21d70e1f2fdee8c936a565f 100755 (executable)
--- 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 85a3a9e56eb23dc385747aa8fad33bdac81494c9..359c2b1cb695388d524f466762780bc6f94bbd7d 100755 (executable)
--- 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 512511250df927f45f58484dbdc12c94a1dec865..fe4e435e4e4a83fcabe20427464c4f9ab764b714 100755 (executable)
--- 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 c35a5bd021f52904511c9afa55a113ad65ab5644..cbcfb587dca591fd7f2262c6134cc4c26c4ed8fb 100755 (executable)
--- 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 a366a3ee3d98bdb1c8ba1895b4a24f2e0b4b69a3..3fece6e2adadd3b6a1481c3e168f0a3a589ed92f 100755 (executable)
--- 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 993bd688a2fd580f21fe3d20eb747d45958c9c45..cecfc216f8d9bbcde5dc7d6bd051f29a6adc51aa 100755 (executable)
--- 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 48b6d75f70ade0c899f91422b913e1b08c60e0cf..a61ebd3eeddd1278224e6efdd6a2288e9e85a9a7 100755 (executable)
--- 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\')');