cvs: pear /XML_Query2XML/XML Query2XML.php

lukasfeiler Sat May 26 10:54:26 2007 UTC

Modified files:
/pear/XML_Query2XML/XML Query2XML.php
Log:
$sql and $options["idColumn"] now also accept the boolean value false; this will save the developer a couple lines in some rare situations

http://cvs.php.net/viewvc.cgi/pear/X...&diff_format=u
Index: pear/XML_Query2XML/XML/Query2XML.php
diff -u pear/XML_Query2XML/XML/Query2XML.php:1.20 pear/XML_Query2XML/XML/Query2XML.php:1.21
--- pear/XML_Query2XML/XML/Query2XML.php:1.20 Sun Apr 15 12:16:58 2007
+++ pear/XML_Query2XML/XML/Query2XML.php Sat May 26 10:54:26 2007
@@ -15,7 +15,7 @@
* @license http://www.gnu.org/copyleft/lesser.html LGPL Version 2.1
* @author Lukas Feiler <lukas.feiler@lukasfeiler.com>
* @package XML_Query2XML
-* @version $Id: Query2XML.php,v 1.20 2007/04/15 12:16:58 lukasfeiler Exp $
+* @version $Id: Query2XML.php,v 1.21 2007/05/26 10:54:26 lukasfeiler Exp $
*/

/**PEAR_Exception is used as the parent for XML_Query2XML_Exception.
@@ -61,7 +61,6 @@
* @version Release: @package_version@
* @copyright Empowered Media 2006
* @package XML_Query2XML
-* @todo $options['idColumn'] should also accept multiple columns in an array
*/
class XML_Query2XML
{
@@ -553,7 +552,11 @@
*/
$tree = array();

- $records = $this->_applySqlOptionsToRecord($options, $emptyRecord = array());
+ if ($sql === false) {
+ $records = array(array()); // one empty record
+ } else {
+ $records = $this->_applySqlOptionsToRecord($options, $emptyRecord = array());
+ }
foreach ($records as $key => $record) {
$tag = $this->_getNestedXMLRecord($records[$key], $options, $dom, $tree);

@@ -770,7 +773,12 @@
$attributes = array();
}

- $id = $this->_applyColumnStringToRecord($idColumn, $record, 'idColumn');
+ if ($idColumn === false) {
+ static $uniqueIdCounter = 0;
+ $id = ++$uniqueIdCounter;
+ } else {
+ $id = $this->_applyColumnStringToRecord($idColumn, $record, 'idColumn');
+ }
if ($id === null) {
//the ID column is NULL
return false;