Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Join poc #368

Merged
merged 4 commits into from Jun 18, 2012

Conversation

Projects
None yet
7 participants
Owner

guilhermeblanco commented Jun 10, 2012

No description provided.

@asm89 asm89 referenced this pull request Jun 10, 2012

Closed

[PoC] Arbitrary join support #366

Owner

beberlei commented Jun 18, 2012

So what is the state? Can we merge this?

This pull request fails (merged 6f13e95 into 0c49524).

@beberlei beberlei added a commit that referenced this pull request Jun 18, 2012

@beberlei beberlei Merge pull request #368 from doctrine/join-poc
Join poc
a3210e7

@beberlei beberlei merged commit a3210e7 into master Jun 18, 2012

gseric commented Jun 4, 2013

asm89, sorry for dragging this closed issue... I'm stucked with a problem introduced in this PR (IMHO) for Doctrine ORM v2.3. I already described it here (3rd comment):
http://www.doctrine-project.org/jira/browse/DDC-2131
but had no response. Would you mind to check my description and either confirm or discard the existance of bug?

@Burgov Burgov commented on the diff Jun 5, 2013

...Doctrine/ORM/Query/AST/JoinAssociationDeclaration.php
+ * $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+<<<<<<< HEAD:lib/Doctrine/ORM/Query/AST/JoinVariableDeclaration.php
@Burgov

Burgov Jun 5, 2013

Contributor

There's an unresolved conflict here

@Ocramius Ocramius deleted the join-poc branch Jul 7, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment