From 9158f46bb3f2658cc8a0ffc2e45c6c4f6a7b7ff8 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Sat, 15 Oct 2016 14:36:11 +1300
Subject: [PATCH] #832 - Refactor: Change generated SQL to use "left join"
 rather than "left outer join"

---
 src/main/java/com/avaje/ebean/UpdateQuery.java                | 2 +-
 src/main/java/com/avaje/ebean/annotation/Formula.java         | 2 +-
 .../java/com/avaje/ebeaninternal/server/deploy/TableJoin.java | 2 +-
 .../ebeaninternal/server/deploy/meta/DeployTableJoin.java     | 2 +-
 .../avaje/ebeaninternal/server/query/DefaultDbSqlContext.java | 4 ++--
 .../com/avaje/ebeaninternal/server/query/SqlJoinType.java     | 2 +-
 .../ebeaninternal/server/query/SqlTreeNodeExtraJoin.java      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/UpdateQuery.java b/src/main/java/com/avaje/ebean/UpdateQuery.java
index 0006f608e..3760d57f6 100644
--- a/src/main/java/com/avaje/ebean/UpdateQuery.java
+++ b/src/main/java/com/avaje/ebean/UpdateQuery.java
@@ -57,7 +57,7 @@ package com.avaje.ebean;
  *   where id in (
  *     select t0.id c0
  *     from o_customer t0
- *     left outer join o_address t1 on t1.id = t0.billing_address_id
+ *     left join o_address t1 on t1.id = t0.billing_address_id
  *     where t0.status = ?
  *       and t1.country_code = ?
  *       and t0.id > ? )
diff --git a/src/main/java/com/avaje/ebean/annotation/Formula.java b/src/main/java/com/avaje/ebean/annotation/Formula.java
index f18f4689c..647edcfd1 100644
--- a/src/main/java/com/avaje/ebean/annotation/Formula.java
+++ b/src/main/java/com/avaje/ebean/annotation/Formula.java
@@ -82,7 +82,7 @@ public @interface Formula {
    * as count, sum etc.
    * </p>
    * <p>
-   * The join string should start with either "left outer join" or "join".
+   * The join string should start with either "left join" or "join".
    * </p>
    * 
    * <p>
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java
index 8ed839383..1d1e86ecf 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/TableJoin.java
@@ -120,7 +120,7 @@ public final class TableJoin {
   }
 
   /**
-   * Return the type of join. LEFT OUTER JOIN etc.
+   * Return the type of join. LEFT JOIN etc.
    */
   public SqlJoinType getType() {
     return type;
diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
index b07610783..fad7550a0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/meta/DeployTableJoin.java
@@ -21,7 +21,7 @@ public class DeployTableJoin {
   private String table;
 
   /**
-   * The type of join. LEFT OUTER etc.
+   * The type of join. LEFT JOIN etc.
    */
   private SqlJoinType type = SqlJoinType.INNER;
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
index cc09255c5..9133f4366 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/DefaultDbSqlContext.java
@@ -222,8 +222,8 @@ public class DefaultDbSqlContext implements DbSqlContext {
     sb.append(" ");
     if (joinType == SqlJoinType.OUTER) {
       if ("join".equals(sqlFormulaJoin.substring(0, 4).toLowerCase())) {
-        // prepend left outer as we are in the 'many' part
-        append(" left outer ");
+        // prepend left as we are in the 'many' part
+        append(" left ");
       }
     }
 
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
index 9524cae71..711d2130b 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlJoinType.java
@@ -13,7 +13,7 @@ public enum SqlJoinType {
   /**
    * It is an outer join.
    */
-  OUTER("left outer join"),
+  OUTER("left join"),
 
   /**
    * It is automatically determined based on cardinality and optionality.
diff --git a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
index 2a7fd0cfb..a3154e89c 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/query/SqlTreeNodeExtraJoin.java
@@ -105,7 +105,7 @@ public class SqlTreeNodeExtraJoin implements SqlTreeNode {
     }
 
     if (pathContainsMany) {
-      // "promote" to left outer as the path contains a many
+      // "promote" to left join as the path contains a many
       joinType = SqlJoinType.OUTER;
     }
     if (!manyToMany) {