From eebb7c7e1801e34d4801ea0c84727a7fcac95ee0 Mon Sep 17 00:00:00 2001
From: beberlei <beberlei@625475ce-881a-0410-a577-b389adb331d8>
Date: Tue, 26 Jan 2010 21:45:20 +0000
Subject: [PATCH] [2.0] DDC-277 - Remove support "default" option in metadata
 mappings, but keep it as a concept in DBAL layer to support for example
 versionable entities.

---
 lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php    | 4 ----
 lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php      | 1 -
 lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php | 1 -
 3 files changed, 6 deletions(-)

diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
index 410c23344..059a5ff43 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -192,10 +192,6 @@ class AnnotationDriver implements Driver
                     $mapping['options'] = $columnAnnot->options;
                 }
                 
-                if (isset($columnAnnot->default)) {
-                    $mapping['default'] = $columnAnnot->default;
-                }
-                
                 if (isset($columnAnnot->name)) {
                     $mapping['columnName'] = $columnAnnot->name;
                 }
diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
index c541fc008..192ba08a7 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
@@ -102,7 +102,6 @@ class DatabaseDriver implements Driver
                 $fieldMapping['unsigned'] = $column->getUnsigned();
             }
             $fieldMapping['notnull'] = $column->getNotNull();
-            $fieldMapping['default'] = $column->getDefault();
 
             if (isset($fieldMapping['id'])) {
                 $ids[] = $fieldMapping;
diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
index 3d0ae896d..26284c694 100644
--- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
+++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
@@ -60,7 +60,6 @@ final class Column extends Annotation {
     public $scale = 0; // The scale for a decimal (exact numeric) column (Applies only for decimal column)
     public $unique = false;
     public $nullable = false;
-    public $default; //TODO: remove?
     public $name;
     public $options = array();
     public $columnDefinition;