From eaf66c19d29c6b7a32f9e9c7b37d96b23032e993 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 1 May 2012 13:36:53 +0200
Subject: [PATCH] [#783] Result holds wrong data when tables in a cartesian
 self product (or self cross join) are not aliased - added integration test

---
 .../org/jooq/test/_/testcases/JoinTests.java  | 39 +++++++++++++++++++
 .../src/org/jooq/test/jOOQAbstractTest.java   |  5 +++
 2 files changed, 44 insertions(+)

diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
index d0d1de0827..636351ed50 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java
@@ -95,6 +95,29 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
         super(delegate);
     }
 
+    @Test
+    public void testJoinDuplicateFieldNames() throws Exception {
+
+        // [#783] Result holds wrong data when tables in a cartesian self
+        // product (or self cross join) are not aliased
+        // --------------------------------------------
+
+        // This query selects two different ID fields. It should be possible
+        // to extract both from the resulting records
+        Result<?> result =
+        create().select()
+                .from(TAuthor())
+                .join(TBook()).on(TAuthor_ID().equal(TBook_AUTHOR_ID()))
+                .crossJoin(create().select(one().as("one")))
+                .orderBy(TBook_ID())
+                .fetch();
+
+        assertEquals(4, result.size());
+        assertEquals(BOOK_AUTHOR_IDS, result.getValues(TAuthor_ID()));
+        assertEquals(BOOK_AUTHOR_IDS, result.getValues(TBook_AUTHOR_ID()));
+        assertEquals(BOOK_IDS, result.getValues(TBook_ID()));
+    }
+
     @Test
     public void testJoinQuery() throws Exception {
         SimpleSelectQuery<L> q1 = create().selectQuery(VLibrary());
@@ -237,6 +260,22 @@ extends BaseTest<A, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, I, IPK, T658, T725
         assertEquals(Integer.valueOf(1), result.getValue(0, 1));
         assertEquals(Integer.valueOf(1), result.getValue(1, 0));
         assertEquals(Integer.valueOf(2), result.getValue(1, 1));
+
+        // [#783] Unqualified (unaliased) self-joins
+        result =
+        create().select()
+                .from(TAuthor().as("x"))
+                .crossJoin(TAuthor())
+                .orderBy(1, 1 + TAuthor().getFields().size())
+                .fetch();
+
+        assertEquals(4, result.size());
+        assertEquals(
+            asList(1, 1, 2, 2),
+            result.getValues(0, Integer.class));
+        assertEquals(
+           asList(1, 2, 1, 2),
+           result.getValues(0 + TAuthor().getFields().size(), Integer.class));
     }
 
     @Test
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index a0f8194ed8..907c05e650 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -1193,6 +1193,11 @@ public abstract class jOOQAbstractTest<
         new OrderByTests(this).testOrderByIndirection();
     }
 
+    @Test
+    public void testJoinDuplicateFieldNames() throws Exception {
+        new JoinTests(this).testJoinDuplicateFieldNames();
+    }
+
     @Test
     public void testJoinQuery() throws Exception {
         new JoinTests(this).testJoinQuery();