Changeset 4367

Timestamp:

05/17/08 01:20:33 (8 months ago)

Author:

jwage

Message:

fixes #1042

Files:

• branches/0.11/lib/Doctrine/Import/Schema.php (modified) (7 diffs)

branches/0.11/lib/Doctrine/Import/Schema.php

@@ -325 +325 @@
 
         foreach ($array as $className => $table) {
-            $this->_validateSchemaElement('root', array_keys($table));
+            $this->_validateSchemaElement('root', array_keys($table), $className);
 
             $columns = array();
@@ -359 +359 @@
                     }
 
-                    $this->_validateSchemaElement('column', array_keys($field));
-
                     $colDesc = array();
                     if (isset($field['name'])) {
@@ -367 +365 @@
                         $colDesc['name'] = $columnName;
                     }
+
+                    $this->_validateSchemaElement('column', array_keys($field), $className . '->columns->' . $colDesc['name']);
 
                     // Support short type(length) syntax: my_column: { type: integer(4) }
@@ -436 +436 @@
         foreach ($array as $className => $definition) {
             if ( ! empty($array[$className]['inheritance'])) {
-                $this->_validateSchemaElement('inheritance', array_keys($definition['inheritance']));
+                $this->_validateSchemaElement('inheritance', array_keys($definition['inheritance']), $className . '->inheritance');
 
                 // Default inheritance to concrete inheritance
@@ -556 +556 @@
                 $relation['key'] = $this->_buildUniqueRelationKey($relation);
                 
-                $this->_validateSchemaElement('relation', array_keys($relation));
+                $this->_validateSchemaElement('relation', array_keys($relation), $className . '->relation->' . $relation['alias']);
                 
                 $this->_relations[$className][$alias] = $relation;
@@ -673 +673 @@
      * @return void
      */
-    protected function _validateSchemaElement($name, $element)
+    protected function _validateSchemaElement($name, $element, $path)
     {
         $element = (array) $element;
@@ -689 +689 @@
         foreach ($element as $key => $value) {
             if ( ! isset($validation[$value])) {
-                throw new Doctrine_Import_Exception('Invalid schema element named "' . $value . '"');
+                throw new Doctrine_Import_Exception(sprintf('Invalid schema element named "' . $value . '" 
+                                at path "' . $path . '"'));
             }
         }