added tests to get complete coverage of Transaction, RawSQL, AuditLog and Query/Having. Related refactorings. Added some getters to be able to test. Also added coverage report for these changes
This commit is contained in:
meus
parent
520f4a1056
commit
53b05c1d4a
24 changed files with 3410 additions and 3230 deletions
|
|
@ -18,7 +18,9 @@
|
||||||
* and is licensed under the LGPL. For more information, see
|
* and is licensed under the LGPL. For more information, see
|
||||||
* <http://www.phpdoctrine.com>.
|
* <http://www.phpdoctrine.com>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Doctrine::autoload("Doctrine_Connection_Common");
|
Doctrine::autoload("Doctrine_Connection_Common");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Doctrine_Connection_Sqlite
|
* Doctrine_Connection_Sqlite
|
||||||
*
|
*
|
||||||
|
|
@ -46,9 +48,7 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
||||||
*/
|
*/
|
||||||
public function __construct(Doctrine_Manager $manager, $adapter)
|
public function __construct(Doctrine_Manager $manager, $adapter)
|
||||||
{
|
{
|
||||||
|
$this->supported = array('sequences' => 'emulated',
|
||||||
$this->supported = array(
|
|
||||||
'sequences' => 'emulated',
|
|
||||||
'indexes' => true,
|
'indexes' => true,
|
||||||
'affected_rows' => true,
|
'affected_rows' => true,
|
||||||
'summary_functions' => true,
|
'summary_functions' => true,
|
||||||
|
|
@ -67,14 +67,7 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
||||||
'identifier_quoting' => true,
|
'identifier_quoting' => true,
|
||||||
'pattern_escaping' => false,
|
'pattern_escaping' => false,
|
||||||
);
|
);
|
||||||
/**
|
parent::__construct($manager, $adapter);
|
||||||
$this->options['base_transaction_name'] = '___php_Doctrine_sqlite_auto_commit_off';
|
|
||||||
$this->options['fixed_float'] = 0;
|
|
||||||
$this->options['database_path'] = '';
|
|
||||||
$this->options['database_extension'] = '';
|
|
||||||
$this->options['server_version'] = '';
|
|
||||||
*/
|
|
||||||
parent::__construct($manager, $adapter);
|
|
||||||
|
|
||||||
if ($this->isConnected) {
|
if ($this->isConnected) {
|
||||||
$this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
$this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
||||||
|
|
@ -114,4 +107,4 @@ class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
||||||
{
|
{
|
||||||
return $name . '.db';
|
return $name . '.db';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1267,4 +1267,14 @@ class Doctrine_Hydrate extends Doctrine_Locator_Injectable implements Serializab
|
||||||
{
|
{
|
||||||
return Doctrine_Lib::formatSql($this->getQuery());
|
return Doctrine_Lib::formatSql($this->getQuery());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the parts
|
||||||
|
*
|
||||||
|
* @return array The parts
|
||||||
|
*/
|
||||||
|
public function getParts()
|
||||||
|
{
|
||||||
|
return $this->parts;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,4 +109,4 @@ abstract class Doctrine_Query_Condition extends Doctrine_Query_Part
|
||||||
|
|
||||||
return $value;
|
return $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,7 @@ class Doctrine_Query_Having extends Doctrine_Query_Condition
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* load
|
* load
|
||||||
* returns the parsed query part
|
* returns the parsed query part
|
||||||
|
|
@ -87,17 +88,11 @@ class Doctrine_Query_Having extends Doctrine_Query_Condition
|
||||||
*/
|
*/
|
||||||
final public function load($having)
|
final public function load($having)
|
||||||
{
|
{
|
||||||
$e = Doctrine_Tokenizer::bracketExplode($having, ' ', '(', ')');
|
$tokens = Doctrine_Tokenizer::bracketExplode($having, ' ', '(', ')');
|
||||||
|
$part = $this->parseAggregateFunction(array_shift($tokens));
|
||||||
$r = array_shift($e);
|
$operator = array_shift($tokens);
|
||||||
$t = explode('(', $r);
|
$value = implode(' ', $tokens);
|
||||||
|
$part .= ' ' . $operator . ' ' . $value;
|
||||||
$count = count($t);
|
return $part;
|
||||||
$r = $this->parseAggregateFunction($r);
|
|
||||||
$operator = array_shift($e);
|
|
||||||
$value = implode(' ', $e);
|
|
||||||
$r .= ' ' . $operator . ' ' . $value;
|
|
||||||
|
|
||||||
return $r;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -52,4 +52,4 @@ abstract class Doctrine_Query_Part
|
||||||
{
|
{
|
||||||
return $this->query;
|
return $this->query;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -51,20 +51,31 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
|
||||||
public function parseQueryPart($queryPartName, $queryPart, $append = false)
|
public function parseQueryPart($queryPartName, $queryPart, $append = false)
|
||||||
{
|
{
|
||||||
if ($queryPartName == 'select') {
|
if ($queryPartName == 'select') {
|
||||||
preg_match_all('/{([^}{]*)}/U', $queryPart, $m);
|
$this->parseSelectFields($queryPart);
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
if( ! isset($this->parts[$queryPartName])) {
|
||||||
|
$this->parts[$queryPartName] = array();
|
||||||
|
}
|
||||||
|
|
||||||
$this->fields = $m[1];
|
if (! $append) {
|
||||||
$this->parts['select'] = array();
|
$this->parts[$queryPartName] = array($queryPart);
|
||||||
} else {
|
}else {
|
||||||
if ( ! $append) {
|
$this->parts[$queryPartName][] = $queryPart;
|
||||||
$this->parts[$queryPartName] = array($queryPart);
|
|
||||||
} else {
|
|
||||||
$this->parts[$queryPartName][] = $queryPart;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add select parts to fields
|
||||||
|
*
|
||||||
|
* @param $queryPart sting The name of the querypart
|
||||||
|
*/
|
||||||
|
private function parseSelectFields($queryPart){
|
||||||
|
preg_match_all('/{([^}{]*)}/U', $queryPart, $m);
|
||||||
|
$this->fields = $m[1];
|
||||||
|
$this->parts['select'] = array();
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* parseQuery
|
* parseQuery
|
||||||
* parses an sql query and adds the parts to internal array
|
* parses an sql query and adds the parts to internal array
|
||||||
|
|
@ -74,46 +85,48 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
|
||||||
*/
|
*/
|
||||||
public function parseQuery($query)
|
public function parseQuery($query)
|
||||||
{
|
{
|
||||||
preg_match_all('/{([^}{]*)}/U', $query, $m);
|
$this->parseSelectFields($query);
|
||||||
|
|
||||||
$this->fields = $m[1];
|
|
||||||
$this->clear();
|
$this->clear();
|
||||||
|
|
||||||
$e = Doctrine_Tokenizer::sqlExplode($query,' ');
|
$tokens = Doctrine_Tokenizer::sqlExplode($query,' ');
|
||||||
|
|
||||||
foreach ($e as $k => $part) {
|
$parts = array();
|
||||||
$low = strtolower($part);
|
foreach ($tokens as $key => $part) {
|
||||||
switch (strtolower($part)) {
|
$partLowerCase = strtolower($part);
|
||||||
|
switch ($partLowerCase) {
|
||||||
case 'select':
|
case 'select':
|
||||||
case 'from':
|
case 'from':
|
||||||
case 'where':
|
case 'where':
|
||||||
case 'limit':
|
case 'limit':
|
||||||
case 'offset':
|
case 'offset':
|
||||||
case 'having':
|
case 'having':
|
||||||
$p = $low;
|
$type = $partLowerCase;
|
||||||
if ( ! isset($parts[$low])) {
|
if ( ! isset($parts[$partLowerCase])) {
|
||||||
$parts[$low] = array();
|
$parts[$partLowerCase] = array();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'order':
|
case 'order':
|
||||||
case 'group':
|
case 'group':
|
||||||
$i = ($k + 1);
|
$i = $key + 1;
|
||||||
if (isset($e[$i]) && strtolower($e[$i]) === 'by') {
|
if (isset($tokens[$i]) && strtolower($tokens[$i]) === 'by') {
|
||||||
$p = $low;
|
$type = $partLowerCase . 'by';
|
||||||
$p .= 'by';
|
$parts[$type] = array();
|
||||||
$parts[$low . 'by'] = array();
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$parts[$p][] = $part;
|
//not a keyword so we add it to the previous type
|
||||||
|
$parts[$type][] = $part;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'by':
|
case 'by':
|
||||||
continue;
|
continue;
|
||||||
default:
|
default:
|
||||||
if ( ! isset($parts[$p][0])) {
|
//not a keyword so we add it to the previous type.
|
||||||
$parts[$p][0] = $part;
|
if ( ! isset($parts[$type][0])) {
|
||||||
|
$parts[$type][0] = $part;
|
||||||
} else {
|
} else {
|
||||||
$parts[$p][0] .= ' '.$part;
|
// why does this add to index 0 and not append to the
|
||||||
|
// array. If it had done that one could have used
|
||||||
|
// parseQueryPart.
|
||||||
|
$parts[$type][0] .= ' '.$part;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -283,4 +296,4 @@ class Doctrine_RawSql extends Doctrine_Query_Abstract
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -319,4 +319,4 @@ class Doctrine_Tokenizer
|
||||||
|
|
||||||
return $term;
|
return $term;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -125,6 +125,16 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the invalid records
|
||||||
|
*
|
||||||
|
* @return array An array of invalid records
|
||||||
|
*/
|
||||||
|
public function getInvalid(){
|
||||||
|
return $this->invalid;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* getTransactionLevel
|
* getTransactionLevel
|
||||||
* get the current transaction nesting level
|
* get the current transaction nesting level
|
||||||
|
|
@ -436,4 +446,4 @@ class Doctrine_Transaction extends Doctrine_Connection_Module
|
||||||
{
|
{
|
||||||
throw new Doctrine_Transaction_Exception('Fetching transaction isolation level not supported by this driver.');
|
throw new Doctrine_Transaction_Exception('Fetching transaction isolation level not supported by this driver.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -90,4 +90,12 @@ class Doctrine_AuditLog_TestCase extends Doctrine_UnitTestCase
|
||||||
$this->pass();
|
$this->pass();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testReturnFalseIfVersionTableExists()
|
||||||
|
{
|
||||||
|
$entity = new VersioningTest();
|
||||||
|
$entity_table = $entity->getTable();
|
||||||
|
$auditLog = new Doctrine_AuditLog(array("table" => $entity_table));
|
||||||
|
$this->assertFalse($auditLog->buildDefinition($entity_table));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,4 +56,12 @@ class Doctrine_Query_Having_TestCase extends Doctrine_UnitTestCase
|
||||||
$q->parseQuery("SELECT CONCAT(u.name, u.loginname) name FROM User u LEFT JOIN u.Phonenumber p HAVING name = 'xx'");
|
$q->parseQuery("SELECT CONCAT(u.name, u.loginname) name FROM User u LEFT JOIN u.Phonenumber p HAVING name = 'xx'");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testReturnFuncIfNumeric()
|
||||||
|
{
|
||||||
|
$having = new Doctrine_Query_Having("test");
|
||||||
|
$part = $having->load("1");
|
||||||
|
$this->assertEqual("1",trim($part));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,6 @@
|
||||||
*/
|
*/
|
||||||
class Doctrine_RawSql_TestCase extends Doctrine_UnitTestCase
|
class Doctrine_RawSql_TestCase extends Doctrine_UnitTestCase
|
||||||
{
|
{
|
||||||
|
|
||||||
public function testQueryParser()
|
public function testQueryParser()
|
||||||
{
|
{
|
||||||
$sql = 'SELECT {p.*} FROM photos p';
|
$sql = 'SELECT {p.*} FROM photos p';
|
||||||
|
|
@ -248,4 +247,47 @@ class Doctrine_RawSql_TestCase extends Doctrine_UnitTestCase
|
||||||
|
|
||||||
$this->assertEqual(count($coll), 3);
|
$this->assertEqual(count($coll), 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testParseQueryPartShouldAddPartIfNotSelectAndAppend()
|
||||||
|
{
|
||||||
|
$query = new Doctrine_Rawsql();
|
||||||
|
$query->parseQueryPart("test", "test", true);
|
||||||
|
$parts = $query->getParts();
|
||||||
|
$this->assertTrue(isset($parts["test"]));
|
||||||
|
$this->assertTrue(is_array($parts["test"]));
|
||||||
|
$this->assertTrue(isset($parts["test"][0]));
|
||||||
|
$this->assertEqual("test", $parts["test"][0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testParseQueryShouldExtractGroupBy()
|
||||||
|
{
|
||||||
|
$query = new Doctrine_RawSql();
|
||||||
|
$query->parseQuery("having group");
|
||||||
|
$parts = $query->getParts();
|
||||||
|
$this->assertEqual($parts["having"][0], "group");
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testThrowExceptionIfFieldNameIsOnWrongForm()
|
||||||
|
{
|
||||||
|
$query = new Doctrine_RawSql();
|
||||||
|
$query->parseQueryPart("select", "{test}");
|
||||||
|
try{
|
||||||
|
$query->getQuery();
|
||||||
|
$this->fail("Should throw exception");
|
||||||
|
}catch(Doctrine_RawSql_Exception $exception){
|
||||||
|
$this->assertEqual($exception->getMessage(), "All selected fields in Sql query must be in format tableAlias.fieldName");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testThrowExceptionIfAliasDoesNotExist()
|
||||||
|
{
|
||||||
|
$query = new Doctrine_RawSql();
|
||||||
|
$query->parseQueryPart("select", "{test.test}");
|
||||||
|
try{
|
||||||
|
$query->getQuery();
|
||||||
|
$this->fail("Should throw exception");
|
||||||
|
}catch(Doctrine_RawSql_Exception $exception){
|
||||||
|
$this->assertEqual($exception->getMessage(), "The associated component for table alias test couldn't be found.");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -224,6 +224,15 @@ class Doctrine_Transaction_TestCase extends Doctrine_UnitTestCase
|
||||||
$this->assertTrue($phonenumber->id > 0);
|
$this->assertTrue($phonenumber->id > 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testAddDuplicateRecordToTransactionShouldSkipSecond(){
|
||||||
|
$transaction = new Doctrine_Transaction();
|
||||||
|
$user = new User();
|
||||||
|
$transaction->addInvalid($user);
|
||||||
|
$this->assertEqual(1, count($transaction->getInvalid()));
|
||||||
|
$transaction->addInvalid($user);
|
||||||
|
$this->assertEqual(1, count($transaction->getInvalid()));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
class TransactionListener extends Doctrine_EventListener
|
class TransactionListener extends Doctrine_EventListener
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -247,7 +247,7 @@
|
||||||
<td class="covered"> if (class_exists($className)) {
|
<td class="covered"> if (class_exists($className)) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>80</td>
|
<tr><td>80</td>
|
||||||
<td class="red"> return false;
|
<td class="covered"> return false;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>81</td>
|
<tr><td>81</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
|
|
|
||||||
|
|
@ -70,97 +70,97 @@
|
||||||
<td class="normal"> */
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>21</td>
|
<tr><td>21</td>
|
||||||
<td class="covered">Doctrine::autoload("Doctrine_Connection_Common");
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>22</td>
|
<tr><td>22</td>
|
||||||
<td class="normal">/**
|
<td class="covered">Doctrine::autoload("Doctrine_Connection_Common");
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>23</td>
|
<tr><td>23</td>
|
||||||
<td class="normal"> * Doctrine_Connection_Sqlite
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>24</td>
|
<tr><td>24</td>
|
||||||
<td class="normal"> *
|
<td class="normal">/**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>25</td>
|
<tr><td>25</td>
|
||||||
<td class="normal"> * @package Doctrine
|
<td class="normal"> * Doctrine_Connection_Sqlite
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>26</td>
|
<tr><td>26</td>
|
||||||
<td class="normal"> * @subpackage Connection
|
<td class="normal"> *
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>27</td>
|
<tr><td>27</td>
|
||||||
<td class="normal"> * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
<td class="normal"> * @package Doctrine
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>28</td>
|
<tr><td>28</td>
|
||||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
<td class="normal"> * @subpackage Connection
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>29</td>
|
<tr><td>29</td>
|
||||||
<td class="normal"> * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
|
<td class="normal"> * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>30</td>
|
<tr><td>30</td>
|
||||||
<td class="normal"> * @version $Revision: 2963 $
|
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>31</td>
|
<tr><td>31</td>
|
||||||
<td class="normal"> * @link www.phpdoctrine.com
|
<td class="normal"> * @author Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>32</td>
|
<tr><td>32</td>
|
||||||
<td class="normal"> * @since 1.0
|
<td class="normal"> * @version $Revision: 2963 $
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>33</td>
|
<tr><td>33</td>
|
||||||
<td class="normal"> */
|
<td class="normal"> * @link www.phpdoctrine.com
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>34</td>
|
<tr><td>34</td>
|
||||||
<td class="covered">class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
<td class="normal"> * @since 1.0
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>35</td>
|
<tr><td>35</td>
|
||||||
<td class="normal">{
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>36</td>
|
<tr><td>36</td>
|
||||||
<td class="normal"> /**
|
<td class="covered">class Doctrine_Connection_Sqlite extends Doctrine_Connection_Common
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>37</td>
|
<tr><td>37</td>
|
||||||
<td class="normal"> * @var string $driverName the name of this connection driver
|
<td class="normal">{
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>38</td>
|
<tr><td>38</td>
|
||||||
<td class="normal"> */
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>39</td>
|
|
||||||
<td class="normal"> protected $driverName = 'Sqlite';
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>40</td>
|
|
||||||
<td class="normal">
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>41</td>
|
|
||||||
<td class="normal"> /**
|
<td class="normal"> /**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>42</td>
|
<tr><td>39</td>
|
||||||
<td class="normal"> * the constructor
|
<td class="normal"> * @var string $driverName the name of this connection driver
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>43</td>
|
<tr><td>40</td>
|
||||||
<td class="normal"> *
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>44</td>
|
|
||||||
<td class="normal"> * @param Doctrine_Manager $manager
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>45</td>
|
|
||||||
<td class="normal"> * @param PDO $pdo database handle
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>46</td>
|
|
||||||
<td class="normal"> */
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>47</td>
|
<tr><td>41</td>
|
||||||
<td class="normal"> public function __construct(Doctrine_Manager $manager, $adapter)
|
<td class="normal"> protected $driverName = 'Sqlite';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>48</td>
|
<tr><td>42</td>
|
||||||
<td class="normal"> {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>49</td>
|
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
<tr><td>43</td>
|
||||||
|
<td class="normal"> /**
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>44</td>
|
||||||
|
<td class="normal"> * the constructor
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>45</td>
|
||||||
|
<td class="normal"> *
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>46</td>
|
||||||
|
<td class="normal"> * @param Doctrine_Manager $manager
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>47</td>
|
||||||
|
<td class="normal"> * @param PDO $pdo database handle
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>48</td>
|
||||||
|
<td class="normal"> */
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>49</td>
|
||||||
|
<td class="normal"> public function __construct(Doctrine_Manager $manager, $adapter)
|
||||||
|
</td></tr>
|
||||||
<tr><td>50</td>
|
<tr><td>50</td>
|
||||||
<td class="red"> $this->supported = array(
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>51</td>
|
<tr><td>51</td>
|
||||||
<td class="covered"> 'sequences' => 'emulated',
|
<td class="covered"> $this->supported = array('sequences' => 'emulated',
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>52</td>
|
<tr><td>52</td>
|
||||||
<td class="covered"> 'indexes' => true,
|
<td class="covered"> 'indexes' => true,
|
||||||
|
|
@ -217,146 +217,126 @@
|
||||||
<td class="normal"> );
|
<td class="normal"> );
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>70</td>
|
<tr><td>70</td>
|
||||||
<td class="normal"> /**
|
<td class="covered"> parent::__construct($manager, $adapter);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>71</td>
|
<tr><td>71</td>
|
||||||
<td class="normal"> $this->options['base_transaction_name'] = '___php_Doctrine_sqlite_auto_commit_off';
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>72</td>
|
<tr><td>72</td>
|
||||||
<td class="normal"> $this->options['fixed_float'] = 0;
|
<td class="covered"> if ($this->isConnected) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>73</td>
|
<tr><td>73</td>
|
||||||
<td class="normal"> $this->options['database_path'] = '';
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>74</td>
|
|
||||||
<td class="normal"> $this->options['database_extension'] = '';
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>75</td>
|
|
||||||
<td class="normal"> $this->options['server_version'] = '';
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>76</td>
|
|
||||||
<td class="normal"> */
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>77</td>
|
|
||||||
<td class="covered"> parent::__construct($manager, $adapter);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>78</td>
|
|
||||||
<td class="normal">
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>79</td>
|
|
||||||
<td class="covered"> if ($this->isConnected) {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>80</td>
|
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>81</td>
|
<tr><td>74</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
<td class="covered"> $this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>82</td>
|
<tr><td>75</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>83</td>
|
<tr><td>76</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('now', 'time', 0);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('now', 'time', 0);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>84</td>
|
<tr><td>77</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>85</td>
|
<tr><td>78</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>86</td>
|
<tr><td>79</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>87</td>
|
<tr><td>80</td>
|
||||||
<td class="normal"> /**
|
<td class="normal"> /**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>88</td>
|
<tr><td>81</td>
|
||||||
<td class="normal"> * initializes database functions missing in sqlite
|
<td class="normal"> * initializes database functions missing in sqlite
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>89</td>
|
<tr><td>82</td>
|
||||||
<td class="normal"> *
|
<td class="normal"> *
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>90</td>
|
<tr><td>83</td>
|
||||||
<td class="normal"> * @see Doctrine_Expression
|
<td class="normal"> * @see Doctrine_Expression
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>91</td>
|
<tr><td>84</td>
|
||||||
<td class="normal"> * @return void
|
<td class="normal"> * @return void
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>92</td>
|
<tr><td>85</td>
|
||||||
<td class="normal"> */
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>93</td>
|
<tr><td>86</td>
|
||||||
<td class="normal"> public function connect()
|
<td class="normal"> public function connect()
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>94</td>
|
<tr><td>87</td>
|
||||||
<td class="normal"> {
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>95</td>
|
<tr><td>88</td>
|
||||||
<td class="covered"> if ($this->isConnected) {
|
<td class="covered"> if ($this->isConnected) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>96</td>
|
<tr><td>89</td>
|
||||||
<td class="covered"> return false;
|
<td class="covered"> return false;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>97</td>
|
<tr><td>90</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>98</td>
|
<tr><td>91</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>99</td>
|
<tr><td>92</td>
|
||||||
<td class="covered"> parent::connect();
|
<td class="covered"> parent::connect();
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>100</td>
|
<tr><td>93</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>101</td>
|
<tr><td>94</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('mod', array('Doctrine_Expression_Sqlite', 'modImpl'), 2);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>102</td>
|
<tr><td>95</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
<td class="covered"> $this->dbh->sqliteCreateFunction('concat', array('Doctrine_Expression_Sqlite', 'concatImpl'));
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>103</td>
|
<tr><td>96</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('md5', 'md5', 1);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>104</td>
|
<tr><td>97</td>
|
||||||
<td class="covered"> $this->dbh->sqliteCreateFunction('now', 'time', 0);
|
<td class="covered"> $this->dbh->sqliteCreateFunction('now', 'time', 0);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>105</td>
|
<tr><td>98</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>106</td>
|
<tr><td>99</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>107</td>
|
<tr><td>100</td>
|
||||||
<td class="normal"> /**
|
<td class="normal"> /**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>108</td>
|
<tr><td>101</td>
|
||||||
<td class="normal"> * getDatabaseFile
|
<td class="normal"> * getDatabaseFile
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>109</td>
|
<tr><td>102</td>
|
||||||
<td class="normal"> *
|
<td class="normal"> *
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>110</td>
|
<tr><td>103</td>
|
||||||
<td class="normal"> * @param string $name the name of the database
|
<td class="normal"> * @param string $name the name of the database
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>111</td>
|
<tr><td>104</td>
|
||||||
<td class="normal"> * @return string
|
<td class="normal"> * @return string
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>112</td>
|
<tr><td>105</td>
|
||||||
<td class="normal"> */
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>113</td>
|
<tr><td>106</td>
|
||||||
<td class="normal"> public function getDatabaseFile($name)
|
<td class="normal"> public function getDatabaseFile($name)
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>114</td>
|
<tr><td>107</td>
|
||||||
<td class="normal"> {
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>115</td>
|
<tr><td>108</td>
|
||||||
<td class="covered"> return $name . '.db';
|
<td class="covered"> return $name . '.db';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>116</td>
|
<tr><td>109</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>117</td>
|
<tr><td>110</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
|
|
@ -3817,6 +3817,36 @@
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>1270</td>
|
<tr><td>1270</td>
|
||||||
|
<td class="normal">
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1271</td>
|
||||||
|
<td class="normal"> /**
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1272</td>
|
||||||
|
<td class="normal"> * Return the parts
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1273</td>
|
||||||
|
<td class="normal"> *
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1274</td>
|
||||||
|
<td class="normal"> * @return array The parts
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1275</td>
|
||||||
|
<td class="normal"> */
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1276</td>
|
||||||
|
<td class="normal"> public function getParts()
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1277</td>
|
||||||
|
<td class="normal"> {
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1278</td>
|
||||||
|
<td class="covered"> return $this->parts;
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1279</td>
|
||||||
|
<td class="orange"> }
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>1280</td>
|
||||||
<td class="normal">}
|
<td class="normal">}
|
||||||
</td></tr>
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -343,5 +343,6 @@
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>112</td>
|
<tr><td>112</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
|
|
@ -235,7 +235,7 @@
|
||||||
<td class="orange"> } else {
|
<td class="orange"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>76</td>
|
<tr><td>76</td>
|
||||||
<td class="red"> return $func;
|
<td class="covered"> return $func;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>77</td>
|
<tr><td>77</td>
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
|
|
@ -250,71 +250,57 @@
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>81</td>
|
<tr><td>81</td>
|
||||||
<td class="normal"> /**
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>82</td>
|
<tr><td>82</td>
|
||||||
<td class="normal"> * load
|
<td class="normal"> /**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>83</td>
|
<tr><td>83</td>
|
||||||
<td class="normal"> * returns the parsed query part
|
<td class="normal"> * load
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>84</td>
|
<tr><td>84</td>
|
||||||
<td class="normal"> *
|
<td class="normal"> * returns the parsed query part
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>85</td>
|
<tr><td>85</td>
|
||||||
<td class="normal"> * @param string $having
|
<td class="normal"> *
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>86</td>
|
<tr><td>86</td>
|
||||||
<td class="normal"> * @return string
|
<td class="normal"> * @param string $having
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>87</td>
|
<tr><td>87</td>
|
||||||
<td class="normal"> */
|
<td class="normal"> * @return string
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>88</td>
|
<tr><td>88</td>
|
||||||
<td class="normal"> final public function load($having)
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>89</td>
|
<tr><td>89</td>
|
||||||
<td class="normal"> {
|
<td class="normal"> final public function load($having)
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>90</td>
|
<tr><td>90</td>
|
||||||
<td class="covered"> $e = Doctrine_Tokenizer::bracketExplode($having, ' ', '(', ')');
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>91</td>
|
<tr><td>91</td>
|
||||||
<td class="normal">
|
<td class="covered"> $tokens = Doctrine_Tokenizer::bracketExplode($having, ' ', '(', ')');
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>92</td>
|
<tr><td>92</td>
|
||||||
<td class="covered"> $r = array_shift($e);
|
<td class="covered"> $part = $this->parseAggregateFunction(array_shift($tokens));
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>93</td>
|
<tr><td>93</td>
|
||||||
<td class="covered"> $t = explode('(', $r);
|
<td class="covered"> $operator = array_shift($tokens);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>94</td>
|
<tr><td>94</td>
|
||||||
<td class="normal">
|
<td class="covered"> $value = implode(' ', $tokens);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>95</td>
|
<tr><td>95</td>
|
||||||
<td class="covered"> $count = count($t);
|
<td class="covered"> $part .= ' ' . $operator . ' ' . $value;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>96</td>
|
<tr><td>96</td>
|
||||||
<td class="covered"> $r = $this->parseAggregateFunction($r);
|
<td class="covered"> return $part;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>97</td>
|
<tr><td>97</td>
|
||||||
<td class="covered"> $operator = array_shift($e);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>98</td>
|
|
||||||
<td class="covered"> $value = implode(' ', $e);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>99</td>
|
|
||||||
<td class="covered"> $r .= ' ' . $operator . ' ' . $value;
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>100</td>
|
|
||||||
<td class="normal">
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>101</td>
|
|
||||||
<td class="covered"> return $r;
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>102</td>
|
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>103</td>
|
<tr><td>98</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
|
|
@ -172,5 +172,6 @@
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>55</td>
|
<tr><td>55</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
<td class="normal">/*
|
<td class="normal">/*
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>3</td>
|
<tr><td>3</td>
|
||||||
<td class="normal"> * $Id: Where.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
<td class="normal"> * $Id: Where.php 3029 2007-10-29 18:04:22Z zYne $
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>4</td>
|
<tr><td>4</td>
|
||||||
<td class="normal"> *
|
<td class="normal"> *
|
||||||
|
|
@ -97,7 +97,7 @@
|
||||||
<td class="normal"> * @since 1.0
|
<td class="normal"> * @since 1.0
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>30</td>
|
<tr><td>30</td>
|
||||||
<td class="normal"> * @version $Revision: 2963 $
|
<td class="normal"> * @version $Revision: 3029 $
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>31</td>
|
<tr><td>31</td>
|
||||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||||
|
|
@ -241,302 +241,282 @@
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>78</td>
|
<tr><td>78</td>
|
||||||
<td class="covered"> if ($this->query->getType() === Doctrine_Query::SELECT) {
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>79</td>
|
<tr><td>79</td>
|
||||||
<td class="covered"> $first = $conn->quoteIdentifier($alias)
|
<td class="covered"> $first = $this->query->parseClause($first);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>80</td>
|
<tr><td>80</td>
|
||||||
<td class="normal"> . '.'
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>81</td>
|
<tr><td>81</td>
|
||||||
<td class="covered"> . $conn->quoteIdentifier($table->getColumnName($field));
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>82</td>
|
|
||||||
<td class="covered"> } else {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>83</td>
|
|
||||||
<td class="covered"> $first = $conn->quoteIdentifier($table->getColumnName($field));
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>84</td>
|
|
||||||
<td class="normal"> }
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>85</td>
|
|
||||||
<td class="covered"> } else {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>86</td>
|
|
||||||
<td class="covered"> $first = $this->query->parseClause($first);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>87</td>
|
|
||||||
<td class="normal"> }
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>88</td>
|
|
||||||
<td class="covered"> $sql = $first . ' ' . $operator . ' ' . $this->parseValue($value, $table, $field);
|
<td class="covered"> $sql = $first . ' ' . $operator . ' ' . $this->parseValue($value, $table, $field);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>89</td>
|
<tr><td>82</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>90</td>
|
<tr><td>83</td>
|
||||||
<td class="covered"> return $sql;
|
<td class="covered"> return $sql;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>91</td>
|
<tr><td>84</td>
|
||||||
<td class="orange"> } else {
|
<td class="orange"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>92</td>
|
<tr><td>85</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>93</td>
|
<tr><td>86</td>
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>94</td>
|
<tr><td>87</td>
|
||||||
<td class="red"> }
|
<td class="red"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>95</td>
|
<tr><td>88</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>96</td>
|
<tr><td>89</td>
|
||||||
<td class="normal"> public function parseValue($value, Doctrine_Table $table = null, $field = null)
|
<td class="normal"> public function parseValue($value, Doctrine_Table $table = null, $field = null)
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>97</td>
|
<tr><td>90</td>
|
||||||
<td class="normal"> {
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>98</td>
|
<tr><td>91</td>
|
||||||
<td class="covered"> if (substr($value, 0, 1) == '(') {
|
<td class="covered"> if (substr($value, 0, 1) == '(') {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>99</td>
|
<tr><td>92</td>
|
||||||
<td class="normal"> // trim brackets
|
<td class="normal"> // trim brackets
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>100</td>
|
<tr><td>93</td>
|
||||||
<td class="covered"> $trimmed = Doctrine_Tokenizer::bracketTrim($value);
|
<td class="covered"> $trimmed = Doctrine_Tokenizer::bracketTrim($value);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
<tr><td>94</td>
|
||||||
|
<td class="normal">
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>95</td>
|
||||||
|
<td class="covered"> if (substr($trimmed, 0, 4) == 'FROM' ||
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>96</td>
|
||||||
|
<td class="covered"> substr($trimmed, 0, 6) == 'SELECT') {
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>97</td>
|
||||||
|
<td class="normal">
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>98</td>
|
||||||
|
<td class="normal"> // subquery found
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>99</td>
|
||||||
|
<td class="covered"> $q = new Doctrine_Query();
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>100</td>
|
||||||
|
<td class="covered"> $value = '(' . $this->query->createSubquery()->parseQuery($trimmed, false)->getQuery() . ')';
|
||||||
|
</td></tr>
|
||||||
<tr><td>101</td>
|
<tr><td>101</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>102</td>
|
<tr><td>102</td>
|
||||||
<td class="covered"> if (substr($trimmed, 0, 4) == 'FROM' ||
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>103</td>
|
|
||||||
<td class="covered"> substr($trimmed, 0, 6) == 'SELECT') {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>104</td>
|
|
||||||
<td class="normal">
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>105</td>
|
|
||||||
<td class="normal"> // subquery found
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>106</td>
|
|
||||||
<td class="covered"> $q = new Doctrine_Query();
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>107</td>
|
|
||||||
<td class="covered"> $value = '(' . $q->isSubquery(true)->parseQuery($trimmed)->getQuery() . ')';
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>108</td>
|
|
||||||
<td class="normal">
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>109</td>
|
|
||||||
<td class="covered"> } elseif (substr($trimmed, 0, 4) == 'SQL:') {
|
<td class="covered"> } elseif (substr($trimmed, 0, 4) == 'SQL:') {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>110</td>
|
<tr><td>103</td>
|
||||||
<td class="red"> $value = '(' . substr($trimmed, 4) . ')';
|
<td class="red"> $value = '(' . substr($trimmed, 4) . ')';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>111</td>
|
<tr><td>104</td>
|
||||||
<td class="red"> } else {
|
<td class="red"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>112</td>
|
<tr><td>105</td>
|
||||||
<td class="normal"> // simple in expression found
|
<td class="normal"> // simple in expression found
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>113</td>
|
<tr><td>106</td>
|
||||||
<td class="covered"> $e = Doctrine_Tokenizer::sqlExplode($trimmed, ',');
|
<td class="covered"> $e = Doctrine_Tokenizer::sqlExplode($trimmed, ',');
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>114</td>
|
<tr><td>107</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>115</td>
|
<tr><td>108</td>
|
||||||
<td class="covered"> $value = array();
|
<td class="covered"> $value = array();
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
<tr><td>109</td>
|
||||||
|
<td class="normal">
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>110</td>
|
||||||
|
<td class="covered"> $index = false;
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>111</td>
|
||||||
|
<td class="normal">
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>112</td>
|
||||||
|
<td class="covered"> foreach ($e as $part) {
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>113</td>
|
||||||
|
<td class="covered"> if (isset($table) && isset($field)) {
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>114</td>
|
||||||
|
<td class="covered"> $index = $table->enumIndex($field, trim($part, "'"));
|
||||||
|
</td></tr>
|
||||||
|
<tr><td>115</td>
|
||||||
|
<td class="covered"> }
|
||||||
|
</td></tr>
|
||||||
<tr><td>116</td>
|
<tr><td>116</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>117</td>
|
<tr><td>117</td>
|
||||||
<td class="covered"> $index = false;
|
<td class="covered"> if ($index !== false) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>118</td>
|
<tr><td>118</td>
|
||||||
<td class="normal">
|
<td class="covered"> $value[] = $index;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>119</td>
|
<tr><td>119</td>
|
||||||
<td class="covered"> foreach ($e as $part) {
|
<td class="covered"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>120</td>
|
<tr><td>120</td>
|
||||||
<td class="covered"> if (isset($table) && isset($field)) {
|
<td class="covered"> $value[] = $this->parseLiteralValue($part);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>121</td>
|
<tr><td>121</td>
|
||||||
<td class="covered"> $index = $table->enumIndex($field, trim($part, "'"));
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>122</td>
|
<tr><td>122</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>123</td>
|
<tr><td>123</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>124</td>
|
<tr><td>124</td>
|
||||||
<td class="covered"> if ($index !== false) {
|
<td class="covered"> $value = '(' . implode(', ', $value) . ')';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>125</td>
|
<tr><td>125</td>
|
||||||
<td class="covered"> $value[] = $index;
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>126</td>
|
<tr><td>126</td>
|
||||||
<td class="covered"> } else {
|
<td class="covered"> } elseif (substr($value, 0, 1) == ':' || $value === '?') {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>127</td>
|
<tr><td>127</td>
|
||||||
<td class="covered"> $value[] = $this->parseLiteralValue($part);
|
<td class="normal"> // placeholder found
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>128</td>
|
<tr><td>128</td>
|
||||||
<td class="normal"> }
|
<td class="covered"> if (isset($table) && isset($field) && $table->getTypeOf($field) == 'enum') {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>129</td>
|
<tr><td>129</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> $this->query->addEnumParam($value, $table, $field);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>130</td>
|
<tr><td>130</td>
|
||||||
<td class="normal">
|
<td class="covered"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>131</td>
|
<tr><td>131</td>
|
||||||
<td class="covered"> $value = '(' . implode(', ', $value) . ')';
|
<td class="covered"> $this->query->addEnumParam($value, null, null);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>132</td>
|
<tr><td>132</td>
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>133</td>
|
<tr><td>133</td>
|
||||||
<td class="covered"> } elseif (substr($value, 0, 1) == ':' || $value === '?') {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>134</td>
|
|
||||||
<td class="normal"> // placeholder found
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>135</td>
|
|
||||||
<td class="covered"> if (isset($table) && isset($field) && $table->getTypeOf($field) == 'enum') {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>136</td>
|
|
||||||
<td class="covered"> $this->query->addEnumParam($value, $table, $field);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>137</td>
|
|
||||||
<td class="covered"> } else {
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>138</td>
|
|
||||||
<td class="covered"> $this->query->addEnumParam($value, null, null);
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>139</td>
|
|
||||||
<td class="normal"> }
|
|
||||||
</td></tr>
|
|
||||||
<tr><td>140</td>
|
|
||||||
<td class="covered"> } else {
|
<td class="covered"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>141</td>
|
<tr><td>134</td>
|
||||||
<td class="covered"> $enumIndex = false;
|
<td class="covered"> $enumIndex = false;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>142</td>
|
<tr><td>135</td>
|
||||||
<td class="covered"> if (isset($table) && isset($field)) {
|
<td class="covered"> if (isset($table) && isset($field)) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>143</td>
|
<tr><td>136</td>
|
||||||
<td class="normal"> // check if value is enumerated value
|
<td class="normal"> // check if value is enumerated value
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>144</td>
|
<tr><td>137</td>
|
||||||
<td class="covered"> $enumIndex = $table->enumIndex($field, trim($value, "'"));
|
<td class="covered"> $enumIndex = $table->enumIndex($field, trim($value, "'"));
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>145</td>
|
<tr><td>138</td>
|
||||||
<td class="covered"> }
|
<td class="covered"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>146</td>
|
<tr><td>139</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>147</td>
|
<tr><td>140</td>
|
||||||
<td class="covered"> if ($enumIndex !== false) {
|
<td class="covered"> if ($enumIndex !== false) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>148</td>
|
<tr><td>141</td>
|
||||||
<td class="covered"> $value = $enumIndex;
|
<td class="covered"> $value = $enumIndex;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>149</td>
|
<tr><td>142</td>
|
||||||
<td class="covered"> } else {
|
<td class="covered"> } else {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>150</td>
|
<tr><td>143</td>
|
||||||
<td class="covered"> $value = $this->parseLiteralValue($value);
|
<td class="covered"> $value = $this->parseLiteralValue($value);
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>151</td>
|
<tr><td>144</td>
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>152</td>
|
<tr><td>145</td>
|
||||||
<td class="normal"> }
|
<td class="normal"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>153</td>
|
<tr><td>146</td>
|
||||||
<td class="covered"> return $value;
|
<td class="covered"> return $value;
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>154</td>
|
<tr><td>147</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>155</td>
|
<tr><td>148</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>156</td>
|
<tr><td>149</td>
|
||||||
<td class="normal"> /**
|
<td class="normal"> /**
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>157</td>
|
<tr><td>150</td>
|
||||||
<td class="normal"> * parses an EXISTS expression
|
<td class="normal"> * parses an EXISTS expression
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>158</td>
|
<tr><td>151</td>
|
||||||
<td class="normal"> *
|
<td class="normal"> *
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>159</td>
|
<tr><td>152</td>
|
||||||
<td class="normal"> * @param string $where query where part to be parsed
|
<td class="normal"> * @param string $where query where part to be parsed
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>160</td>
|
<tr><td>153</td>
|
||||||
<td class="normal"> * @param boolean $negation whether or not to use the NOT keyword
|
<td class="normal"> * @param boolean $negation whether or not to use the NOT keyword
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>161</td>
|
<tr><td>154</td>
|
||||||
<td class="normal"> * @return string
|
<td class="normal"> * @return string
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>162</td>
|
<tr><td>155</td>
|
||||||
<td class="normal"> */
|
<td class="normal"> */
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>163</td>
|
<tr><td>156</td>
|
||||||
<td class="normal"> public function parseExists($where, $negation)
|
<td class="normal"> public function parseExists($where, $negation)
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>164</td>
|
<tr><td>157</td>
|
||||||
<td class="normal"> {
|
<td class="normal"> {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>165</td>
|
<tr><td>158</td>
|
||||||
<td class="covered"> $operator = ($negation) ? 'EXISTS' : 'NOT EXISTS';
|
<td class="covered"> $operator = ($negation) ? 'EXISTS' : 'NOT EXISTS';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>166</td>
|
<tr><td>159</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>167</td>
|
<tr><td>160</td>
|
||||||
<td class="covered"> $pos = strpos($where, '(');
|
<td class="covered"> $pos = strpos($where, '(');
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>168</td>
|
<tr><td>161</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>169</td>
|
<tr><td>162</td>
|
||||||
<td class="covered"> if ($pos == false) {
|
<td class="covered"> if ($pos == false) {
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>170</td>
|
<tr><td>163</td>
|
||||||
<td class="red"> throw new Doctrine_Query_Exception('Unknown expression, expected a subquery with () -marks');
|
<td class="red"> throw new Doctrine_Query_Exception('Unknown expression, expected a subquery with () -marks');
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>171</td>
|
<tr><td>164</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>172</td>
|
<tr><td>165</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>173</td>
|
<tr><td>166</td>
|
||||||
<td class="covered"> $sub = Doctrine_Tokenizer::bracketTrim(substr($where, $pos));
|
<td class="covered"> $sub = Doctrine_Tokenizer::bracketTrim(substr($where, $pos));
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>174</td>
|
<tr><td>167</td>
|
||||||
<td class="normal">
|
<td class="normal">
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>175</td>
|
<tr><td>168</td>
|
||||||
<td class="covered"> return $operator . ' (' . $this->query->createSubquery()->parseQuery($sub, false)->getQuery() . ')';
|
<td class="covered"> return $operator . ' (' . $this->query->createSubquery()->parseQuery($sub, false)->getQuery() . ')';
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>176</td>
|
<tr><td>169</td>
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>177</td>
|
<tr><td>170</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -973,5 +973,6 @@
|
||||||
<td class="orange"> }
|
<td class="orange"> }
|
||||||
</td></tr>
|
</td></tr>
|
||||||
<tr><td>322</td>
|
<tr><td>322</td>
|
||||||
<td class="covered">}</td></tr>
|
<td class="normal">}
|
||||||
|
</td></tr>
|
||||||
</table></body></html>
|
</table></body></html>
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because one or more lines are too long
Loading…
Add table
Reference in a new issue