dbs             Thu Mar  3 06:49:36 2005 EDT

  Added files:                 
    /php-src/ext/pdo_odbc/tests connection.inc pdo_001.phpt 
                                pdo_002.phpt pdo_003.phpt pdo_004.phpt 
                                pdo_005.phpt pdo_015.phpt prepare.inc 
                                skipif.inc 
  Log:
  Begin porting standard PDO tests to PDO_ODBC, testing against DB2.
  
  

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/connection.inc?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/connection.inc
+++ php-src/ext/pdo_odbc/tests/connection.inc
<?php

$USER = 'db2inst1';
$PASSWD = 'ibmdb2';
$DBNAME = 'SAMPLE';

$CONNECTION = "odbc:$DBNAME";

$PDO_TESTS = dirname(__FILE__) . '/../../pdo/tests/';

?>

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_001.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_001.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_001.phpt
--TEST--
PDO_ODBC: PDO_FETCH_ASSOC
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc'); ?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

require_once($PDO_TESTS . 'pdo_001.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
array(3) {
  [0]=>
  array(2) {
    ["ID"]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
  }
  [1]=>
  array(2) {
    ["ID"]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
  }
  [2]=>
  array(2) {
    ["ID"]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_002.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_002.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_002.phpt
--TEST--
PDO_ODBC: PDO_FETCH_NUM
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc'); ?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

require_once($PDO_TESTS . 'pdo_002.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
array(3) {
  [0]=>
  array(2) {
    [0]=>
    string(1) "1"
    [1]=>
    string(1) "A"
  }
  [1]=>
  array(2) {
    [0]=>
    string(1) "2"
    [1]=>
    string(1) "B"
  }
  [2]=>
  array(2) {
    [0]=>
    string(1) "3"
    [1]=>
    string(1) "C"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_003.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_003.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_003.phpt
--TEST--
PDO_ODBC: PDO_FETCH_BOTH
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc'); ?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

require_once($PDO_TESTS . 'pdo_003.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
array(3) {
  [0]=>
  array(4) {
    ["ID"]=>
    string(1) "1"
    [0]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
    [1]=>
    string(1) "A"
  }
  [1]=>
  array(4) {
    ["ID"]=>
    string(1) "2"
    [0]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
    [1]=>
    string(1) "B"
  }
  [2]=>
  array(4) {
    ["ID"]=>
    string(1) "3"
    [0]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
    [1]=>
    string(1) "C"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_004.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_004.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_004.phpt
--TEST--
PDO_ODBC: PDO_FETCH_OBJ
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc'); ?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

require_once($PDO_TESTS . 'pdo_004.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
array(3) {
  [0]=>
  object(stdClass)#%d (2) {
    ["ID"]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
  }
  [1]=>
  object(stdClass)#%d (2) {
    ["ID"]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
  }
  [2]=>
  object(stdClass)#%d (2) {
    ["ID"]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_005.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_005.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_005.phpt
--TEST--
PDO_ODBC: PDO_FETCH_CLASS
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc'); ?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

$SQL = array(
        'create'=>'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val 
VARCHAR(10), val2 VARCHAR(10))'
);

require_once($PDO_TESTS . 'pdo_005.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
array(3) {
  [0]=>
  object(stdClass)#%d (3) {
    ["ID"]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
    ["VAL2"]=>
    string(2) "AA"
  }
  [1]=>
  object(stdClass)#%d (3) {
    ["ID"]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
    ["VAL2"]=>
    string(2) "BB"
  }
  [2]=>
  object(stdClass)#%d (3) {
    ["ID"]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
    ["VAL2"]=>
    string(2) "CC"
  }
}
array(3) {
  [0]=>
  object(TestBase)#%d (6) {
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
    ["VAL2"]=>
    string(2) "AA"
  }
  [1]=>
  object(TestBase)#%d (6) {
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
    ["VAL2"]=>
    string(2) "BB"
  }
  [2]=>
  object(TestBase)#%d (6) {
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
    ["VAL2"]=>
    string(2) "CC"
  }
}
TestDerived::__construct(0,)
TestDerived::__construct(1,)
TestDerived::__construct(2,)
array(3) {
  [0]=>
  object(TestDerived)#%d (7) {
    ["row:protected"]=>
    int(0)
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "1"
    ["VAL"]=>
    string(1) "A"
    ["VAL2"]=>
    string(2) "AA"
  }
  [1]=>
  object(TestDerived)#%d (7) {
    ["row:protected"]=>
    int(1)
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "2"
    ["VAL"]=>
    string(1) "B"
    ["VAL2"]=>
    string(2) "BB"
  }
  [2]=>
  object(TestDerived)#%d (7) {
    ["row:protected"]=>
    int(2)
    ["id"]=>
    NULL
    ["val:protected"]=>
    NULL
    ["val2:private"]=>
    NULL
    ["ID"]=>
    string(1) "3"
    ["VAL"]=>
    string(1) "C"
    ["VAL2"]=>
    string(2) "CC"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/pdo_015.phpt?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/pdo_015.phpt
+++ php-src/ext/pdo_odbc/tests/pdo_015.phpt
--TEST--
PDO_ODBC: PDO_FETCH_COLUMN
--SKIPIF--
<?php # vim:ft=php
require_once('skipif.inc');
?>
--FILE--
<?php

require_once('connection.inc');
require_once('prepare.inc');

$SQL = array(
        'create1'=>'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val 
VARCHAR(10), val2 VARCHAR(10))'
);

//require_once(dirname(__FILE__).'/../../pdo/tests/pdo.inc');
require_once($PDO_TESTS . 'pdo_015.inc');

?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
array(2) {
  [0]=>
  string(1) "1"
  [1]=>
  string(1) "2"
}
array(2) {
  [0]=>
  string(2) "A2"
  [1]=>
  string(2) "B2"
}
array(2) {
  [1]=>
  array(1) {
    [0]=>
    string(1) "A"
  }
  [2]=>
  array(1) {
    [0]=>
    string(1) "A"
  }
}
array(2) {
  [1]=>
  string(1) "A"
  [2]=>
  string(1) "A"
}
array(2) {
  [1]=>
  string(1) "1"
  [2]=>
  string(1) "2"
}
array(2) {
  [1]=>
  string(1) "A"
  [2]=>
  string(1) "A"
}
array(2) {
  [1]=>
  string(2) "A2"
  [2]=>
  string(2) "B2"
}
array(1) {
  ["A"]=>
  array(2) {
    [0]=>
    string(2) "A2"
    [1]=>
    string(2) "B2"
  }
}
===DONE===

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/prepare.inc?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/prepare.inc
+++ php-src/ext/pdo_odbc/tests/prepare.inc
<?php

require_once('connection.inc');

$SQL = array(
        'create'=>'CREATE TABLE test(id int NOT NULL PRIMARY KEY, val 
VARCHAR(10))'
);

$DB = new pdo($CONNECTION, $USER, $PASSWD);

foreach(array('test','classtypes') as $name)
{
        $DB->exec("DROP TABLE $name");
}

$DB->setAttribute(PDO_ATTR_ERRMODE, PDO_ERRMODE_WARNING);

?>

http://cvs.php.net/co.php/php-src/ext/pdo_odbc/tests/skipif.inc?r=1.1&p=1
Index: php-src/ext/pdo_odbc/tests/skipif.inc
+++ php-src/ext/pdo_odbc/tests/skipif.inc
<?php

if (!extension_loaded('pdo_odbc')) die('skip');

require_once('connection.inc');
require_once('prepare.inc');

if (!$DB) {
        die('skip cannot open db');
}

?>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to