cvs: php-src /ext/pdo/tests pdo_001.inc pdo_002.inc pdo_003.inc pdo_004.inc pdo_005.inc pdo_006.inc pdo_007.inc pdo_008.inc pdo_009.inc pdo_010.inc
pdo_011.inc pdo_012.inc pdo_013.inc pdo_014.inc

From: Date: Sat, 26 Feb 2005 15:35:42 +0000
Subject: cvs: php-src /ext/pdo/tests pdo_001.inc pdo_002.inc pdo_003.inc pdo_004.inc pdo_005.inc pdo_006.inc pdo_007.inc pdo_008.inc pdo_009.inc pdo_010.inc
pdo_011.inc pdo_012.inc pdo_013.inc pdo_014.inc
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-30610@lists.php.net to get a copy of this message
wez Sat Feb 26 10:35:42 2005 EDT Modified files: /php-src/ext/pdo/tests pdo_001.inc pdo_002.inc pdo_003.inc pdo_004.inc pdo_005.inc pdo_006.inc pdo_007.inc pdo_008.inc pdo_009.inc pdo_010.inc pdo_011.inc pdo_012.inc pdo_013.inc pdo_014.inc Log: fix broken line endings

http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_001.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_001.inc diff -u php-src/ext/pdo/tests/pdo_001.inc:1.2 php-src/ext/pdo/tests/pdo_001.inc:1.3 --- php-src/ext/pdo/tests/pdo_001.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_001.inc Sat Feb 26 10:35:41 2005 @@ -1,20 +1,20 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); set_sql('select', 'SELECT * FROM test'); - - + + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -$stmt = $DB->query($SQL['select']); - -var_dump($stmt->fetchAll(PDO_FETCH_ASSOC)); -?> + +$stmt = $DB->query($SQL['select']); + +var_dump($stmt->fetchAll(PDO_FETCH_ASSOC)); +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_002.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_002.inc diff -u php-src/ext/pdo/tests/pdo_002.inc:1.2 php-src/ext/pdo/tests/pdo_002.inc:1.3 --- php-src/ext/pdo/tests/pdo_002.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_002.inc Sat Feb 26 10:35:41 2005 @@ -1,21 +1,21 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); set_sql('select', 'SELECT * FROM test'); - - + + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -$stmt = $DB->query($SQL['select']); - -var_dump($stmt->fetchAll(PDO_FETCH_NUM)); - -?> + +$stmt = $DB->query($SQL['select']); + +var_dump($stmt->fetchAll(PDO_FETCH_NUM)); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_003.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_003.inc diff -u php-src/ext/pdo/tests/pdo_003.inc:1.2 php-src/ext/pdo/tests/pdo_003.inc:1.3 --- php-src/ext/pdo/tests/pdo_003.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_003.inc Sat Feb 26 10:35:41 2005 @@ -1,20 +1,20 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); set_sql('select', 'SELECT * FROM test'); - - + + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -$stmt = $DB->query($SQL['select']); - -var_dump($stmt->fetchAll(PDO_FETCH_BOTH)); -?> + +$stmt = $DB->query($SQL['select']); + +var_dump($stmt->fetchAll(PDO_FETCH_BOTH)); +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_004.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_004.inc diff -u php-src/ext/pdo/tests/pdo_004.inc:1.2 php-src/ext/pdo/tests/pdo_004.inc:1.3 --- php-src/ext/pdo/tests/pdo_004.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_004.inc Sat Feb 26 10:35:41 2005 @@ -1,20 +1,20 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); set_sql('select', 'SELECT * FROM test'); - - + + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -$stmt = $DB->query($SQL['select']); - -var_dump($stmt->fetchAll(PDO_FETCH_OBJ)); -?> + +$stmt = $DB->query($SQL['select']); + +var_dump($stmt->fetchAll(PDO_FETCH_OBJ)); +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_005.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_005.inc diff -u php-src/ext/pdo/tests/pdo_005.inc:1.2 php-src/ext/pdo/tests/pdo_005.inc:1.3 --- php-src/ext/pdo/tests/pdo_005.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_005.inc Sat Feb 26 10:35:41 2005 @@ -1,38 +1,38 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\', \'CC\')'); set_sql('select', 'SELECT id, val, val2 FROM test'); - - -$DB->exec($SQL['create']); + + +$DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -class TestBase -{ - public $id; - protected $val; - private $val2; -} - -class TestDerived extends TestBase -{ - protected $row; - - public function __construct(&$row) - { - echo __METHOD__ . "($row,{$this->id})\n"; - $this->row = $row++; - } -} - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS)); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestBase')); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestDerived', array(0))); -?> + +class TestBase +{ + public $id; + protected $val; + private $val2; +} + +class TestDerived extends TestBase +{ + protected $row; + + public function __construct(&$row) + { + echo __METHOD__ . "($row,{$this->id})\n"; + $this->row = $row++; + } +} + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS)); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestBase')); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS, 'TestDerived', array(0))); +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_006.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_006.inc diff -u php-src/ext/pdo/tests/pdo_006.inc:1.2 php-src/ext/pdo/tests/pdo_006.inc:1.3 --- php-src/ext/pdo/tests/pdo_006.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_006.inc Sat Feb 26 10:35:41 2005 @@ -1,20 +1,20 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(3, \'C\')'); set_sql('select', 'SELECT val, id FROM test'); - - + + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_GROUP)); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_GROUP)); - -?> + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_GROUP)); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_GROUP)); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_007.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_007.inc diff -u php-src/ext/pdo/tests/pdo_007.inc:1.2 php-src/ext/pdo/tests/pdo_007.inc:1.3 --- php-src/ext/pdo/tests/pdo_007.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_007.inc Sat Feb 26 10:35:41 2005 @@ -1,19 +1,19 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id CHAR(1) 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(\'C\', \'C\')'); set_sql('select', 'SELECT id, val FROM test'); - + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE)); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_UNIQUE)); - -?> + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE)); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_ASSOC|PDO_FETCH_UNIQUE)); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_008.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_008.inc diff -u php-src/ext/pdo/tests/pdo_008.inc:1.2 php-src/ext/pdo/tests/pdo_008.inc:1.3 --- php-src/ext/pdo/tests/pdo_008.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_008.inc Sat Feb 26 10:35:41 2005 @@ -1,19 +1,19 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id CHAR(1) 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\')'); +set_sql('insert3', 'INSERT INTO test VALUES(\'C\', \'C\')'); set_sql('select', 'SELECT val, id FROM test'); - + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE)); -// check that repeated first columns overwrite existing array elements - -?> + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM|PDO_FETCH_UNIQUE)); +// check that repeated first columns overwrite existing array elements + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_009.inc?r1=1.2&r2=1.3&ty=u Index: php-src/ext/pdo/tests/pdo_009.inc diff -u php-src/ext/pdo/tests/pdo_009.inc:1.2 php-src/ext/pdo/tests/pdo_009.inc:1.3 --- php-src/ext/pdo/tests/pdo_009.inc:1.2 Sun Feb 20 14:25:17 2005 +++ php-src/ext/pdo/tests/pdo_009.inc Sat Feb 26 10:35:41 2005 @@ -1,7 +1,7 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)'); set_sql('insert1', 'INSERT INTO classtypes VALUES(0, \'stdClass\')'); set_sql('insert2', 'INSERT INTO classtypes VALUES(1, \'Test1\')'); @@ -11,8 +11,8 @@ set_sql('insert5', 'INSERT INTO test VALUES(2, 1, \'B\')'); set_sql('insert6', 'INSERT INTO test VALUES(3, 2, \'C\')'); set_sql('insert7', 'INSERT INTO test VALUES(4, 3, \'D\')'); -set_sql('select', 'SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); - +set_sql('select', 'SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); + $DB->exec($SQL['create1']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); @@ -22,32 +22,32 @@ $DB->exec($SQL['insert5']); $DB->exec($SQL['insert6']); $DB->exec($SQL['insert7']); - -class Test1 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -class Test2 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -class Test3 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM)); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE, 'Test3')); - -?> + +class Test1 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +class Test2 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +class Test3 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_NUM)); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE, 'Test3')); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_010.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_010.inc diff -u php-src/ext/pdo/tests/pdo_010.inc:1.1 php-src/ext/pdo/tests/pdo_010.inc:1.2 --- php-src/ext/pdo/tests/pdo_010.inc:1.1 Mon Feb 21 13:55:50 2005 +++ php-src/ext/pdo/tests/pdo_010.inc Sat Feb 26 10:35:41 2005 @@ -1,7 +1,7 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create1', 'CREATE TABLE classtypes(id int PRIMARY KEY, name VARCHAR(10) UNIQUE)'); set_sql('insert1', 'INSERT INTO classtypes VALUES(0, \'stdClass\')'); set_sql('insert2', 'INSERT INTO classtypes VALUES(1, \'Test1\')'); @@ -11,8 +11,8 @@ set_sql('insert5', 'INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')'); set_sql('insert6', 'INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')'); set_sql('insert7', 'INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')'); -set_sql('select', 'SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); - +set_sql('select', 'SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id'); + $DB->exec($SQL['create1']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); @@ -22,32 +22,32 @@ $DB->exec($SQL['insert5']); $DB->exec($SQL['insert6']); $DB->exec($SQL['insert7']); - -class Test1 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -class Test2 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -class Test3 -{ - public function __construct() - { - echo __METHOD__ . "()\n"; - } -} - -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE|PDO_FETCH_GROUP, 'Test3')); -var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE|PDO_FETCH_UNIQUE, 'Test3')); - -?> + +class Test1 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +class Test2 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +class Test3 +{ + public function __construct() + { + echo __METHOD__ . "()\n"; + } +} + +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE|PDO_FETCH_GROUP, 'Test3')); +var_dump($DB->query($SQL['select'])->fetchAll(PDO_FETCH_CLASS|PDO_FETCH_CLASSTYPE|PDO_FETCH_UNIQUE, 'Test3')); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_011.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_011.inc diff -u php-src/ext/pdo/tests/pdo_011.inc:1.1 php-src/ext/pdo/tests/pdo_011.inc:1.2 --- php-src/ext/pdo/tests/pdo_011.inc:1.1 Tue Feb 22 15:25:56 2005 +++ php-src/ext/pdo/tests/pdo_011.inc Sat Feb 26 10:35:41 2005 @@ -1,67 +1,67 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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\')'); set_sql('insert4', 'INSERT INTO test VALUES(4, \'D\', \'Group2\')'); -set_sql('select1', 'SELECT grp, id FROM test'); -set_sql('select2', 'SELECT id, val FROM test'); - +set_sql('select1', 'SELECT grp, id FROM test'); +set_sql('select2', 'SELECT id, val FROM test'); + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); $DB->exec($SQL['insert3']); $DB->exec($SQL['insert4']); - -class Test1 -{ - public function __construct($id, $val) - { - echo __METHOD__ . "($id,$val)\n"; - $this->id = $id; - $this->val = $val; - } - - static public function factory($id, $val) - { - echo __METHOD__ . "($id,$val)\n"; - return new self($id, $val); - } -} - -function test($id,$val='N/A') -{ - echo __METHOD__ . "($id,$val)\n"; - return array($id=>$val); -} - -$f = new Test1(0,0); - -var_dump($DB->query($SQL['select1'])->fetchAll(PDO_FETCH_FUNC|PDO_FETCH_GROUP, 'test')); -var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, 'test')); -var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, array('Test1','factory'))); -var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, array($f, 'factory'))); - -class DerivedStatement extends PDOStatement -{ - private function __construct($name, $db) - { - $this->name = $name; - echo __METHOD__ . "($name)\n"; - } - - function retrieve($id, $val) { - echo __METHOD__ . "($id,$val)\n"; - return array($id=>$val); - } -} - -$stmt = $DB->prepare($SQL['select2'], array(PDO_ATTR_STATEMENT_CLASS=>array('DerivedStatement', array('Overloaded', $DB)))); -var_dump(get_class($stmt)); -$stmt->execute(); -var_dump($stmt->fetchAll(PDO_FETCH_FUNC, array($stmt, 'retrieve'))); - -?> + +class Test1 +{ + public function __construct($id, $val) + { + echo __METHOD__ . "($id,$val)\n"; + $this->id = $id; + $this->val = $val; + } + + static public function factory($id, $val) + { + echo __METHOD__ . "($id,$val)\n"; + return new self($id, $val); + } +} + +function test($id,$val='N/A') +{ + echo __METHOD__ . "($id,$val)\n"; + return array($id=>$val); +} + +$f = new Test1(0,0); + +var_dump($DB->query($SQL['select1'])->fetchAll(PDO_FETCH_FUNC|PDO_FETCH_GROUP, 'test')); +var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, 'test')); +var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, array('Test1','factory'))); +var_dump($DB->query($SQL['select2'])->fetchAll(PDO_FETCH_FUNC, array($f, 'factory'))); + +class DerivedStatement extends PDOStatement +{ + private function __construct($name, $db) + { + $this->name = $name; + echo __METHOD__ . "($name)\n"; + } + + function retrieve($id, $val) { + echo __METHOD__ . "($id,$val)\n"; + return array($id=>$val); + } +} + +$stmt = $DB->prepare($SQL['select2'], array(PDO_ATTR_STATEMENT_CLASS=>array('DerivedStatement', array('Overloaded', $DB)))); +var_dump(get_class($stmt)); +$stmt->execute(); +var_dump($stmt->fetchAll(PDO_FETCH_FUNC, array($stmt, 'retrieve'))); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_012.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_012.inc diff -u php-src/ext/pdo/tests/pdo_012.inc:1.1 php-src/ext/pdo/tests/pdo_012.inc:1.2 --- php-src/ext/pdo/tests/pdo_012.inc:1.1 Wed Feb 23 19:14:50 2005 +++ php-src/ext/pdo/tests/pdo_012.inc Sat Feb 26 10:35:41 2005 @@ -1,32 +1,32 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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'); - +set_sql('select1', 'SELECT val, grp FROM test'); + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); - -$stmt = $DB->query($SQL['select1'], PDO_FETCH_NUM); -var_dump($stmt->fetchAll()); - -class Test -{ - function __construct($name = 'N/A') - { - echo __METHOD__ . "($name)\n"; - } -} - -$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test'); -var_dump($stmt->fetchAll()); - -$stmt = $DB->query($SQL['select1'], PDO_FETCH_NUM); -$stmt->setFetchMode(PDO_FETCH_CLASS, 'Test', array('Changed')); -var_dump($stmt->fetchAll()); - -?> + +$stmt = $DB->query($SQL['select1'], PDO_FETCH_NUM); +var_dump($stmt->fetchAll()); + +class Test +{ + function __construct($name = 'N/A') + { + echo __METHOD__ . "($name)\n"; + } +} + +$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test'); +var_dump($stmt->fetchAll()); + +$stmt = $DB->query($SQL['select1'], PDO_FETCH_NUM); +$stmt->setFetchMode(PDO_FETCH_CLASS, 'Test', array('Changed')); +var_dump($stmt->fetchAll()); + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_013.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_013.inc diff -u php-src/ext/pdo/tests/pdo_013.inc:1.1 php-src/ext/pdo/tests/pdo_013.inc:1.2 --- php-src/ext/pdo/tests/pdo_013.inc:1.1 Wed Feb 23 19:14:50 2005 +++ php-src/ext/pdo/tests/pdo_013.inc Sat Feb 26 10:35:41 2005 @@ -1,39 +1,39 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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'); - +set_sql('select1', 'SELECT val, grp FROM test'); + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); - -foreach($DB->query($SQL['select1'], PDO_FETCH_NUM) as $data) -{ - var_dump($data); -} - -class Test -{ - function __construct($name = 'N/A') - { - echo __METHOD__ . "($name)\n"; - } -} - -foreach($DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test') as $data) -{ - var_dump($data); -} - -$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test', array('WOW')); - -foreach($stmt as $data) -{ - var_dump($data); -} - -?> + +foreach($DB->query($SQL['select1'], PDO_FETCH_NUM) as $data) +{ + var_dump($data); +} + +class Test +{ + function __construct($name = 'N/A') + { + echo __METHOD__ . "($name)\n"; + } +} + +foreach($DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test') as $data) +{ + var_dump($data); +} + +$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test', array('WOW')); + +foreach($stmt as $data) +{ + var_dump($data); +} + +?> http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_014.inc?r1=1.1&r2=1.2&ty=u Index: php-src/ext/pdo/tests/pdo_014.inc diff -u php-src/ext/pdo/tests/pdo_014.inc:1.1 php-src/ext/pdo/tests/pdo_014.inc:1.2 --- php-src/ext/pdo/tests/pdo_014.inc:1.1 Wed Feb 23 19:14:50 2005 +++ php-src/ext/pdo/tests/pdo_014.inc Sat Feb 26 10:35:41 2005 @@ -1,61 +1,61 @@ <?php # vim:ft=php - -require_once('pdo.inc'); - + +require_once('pdo.inc'); + set_sql('create', 'CREATE TABLE test(id int 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'); - +set_sql('select1', 'SELECT val, grp FROM test'); + $DB->exec($SQL['create']); $DB->exec($SQL['insert1']); $DB->exec($SQL['insert2']); - -class Test -{ - function __construct($name = 'N/A') - { - echo __METHOD__ . "($name)\n"; - } -} - -$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test', array('WOW')); - -$it = new IteratorIterator($stmt); /* check if we can convert that thing */ - -/*** HINT: If YOU plan to do so remember not to call rewind() -> see below ***/ - -foreach($it as $data) -{ - var_dump($data); -} - -$it->next(); /* must be allowed */ -var_dump($it->current()); /* must return NULL */ -var_dump($it->valid()); /* must return false */ - -class PDOStatementAggregate extends PDOStatement implements IteratorAggregate -{ - private function __construct() - { - echo __METHOD__ . "\n"; - $this->setFetchMode(PDO_FETCH_NUM); - /* default fetch mode is BOTH, so we see if the ctor can overwrite that */ - } - - function getIterator() - { - echo __METHOD__ . "\n"; - $this->execute(); - return new IteratorIterator($this, 'PDOStatement'); - } -} - -$stmt = $DB->prepare($SQL['select1'], array(PDO_ATTR_STATEMENT_CLASS=>array('PDOStatementAggregate'))); - -foreach($stmt as $data) -{ - var_dump($data); -} - -?> + +class Test +{ + function __construct($name = 'N/A') + { + echo __METHOD__ . "($name)\n"; + } +} + +$stmt = $DB->query($SQL['select1'], PDO_FETCH_CLASS, 'Test', array('WOW')); + +$it = new IteratorIterator($stmt); /* check if we can convert that thing */ + +/*** HINT: If YOU plan to do so remember not to call rewind() -> see below ***/ + +foreach($it as $data) +{ + var_dump($data); +} + +$it->next(); /* must be allowed */ +var_dump($it->current()); /* must return NULL */ +var_dump($it->valid()); /* must return false */ + +class PDOStatementAggregate extends PDOStatement implements IteratorAggregate +{ + private function __construct() + { + echo __METHOD__ . "\n"; + $this->setFetchMode(PDO_FETCH_NUM); + /* default fetch mode is BOTH, so we see if the ctor can overwrite that */ + } + + function getIterator() + { + echo __METHOD__ . "\n"; + $this->execute(); + return new IteratorIterator($this, 'PDOStatement'); + } +} + +$stmt = $DB->prepare($SQL['select1'], array(PDO_ATTR_STATEMENT_CLASS=>array('PDOStatementAggregate'))); + +foreach($stmt as $data) +{ + var_dump($data); +} + +?>
« previous php.cvs (#30610) next »