Changeset 4796
- Timestamp:
- 08/23/08 17:55:23 (11 months ago)
- Location:
- branches/1.0
- Files:
-
- 7 modified
-
lib/Doctrine/Export.php (modified) (2 diffs)
-
lib/Doctrine/Export/Mssql.php (modified) (1 diff)
-
lib/Doctrine/Query/Abstract.php (modified) (1 diff)
-
tests/Query/SelectTestCase.php (modified) (3 diffs)
-
tests/run.php (modified) (3 diffs)
-
tests/Ticket/1106TestCase.php (modified) (1 diff)
-
tests/Ticket/1116TestCase.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/1.0/lib/Doctrine/Export.php
r4780 r4796 693 693 * Boolean flag that indicates whether this field is constrained 694 694 * to not be set to null. 695 * 695 696 * charset 696 697 * Text value with the default CHARACTER SET for this field. 698 * 697 699 * collation 698 700 * Text value with the default COLLATION for this field. 701 * 699 702 * unique 700 703 * unique constraint 704 * 701 705 * check 702 706 * column check constraint … … 777 781 778 782 /** 779 * get DefaultDeclaration783 * getNotNullFieldDeclaration 780 784 * Obtain DBMS specific SQL code portion needed to set a NOT NULL 781 785 * declaration to be used in statements like CREATE TABLE. -
branches/1.0/lib/Doctrine/Export/Mssql.php
r4780 r4796 257 257 258 258 /** 259 * get DefaultDeclaration259 * getNotNullFieldDeclaration 260 260 * Obtain DBMS specific SQL code portion needed to set a NOT NULL 261 261 * declaration to be used in statements like CREATE TABLE. -
branches/1.0/lib/Doctrine/Query/Abstract.php
r4794 r4796 1825 1825 protected function _addDqlQueryPart($queryPartName, $queryPart, $append = false) 1826 1826 { 1827 // We should prevent nullable query parts 1828 if ($queryPart === null) { 1829 throw new Doctrine_Query_Exception('Cannot define NULL as part of query when defining \'' . $queryPartName . '\'.'); 1830 } 1831 1827 1832 if ($append) { 1828 1833 $this->_dqlParts[$queryPartName][] = $queryPart; -
branches/1.0/tests/Query/SelectTestCase.php
r3884 r4796 33 33 class Doctrine_Query_Select_TestCase extends Doctrine_UnitTestCase 34 34 { 35 /**35 36 36 public function testParseSelect() 37 37 { … … 112 112 { 113 113 $q = new Doctrine_Query(); 114 114 115 115 try { 116 116 $q->select(null); 117 117 118 118 $this->fail(); 119 119 } catch(Doctrine_Query_Exception $e) { … … 121 121 } 122 122 } 123 */ 123 124 124 public function testUnknownAggregateFunction() 125 125 { -
branches/1.0/tests/run.php
r4780 r4796 13 13 } 14 14 15 require_once(DOCTRINE_DIR . 'Doctrine.php'); 16 17 spl_autoload_register(array('Doctrine', 'autoload')); 18 15 19 require_once(dirname(__FILE__) . '/DoctrineTest.php'); 16 require_once(DOCTRINE_DIR . 'Doctrine.php'); 17 18 spl_autoload_register(array('Doctrine', 'autoload')); 20 19 21 spl_autoload_register(array('DoctrineTest','autoload')); 20 22 … … 43 45 $tickets->addTestCase(new Doctrine_Ticket_638_TestCase()); 44 46 $tickets->addTestCase(new Doctrine_Ticket_642_TestCase()); 45 $tickets->addTestCase(new Doctrine_Ticket_438_TestCase());46 47 $tickets->addTestCase(new Doctrine_Ticket_673_TestCase()); 47 48 $tickets->addTestCase(new Doctrine_Ticket_697_TestCase()); 48 $tickets->addTestCase(new Doctrine_Ticket_832_TestCase());49 $tickets->addTestCase(new Doctrine_Ticket_838_TestCase());50 $tickets->addTestCase(new Doctrine_Ticket_904_TestCase());51 $tickets->addTestCase(new Doctrine_Ticket_923_TestCase());52 $tickets->addTestCase(new Doctrine_Ticket_927_TestCase());53 $tickets->addTestCase(new Doctrine_Ticket_935_TestCase());54 $tickets->addTestCase(new Doctrine_Ticket_966_TestCase());55 $tickets->addTestCase(new Doctrine_Ticket_969_TestCase());56 $tickets->addTestCase(new Doctrine_Ticket_941_TestCase());57 $tickets->addTestCase(new Doctrine_Ticket_930_TestCase());58 59 // Only uncomment the following ticket if you want to check free() performance!60 //$tickets->addTestCase(new Doctrine_Ticket_710_TestCase());61 62 49 $tickets->addTestCase(new Doctrine_Ticket_736_TestCase()); 63 50 $tickets->addTestCase(new Doctrine_Ticket_741_TestCase()); 64 51 $tickets->addTestCase(new Doctrine_Ticket_749_TestCase()); 65 52 $tickets->addTestCase(new Doctrine_Ticket_786_TestCase()); 53 //$tickets->addTestCase(new Doctrine_Ticket_710_TestCase()); // Only uncomment if you want to check free() performance! 54 $tickets->addTestCase(new Doctrine_Ticket_832_TestCase()); 55 $tickets->addTestCase(new Doctrine_Ticket_838_TestCase()); 66 56 $tickets->addTestCase(new Doctrine_Ticket_867_TestCase()); 67 57 $tickets->addTestCase(new Doctrine_Ticket_876_TestCase()); 68 58 $tickets->addTestCase(new Doctrine_Ticket_889_TestCase()); 59 $tickets->addTestCase(new Doctrine_Ticket_894_TestCase()); 69 60 $tickets->addTestCase(new Doctrine_Ticket_904_TestCase()); 70 61 $tickets->addTestCase(new Doctrine_Ticket_912_TestCase()); 71 62 $tickets->addTestCase(new Doctrine_Ticket_915_TestCase()); 72 $tickets->addTestCase(new Doctrine_Ticket_932_TestCase()); 63 $tickets->addTestCase(new Doctrine_Ticket_923_TestCase()); 64 $tickets->addTestCase(new Doctrine_Ticket_927_TestCase()); 73 65 $tickets->addTestCase(new Doctrine_Ticket_929_TestCase()); 74 66 $tickets->addTestCase(new Doctrine_Ticket_930_TestCase()); 75 $tickets->addTestCase(new Doctrine_Ticket_963_TestCase()); 67 $tickets->addTestCase(new Doctrine_Ticket_932_TestCase()); 68 $tickets->addTestCase(new Doctrine_Ticket_935_TestCase()); 69 $tickets->addTestCase(new Doctrine_Ticket_941_TestCase()); 76 70 $tickets->addTestCase(new Doctrine_Ticket_950_TestCase()); 77 71 $tickets->addTestCase(new Doctrine_Ticket_952_TestCase()); 78 $tickets->addTestCase(new Doctrine_Ticket_894_TestCase()); 72 $tickets->addTestCase(new Doctrine_Ticket_963_TestCase()); 73 $tickets->addTestCase(new Doctrine_Ticket_966_TestCase()); 74 $tickets->addTestCase(new Doctrine_Ticket_969_TestCase()); 79 75 $tickets->addTestCase(new Doctrine_Ticket_982_TestCase()); 80 76 $tickets->addTestCase(new Doctrine_Ticket_987_TestCase()); … … 88 84 $tickets->addTestCase(new Doctrine_Ticket_1113_TestCase()); 89 85 $tickets->addTestCase(new Doctrine_Ticket_1116_TestCase()); 86 $tickets->addTestCase(new Doctrine_Ticket_1118_TestCase()); 90 87 $tickets->addTestCase(new Doctrine_Ticket_1121_TestCase()); 91 88 $tickets->addTestCase(new Doctrine_Ticket_1125_TestCase()); 92 $tickets->addTestCase(new Doctrine_Ticket_1134_TestCase());93 $tickets->addTestCase(new Doctrine_Ticket_1118_TestCase());94 89 $tickets->addTestCase(new Doctrine_Ticket_1123_TestCase()); 95 90 $tickets->addTestCase(new Doctrine_Ticket_1124_TestCase()); 96 91 $tickets->addTestCase(new Doctrine_Ticket_1131_TestCase()); 97 92 $tickets->addTestCase(new Doctrine_Ticket_1133_TestCase()); 93 $tickets->addTestCase(new Doctrine_Ticket_1134_TestCase()); 98 94 $tickets->addTestCase(new Doctrine_Ticket_1160_TestCase()); 99 95 $tickets->addTestCase(new Doctrine_Ticket_1175_TestCase()); -
branches/1.0/tests/Ticket/1106TestCase.php
r4505 r4796 21 21 22 22 /** 23 * Doctrine_ Record_State_TestCase23 * Doctrine_Ticket_1106_TestCase 24 24 * 25 25 * @package Doctrine -
branches/1.0/tests/Ticket/1116TestCase.php
r4716 r4796 1 1 <?php 2 3 /* 4 * $Id$ 5 * 6 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 7 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 8 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 9 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 10 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 11 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 12 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 13 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 14 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 15 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 16 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 17 * 18 * This software consists of voluntary contributions made by many individuals 19 * and is licensed under the LGPL. For more information, see 20 * <http://www.phpdoctrine.org>. 21 */ 22 23 /** 24 * Doctrine_Ticket_1116_TestCase 25 * 26 * @package Doctrine 27 * @author Konsta Vesterinen <kvesteri@cc.hut.fi> 28 * @license http://www.opensource.org/licenses/lgpl-license.php LGPL 29 * @category Object Relational Mapping 30 * @link www.phpdoctrine.org 31 * @since 1.0 32 * @version $Revision$ 33 */ 2 34 class Doctrine_Ticket_1116_TestCase extends Doctrine_UnitTestCase 3 35 {