Skip to content

Commit

Permalink
#1202 - simplified test and test asset
Browse files Browse the repository at this point in the history
  • Loading branch information
Ocramius committed Dec 8, 2014
1 parent 5670912 commit a5a7c87
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
16 changes: 3 additions & 13 deletions tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,12 @@

namespace Doctrine\Tests\Models\NullDefault;

/**
* @Entity
* @Table(name="null-default")
*/
/** @Entity */
class NullDefaultColumn
{

/**
* @Id
* @GeneratedValue
* @Column(type="integer")
*/
/** @Id @GeneratedValue @Column(type="integer") */
public $id;

/**
* @Column(name="`null-default`",nullable=true,options={"default":NULL})
*/
/** @Column(options={"default":NULL}) */
public $nullDefault;
}
4 changes: 2 additions & 2 deletions tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ public function testNullDefaultNotAddedToCustomSchemaOptions()
);

$customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes)
->getTable('null-default')
->getColumn('null-default')
->getTable('NullDefaultColumn')
->getColumn('nullDefault')
->getCustomSchemaOptions();

$this->assertSame(array(), $customSchemaOptions);
Expand Down

0 comments on commit a5a7c87

Please sign in to comment.