|
|
@@ -858,7 +858,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
|
|
|
public function testSelectWhereWithTypeFloat()
|
|
|
{
|
|
|
- $locale = setlocale(LC_ALL, null);
|
|
|
+ $locale = setlocale(LC_ALL, 0);
|
|
|
|
|
|
$select = $this->_selectWhereWithTypeFloat();
|
|
|
$stmt = $this->_db->query($select);
|
|
|
@@ -1697,7 +1697,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
$serialize = serialize($this->_select());
|
|
|
$this->assertTrue(is_string($serialize));
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* @group ZF-3792
|
|
|
*/
|
|
|
@@ -1706,7 +1706,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
$table_A = $this->_db->quoteTableAs('A');
|
|
|
$table_B = $this->_db->quoteTableAs('B');
|
|
|
$colname = $this->_db->quoteIdentifier('colname');
|
|
|
-
|
|
|
+
|
|
|
$s = $this->_db->select()->from('A')->joinUsing('B', $colname);
|
|
|
$this->assertContains("JOIN {$table_B} ON {$table_B}.{$colname} = {$table_A}.{$colname}", $s->assemble());
|
|
|
}
|
|
|
@@ -1720,7 +1720,7 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
$table_B = $this->_db->quoteTableAs('B');
|
|
|
$colOne = $this->_db->quoteIdentifier('colOne');
|
|
|
$colTwo = $this->_db->quoteIdentifier('colTwo');
|
|
|
-
|
|
|
+
|
|
|
$s = $this->_db->select()->from('A')->joinUsing('B', array($colOne,$colTwo));
|
|
|
$this->assertContains(
|
|
|
"JOIN {$table_B} ON {$table_B}.{$colOne} = {$table_A}.{$colOne}"
|
|
|
@@ -1737,12 +1737,12 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
$table1 = $this->_db->quoteTableAs('table1');
|
|
|
$table2 = $this->_db->quoteTableAs('table2');
|
|
|
$colname = $this->_db->quoteIdentifier('column1');
|
|
|
-
|
|
|
+
|
|
|
$select = $this->_db->select();
|
|
|
$select->from('table1')->joinUsing('table2', $colname);
|
|
|
$this->assertRegexp("/ON {$table2}.{$colname}/s", $select->assemble());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* @group ZF-3309
|
|
|
*/
|
|
|
@@ -1751,10 +1751,10 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
|
|
|
$table1 = $this->_db->quoteTableAs('table1');
|
|
|
$table2_alias = $this->_db->quoteTableAs('t2');
|
|
|
$colname = $this->_db->quoteIdentifier('column1');
|
|
|
-
|
|
|
+
|
|
|
$select = $this->_db->select();
|
|
|
$select->from('table1')->joinUsing(array('t2'=>'table2'), $colname);
|
|
|
$this->assertRegexp("/ON {$table2_alias}.{$colname}/s", $select->assemble());
|
|
|
- }
|
|
|
-
|
|
|
+ }
|
|
|
+
|
|
|
}
|