Changeset 10901

Timestamp:

08/14/08 21:07:49 (2 years ago)

Author:

francois

Message:

DbFinderPlugin Added support for sfDoctrineFinder::join() (WIP)

Files:

• plugins/DbFinderPlugin/lib/sfDoctrineFinder.php (modified) (9 diffs)
• plugins/DbFinderPlugin/lib/sfModelFinder.php (modified) (1 diff)
• plugins/DbFinderPlugin/lib/sfPropelFinder.php (modified) (1 diff)
• plugins/DbFinderPlugin/test/unit/sfDoctrineFinderInternalsTest.php (modified) (1 diff)
• plugins/DbFinderPlugin/test/unit/sfDoctrineFinderRelationsTest.php (added)

plugins/DbFinderPlugin/lib/sfDoctrineFinder.php

@@ -16 +16 @@
-    $class         = null,
-    $alias         = null,
+    $aliases       = array(),
-    $object        = null,
-    $reinit        = true,
@@ -25 +26 @@
-    $argNumber     = 0,
-    $queryListener = null,
+    $relatedTables = array(),
-    $withClasses   = array(),
-    $withColumns   = array(),
@@ -39 +41 @@
-  public function setClass($class, $alias = '')
-  {
-Relation
+Alias
-    $this->class = $class;
-    $this->alias = $alias;
-    $this->object = new $class();
+    $this->relatedTables = array($this->object->getTable());
-    $this->initialize($this->connection, $class, $alias);
-    
@@ -92 +95 @@
-  {
-    return $this->getQuery();
+  }
+  
+  protected function addAlias($class, $alias = '')
+  {
+    if(!$alias) list($class, $alias) = $this->getClassAndAlias($class);
+    $this->aliases[$class] = $alias;
+  }
+  
+  /**
+   * $aliases property is a $class => $alias hash
+   */
+  protected function getAlias($class)
+  {
+    if(array_key_exists($class, $this->aliases))
+    {
+      return $this->aliases[$class];
+    }
+    
+    return $class;
+  }
+  
+  protected function isAlias($alias)
+  {
+    return in_array($alias, array_values($this->aliases));
+  }
+  
+  protected function getClassFromAlias($alias)
+  {
+    return array_search($alias, $this->aliases);
-  }
-  
@@ -241 +273 @@
-    
-    return $this;
-  }
-  
-  protected function addRelation($class, $alias = '')
-  {
-    if(!$alias) list($class, $alias) = $this->getClassAndAlias($class);
-    $this->relations[$alias] = $class;
-  }
-  
@@ -979 +1005 @@
-  public function join()
-  {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    return $this;
@@ -1000 +1054 @@
-  }
-  
-peerName
-
-throw new Exception('This method is not yet implemented'
-
-
-
-Guess the relation to another class
-
-phpName
+class
+
+return array_key_exists($class, $this->relations
+
+
+
+Finds a relation between two classes by introspection
+
+class
-   * 
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  
@@ -1048 +1124 @@
-  {
-    throw new Exception('This method is not yet implemented');
+  }
+  
+  protected function getClassAndAlias($class)
+  {
+    if(strpos($class, ' ') !== false)
+    {
+      // true alias given by user
+      list($class, $alias) = explode(' ', $class);
+      return array($class, $alias, true);
+    }
+    else
+    {
+      // no alias, computing one
+      $alias = strtolower(substr($class, 0, 1));
+      while(in_array($alias, $this->aliases))
+      {
+        $alias .= '1';
+      }
+      return array($class, $alias, false);
+    }
-  }
-  
@@ -1073 +1169 @@
-      }
-    }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

plugins/DbFinderPlugin/lib/sfModelFinder.php

@@ -188 +188 @@
-  }
-  
-  protected function getClassAndAlias($class)
-  {
-    if(strpos($class, ' ') !== false)
-    {
-      list($class, $alias) = explode(' ', $class);
-    }
-    else
-    {
-      $alias = strtolower(substr($class, 0, 1));
-      while(isset($this->relations[$alias]))
-      {
-        $alias .= '1';
-      }
-    }
-    return array($class, $alias);
-  }
-  
-  protected static function getValueAndComparisonFromArguments($arguments = array())
-  {

plugins/DbFinderPlugin/lib/sfPropelFinder.php

@@ -1457 +1457 @@
-  }
-  
+  protected function getClassAndAlias($class)
+  {
+    if(strpos($class, ' ') !== false)
+    {
+      list($class, $alias) = explode(' ', $class);
+    }
+    else
+    {
+      $alias = strtolower(substr($class, 0, 1));
+      while(isset($this->relations[$alias]))
+      {
+        $alias .= '1';
+      }
+    }
+    return array($class, $alias);
+  }
+  
-  protected function getColName($phpName, $peerClass = null, $withPeerClass = false, $autoAddJoin = true)
-  {

plugins/DbFinderPlugin/test/unit/sfDoctrineFinderInternalsTest.php

@@ -71 +71 @@
-  }
-}
-
-a
-Article_Title'), 'a
-Article.Title'), 'a
-Article.CategoryId'), 'a
-Article.categoryId'), 'a
-a.Title'), 'a
+D
+d
+DArticle_Title'), 'd
+DArticle.Title'), 'd
+DArticle.CategoryId'), 'd
+DArticle.categoryId'), 'd
+d.Title'), 'd
-
-
+D
-$t->is($finder->getColName('b.Title'), 'b.title', 'getColName() recognizes [table alias].[column phpName]');