From 7e500c350ea575ea28410c5f7a4f2733093ff5bc Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 1 Sep 2020 11:04:55 +0200
Subject: [PATCH] [jOOQ/jOOQ#10565] Fix other usages of
 Select.getSelect().size()

---
 jOOQ/src/main/java/org/jooq/impl/SelectImpl.java | 14 +++++++-------
 jOOQ/src/main/java/org/jooq/impl/Tools.java      |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 106879b03e..973f494b65 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -4294,7 +4294,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition compare(Comparator comparator, R record) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).compare(comparator, record.get(0, field(0).getType()));
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4302,7 +4302,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition compare(Comparator comparator, Select<? extends R> select) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).compare(comparator, select);
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4310,7 +4310,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition compare(Comparator comparator, QuantifiedSelect<? extends R> select) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).compare(comparator, select);
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4508,7 +4508,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition in(R... records) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).in(values(0, records));
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4516,7 +4516,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition in(Select<? extends R> select) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).in(select);
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4524,7 +4524,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition notIn(R... records) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).notIn(values(0, records));
         else
             throw new UnsupportedOperationException("Not yet implemented");
@@ -4532,7 +4532,7 @@ final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
 
     @Override
     public final Condition notIn(Select<? extends R> select) {
-        if (getSelect().size() == 1)
+        if (Tools.degree(this) == 1)
             return DSL.field((Select) this).notIn(select);
         else
             throw new UnsupportedOperationException("Not yet implemented");
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java
index 63ff22e4ff..d25db0578b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tools.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java
@@ -1541,7 +1541,7 @@ final class Tools {
             return (Field<T>) value;
 
         // [#6362] [#8220] Single-column selects can be considered fields, too
-        else if (value instanceof Select && ((Select<?>) value).getSelect().size() == 1)
+        else if (value instanceof Select && Tools.degree((Select<?>) value) == 1)
             return DSL.field((Select<Record1<T>>) value);
 
         // [#4771] Any other QueryPart type is not supported here
@@ -1713,7 +1713,7 @@ final class Tools {
             return (Field<T>) value;
 
         // [#6362] [#8220] Single-column selects can be considered fields, too
-        else if (value instanceof Select && ((Select<?>) value).getSelect().size() == 1)
+        else if (value instanceof Select && Tools.degree((Select<?>) value) == 1)
             return DSL.field((Select<Record1<T>>) value);
 
         // [#4771] Any other QueryPart type is not supported here
@@ -1732,7 +1732,7 @@ final class Tools {
             return (Field<T>) value;
 
         // [#6362] [#8220] Single-column selects can be considered fields, too
-        else if (value instanceof Select && ((Select<?>) value).getSelect().size() == 1)
+        else if (value instanceof Select && Tools.degree((Select<?>) value) == 1)
             return DSL.field((Select<Record1<T>>) value);
 
         // [#4771] Any other QueryPart type is not supported here
@@ -1751,7 +1751,7 @@ final class Tools {
             return (Field<T>) value;
 
         // [#6362] [#8220] Single-column selects can be considered fields, too
-        else if (value instanceof Select && ((Select<?>) value).getSelect().size() == 1)
+        else if (value instanceof Select && Tools.degree((Select<?>) value) == 1)
             return DSL.field((Select<Record1<T>>) value);
 
         // [#4771] Any other QueryPart type is not supported here