Changeset 6019

Timestamp:

11/14/07 12:28:24 (2 years ago)

Author:

fabien

Message:

fixed sfPropel::Data::dumpData() (patch from fred)

Files:

• branches/1.0/lib/addon/propel/sfPropelData.class.php (modified) (3 diffs)

branches/1.0/lib/addon/propel/sfPropelData.class.php

@@ -111 +111 @@
-        foreach ($data as $name => $value)
-        {
+          $isARealColumn = true;
+          try
+          {
+            $column = $tableMap->getColumn($name);
+          }
+          catch (PropelException $e)
+          {
+            $isARealColumn = false;
+          }
+
-          // foreign key?
-
-
-
+
+
-            if ($column->isForeignKey() && !is_null($value))
-            {
-              $relatedTable = $this->maps[$class]->getDatabaseMap()->getTable($column->getRelatedTableName());
+
-              if (!isset($this->object_references[$relatedTable->getPhpName().'_'.$value]))
-              {
-
-
-
+
-              }
+
-              $value = $this->object_references[$relatedTable->getPhpName().'_'.$value];
-            }
-          }
-          catch (PropelException $e)
-          {
-          }
-
@@ -287 +293 @@
-
-    $tables = $this->fixOrderingOfForeignKeyData($tables);
-
-    foreach ($tables as $tableName)
-    {
-      $tableMap = $this->maps[$tableName]->getDatabaseMap()->getTable(constant($tableName.'Peer::TABLE_NAME'));
+      $hasParent = false;
+      $haveParents = false;
+      $fixColumn = null;
+      foreach ($tableMap->getColumns() as $column)
+      {
+        $col = strtolower($column->getColumnName());
+        if ($column->isForeignKey())
+        {
+          $relatedTable = $this->maps[$tableName]->getDatabaseMap()->getTable($column->getRelatedTableName());
+          if ($tableName === $relatedTable->getPhpName())
+          {
+            if ($hasParent)
+            {
+              $haveParents = true;
+            }
+            else
+            {
+              $fixColumn = $column;
+              $hasParent = true;
+            }
+          }
+        }
+      }
+
+      if ($haveParents)
+      {
+        // unable to dump tables having multi-recursive references
+        continue;
+      }
-
-      // get db info
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-          $dumpData[$tableName] = array();
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-    }
@@ -386 +456 @@
-    return $classes;
-  }
+  
+  protected function fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $column, $in = null)
+  {
+    $rs = $this->con->executeQuery(sprintf('SELECT * FROM %s WHERE %s %s',
+      constant($tableName.'Peer::TABLE_NAME'),
+      strtolower($column->getColumnName()),
+      is_null($in) ? 'IS NULL' : 'IN ('.$in.')'
+    ));
+    $in = array();
+    while ($rs->next())
+    {
+      $in[] = "'".$rs->get(strtolower($column->getRelatedColumnName()))."'";
+    }
+
+    if ($in = implode(', ', $in))
+    {
+      $rs->seek(0);
+      $resultsSets[] = $rs;
+      $resultsSets = $this->fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $column, $in);
+    }
+
+    return $resultsSets;
+  }
-}