@@ -141,7 +141,8 @@ function save() { $conn =& _adodb_conn(); $this->set_attributes(array( - "type" => ($this->_type_name == $this->_base_class) ? NULL : $this->_type_name, + # FIXME strtolower() needed for PHP4 compatibility, remove it later + "type" => (strtolower($this->_type_name) == strtolower($this->_base_class)) ? NULL : $this->_type_name, "updated_at" => mktime() )); lib/AdoDBRecord.class.php @@ -121,6 +121,8 @@ $find_scope = array(); $conditions = array(); $create_scope = array(); + # FIXME PHP4 does not like passing properties by reference (_scoped_methods) of overloaded objects, + # fix this after dropping PHP4 support $scoped_methods = $this->_scoped_methods; foreach($scoped_methods as $scope) { if(isset($scope["find"])) { lib/AdoDBRecord/Tools.module.php @@ -48,15 +48,15 @@ $stest = new SuperTest(array("dummy" => "SuperDummy")); $stest->save(); - $this->assertEqual($stest->type, "SuperTest"); + $this->assertEqual(strtolower($stest->type), "supertest"); $utest = new UltraTest(array("dummy" => "UltraDummy")); $utest->save(); - $this->assertEqual($utest->type, "UltraTest"); + $this->assertEqual(strtolower($utest->type), "ultratest"); $atest = new AutoTest(array("dummy" => "AutoDummy")); $atest->save(); - $this->assertEqual($atest->type, "AutoTest"); + $this->assertEqual(strtolower($atest->type), "autotest"); # PHP 5.3 needed to call magic methods statically, so # work around by instanciating the class as singleton @@ -68,15 +68,15 @@ $this->assertEqual(strtolower(get_class($dummy2)), "test"); $stest2 = $Test->find_by_dummy("SuperDummy"); - $this->assertEqual($stest2->type, "SuperTest"); + $this->assertEqual(strtolower($stest2->type), "supertest"); $this->assertEqual(strtolower(get_class($stest2)), "supertest"); $utest2 = $Test->find_by_dummy("UltraDummy"); - $this->assertEqual($utest2->type, "UltraTest"); + $this->assertEqual(strtolower($utest2->type), "ultratest"); $this->assertEqual(strtolower(get_class($utest2)), "ultratest"); $atest2 = $Test->find_by_dummy("AutoDummy"); - $this->assertEqual($atest2->type, "AutoTest"); + $this->assertEqual(strtolower($atest2->type), "autotest"); $this->assertEqual(strtolower(get_class($atest2)), "autotest"); } } tests/TestSTI.class.php 384db5b4deaceea08892417e5c3865adb3591742 Kai Krakow kk@netactive.de http://github.com/kakra/adodbrecord/commit/91a972cf5e187619c1d7420a58c078b574ede05b 91a972cf5e187619c1d7420a58c078b574ede05b 2009-02-04T02:39:39-08:00 2009-02-04T02:39:39-08:00 Fix STI with PHP4 "type" column must not be set when inserting the base class itself. 0e9cfbeb537d3c199da972630b0129091c6be80d Kai Krakow kk@netactive.de