Permalink
Browse files

Removing join() on DataList/DataQuery

Use leftJoin() or innerJoin() instead
  • Loading branch information...
1 parent b43b023 commit 68bb74820ab2dad459b5972a4315dcc451f94fa7 @halkyon halkyon committed Nov 14, 2012
Showing with 0 additions and 32 deletions.
  1. +0 −14 model/DataList.php
  2. +0 −18 model/DataQuery.php
View
@@ -234,20 +234,6 @@ public function canFilterBy($fieldName) {
}
/**
- * Return a new DataList instance with a join clause added to this list's query.
- *
- * @param type $join Escaped SQL statement
- * @return DataList
- * @deprecated 3.0
- */
- public function join($join) {
- Deprecation::notice('3.0', 'Use innerJoin() or leftJoin() instead.');
- return $this->alterDataQuery_30(function($query) use ($join){
- $query->join($join);
- });
- }
-
- /**
* Return a new DataList instance with the records returned in this query restricted by a limit clause
*
* @param int $limit
View
@@ -531,24 +531,6 @@ public function limit($limit, $offset = 0) {
}
/**
- * Add a join clause to this query
- * @deprecated 3.0 Use innerJoin() or leftJoin() instead.
- */
- public function join($join) {
- Deprecation::notice('3.0', 'Use innerJoin() or leftJoin() instead.');
- if($join) {
- $this->query->addFrom($join);
- // TODO: This needs to be resolved for all databases
-
- if(DB::getConn() instanceof MySQLDatabase) {
- $from = $this->query->getFrom();
- $this->query->setGroupBy(reset($from) . ".\"ID\"");
- }
- }
- return $this;
- }
-
- /**
* Add an INNER JOIN clause to this query.
*
* @param String $table The unquoted table name to join to.

0 comments on commit 68bb748

Please sign in to comment.