cvs: pear /DB_DataObject/DataObject Generator.php

alan_k		Tue Apr 29 02:22:47 2008 UTC

  Modified files:              
    /pear/DB_DataObject/DataObject	Generator.php 
  Log:
  fix bug #13789 - honour user specified MDB2 options in Generator
  
http://cvs.php.net/viewvc.cgi/pear/DB_DataObject/DataObject/Generator.php?r1=1.143&r2=1.144&diff_format=u
Index: pear/DB_DataObject/DataObject/Generator.php
diff -u pear/DB_DataObject/DataObject/Generator.php:1.143 pear/DB_DataObject/DataObject/Generator.php:1.144
--- pear/DB_DataObject/DataObject/Generator.php:1.143	Tue Apr 29 02:18:15 2008
+++ pear/DB_DataObject/DataObject/Generator.php	Tue Apr 29 02:22:47 2008
@@ -15,7 +15,7 @@
  * @author     Alan Knowles <[email protected]>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Generator.php,v 1.143 2008/04/29 02:18:15 alan_k Exp $
+ * @version    CVS: $Id: Generator.php,v 1.144 2008/04/29 02:22:47 alan_k Exp $
  * @link       http://pear.php.net/package/DB_DataObject
  */
  
@@ -193,7 +193,11 @@
             /**
              * set portability and some modules to fetch the informations
              */
-            $__DB->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_FIX_CASE);
+            $db_options = PEAR::getStaticProperty('MDB2','options');
+            if (empty($db_options)) {
+                $__DB->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_FIX_CASE);
+            }
+            
             $__DB->loadModule('Manager');
             $__DB->loadModule('Reverse');
         }