From 4727489134d45442f993300c5f26ea6092156177 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sun, 12 Sep 2010 22:34:32 +0200
Subject: [PATCH] DDC-761 - Fix join columns not using the same lengh,
precision and scale for string and decimal types.
---
lib/Doctrine/ORM/Tools/SchemaTool.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
index fba93cde8..13834ae96 100644
--- a/lib/Doctrine/ORM/Tools/SchemaTool.php
+++ b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -1,7 +1,5 @@
<?php
/*
- * $Id$
- *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -442,6 +440,12 @@ class SchemaTool
if (isset($joinColumn['nullable'])) {
$columnOptions['notnull'] = !$joinColumn['nullable'];
}
+ if ($fieldMapping['type'] == "string") {
+ $columnOptions['length'] = $fieldMapping['length'];
+ } else if ($fieldMapping['type'] == "decimal") {
+ $columnOptions['scale'] = $fieldMapping['scale'];
+ $columnOptions['precision'] = $fieldMapping['precision'];
+ }
$theJoinTable->addColumn(
$columnName, $class->getTypeOfColumn($joinColumn['referencedColumnName']), $columnOptions