Changeset 1065 for branches

Timestamp:

07/07/08 17:27:08 (5 months ago)

Author:

heltem

Message:

Add check for existance of nestedSetRightKey and nestedSetLeftKey attributes in nested set tables (closes #653)

Files:

• branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php (modified) (1 diff)

branches/1.3/generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php

@@ -194 +194 @@
-                $tableName = $table->getName();
-
-
-
-
-
+
-
-                foreach ($table->getColumns() as $col) {
-                        if ($col->isNestedSetLeftKey()) {
-left_colname
+colname['left']
-                        }
-
-                        if ($col->isNestedSetRightKey()) {
-right_colname
+colname['right']
-                        }
-
-                        if ($col->isTreeScopeKey()) {
-scope_colname
+colname['scope']
-                        }
-
-!empty($right_name) && !empty($left_colname) && !empty($scope_
+3 == count($
-                                break;
-                        }
-                }
+
+                if(!isset($colname['left'])) {
+                        throw new EngineException("One column must have nestedSetLeftKey attribute set to true for [" . $table->getName() . "] table");
+                }
+
+                if(!isset($colname['right'])) {
+                        throw new EngineException("One column must have nestedSetRightKey attribute set to true for [" . $table->getName() . "] table");
+                }
+
+                $colname['scope'] = isset($colname['scope']) ? $colname['scope'] : null;
+
-                $script .= "
-        /**
-         * Left column for the set
-         */
-left_colname
+colname['left']
-
-        /**
-         * Right column for the set
-         */
-right_colname
+colname['right']
-
-        /**
-         * Scope column for the set
-         */
- const SCOPE_COL = " . var_export($scope_colname
+const SCOPE_COL = " . var_export($colname['scope']
-";
-        }