RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 12:26:11 +03:00
Code Issues Projects Releases Wiki Activity

Added ability to put php in all inputted files/strings to parser.

Browse source
This commit is contained in:
Jonathan.Wage 2007-10-09 02:21:53 +00:00
parent dd71ec4b06
commit 4d38b32209
8 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/Doctrine/Data/Import.php
View file

@ -139,7 +139,6 @@ class Doctrine_Data_Import extends Doctrine_Data
$obj = $pending['obj'];
$key = $pending['key'];
$local = $pending['local'];
$foreign = $pending['foreign'];
$pks = $primaryKeys[$key];
$obj->$local = $pks['id'];
}

1
lib/Doctrine/Export.php
View file

@ -1034,7 +1034,6 @@ class Doctrine_Export extends Doctrine_Connection_Module
} catch (Doctrine_Connection_Exception $e) {
// we only want to silence table already exists errors
if ($e->getPortableCode() !== Doctrine::ERR_ALREADY_EXISTS) {
echo $query."\n";
$connection->rollback();
throw $e;
}

26
lib/Doctrine/Parser.php
View file

@ -100,4 +100,30 @@ abstract class Doctrine_Parser
return $parser->dumpData($array, $path);
}
/**
* getContents
*
* Get contents whether it is the path to a file file or a string of txt.
* Either should allow php code in it.
*
* @param string $path
* @return void
* @author Jonathan H. Wage
*/
public function getContents($path)
{
ob_start();
if (!file_exists($path)) {
$contents = $path;
$path = '/tmp/dparser_' . microtime();
file_put_contents($path, $contents);
}
include($path);
$contents = ob_get_clean();
return $contents;
}
}

8
lib/Doctrine/Parser/Json.php
View file

@ -62,13 +62,9 @@ class Doctrine_Parser_Json extends Doctrine_Parser
*/
public function loadData($path)
{
if (file_exists($path) && is_readable($path)) {
$data = file_get_contents($path);
} else {
$data = $path;
}
$contents = $this->getContents($path);
$json = json_decode($data);
$json = json_decode($contents);
return $this->prepareData($json);
}

8
lib/Doctrine/Parser/Serialize.php
View file

@ -62,12 +62,8 @@ class Doctrine_Parser_Serialize extends Doctrine_Parser
*/
public function loadData($path)
{
if (file_exists($path) && is_readable($path)) {
$data = file_get_contents($path);
} else {
$data = $path;
}
$contents = $this->getContents($path);
return unserialize($data);
return unserialize($contents);
}
}

8
lib/Doctrine/Parser/Xml.php
View file

@ -66,13 +66,9 @@ class Doctrine_Parser_Xml extends Doctrine_Parser
public function loadData($path)
{
if (file_exists($path) && is_readable($path)) {
$xmlString = file_get_contents($path);
} else {
$xmlString = $path;
}
$contents = $this->getContents($path);
$simpleXml = simplexml_load_string($xmlString);
$simpleXml = simplexml_load_string($contents);
return $this->prepareData($simpleXml);
}

4
lib/Doctrine/Parser/Yml.php
View file

@ -66,9 +66,7 @@ class Doctrine_Parser_Yml extends Doctrine_Parser
*/
public function loadData($path)
{
ob_start();
$retval = include($path);
$contents = ob_get_clean();
$contents = $this->getContents($path);
$spyc = new DoctrineSpyc();

2
tests/Export/RecordTestCase.php
View file

@ -100,8 +100,8 @@ class Doctrine_Export_Record_TestCase extends Doctrine_UnitTestCase
$this->assertEqual($this->adapter->pop(), 'COMMIT');
$this->assertEqual($this->adapter->pop(), 'ALTER TABLE cms__category_languages ADD CONSTRAINT FOREIGN KEY (category_id) REFERENCES cms__category(id) ON DELETE CASCADE');
$this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category (id BIGINT AUTO_INCREMENT, created DATETIME, parent BIGINT, position MEDIUMINT, active BIGINT, INDEX index_parent_idx (parent), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB');
$this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category_languages (id BIGINT AUTO_INCREMENT, name TEXT, category_id BIGINT, language_id BIGINT, INDEX index_category_idx (category_id), INDEX index_language_idx (language_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB');
$this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category (id BIGINT AUTO_INCREMENT, created DATETIME, parent BIGINT, position MEDIUMINT, active BIGINT, INDEX index_parent_idx (parent), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB');
$this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
}