You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/10/28 23:22:26 UTC
[groovy] 02/02: GROOVY-8258: rename `GINQ` to `GQ` for
simplification
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY-8258
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 6167e411cba28ec228890ca9bc254d42f52ca1db
Author: Daniel Sun <su...@apache.org>
AuthorDate: Thu Oct 29 07:22:08 2020 +0800
GROOVY-8258: rename `GINQ` to `GQ` for simplification
---
.../apache/groovy/ginq/GinqGroovyMethods.groovy | 2 +-
.../org/apache/groovy/ginq/GinqErrorTest.groovy | 18 +-
.../groovy/org/apache/groovy/ginq/GinqTest.groovy | 238 ++++++++++-----------
3 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
index daf1cf1..92d05b4 100644
--- a/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
+++ b/subprojects/groovy-ginq/src/main/groovy/org/apache/groovy/ginq/GinqGroovyMethods.groovy
@@ -37,7 +37,7 @@ import org.codehaus.groovy.macro.runtime.MacroContext
@CompileStatic
class GinqGroovyMethods {
@Macro
- static Expression GINQ(MacroContext ctx, final ClosureExpression closureExpression) {
+ static Expression GQ(MacroContext ctx, final ClosureExpression closureExpression) {
Statement code = closureExpression.getCode()
GinqAstBuilder ginqAstBuilder = new GinqAstBuilder(ctx.getSourceUnit())
diff --git a/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqErrorTest.groovy b/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqErrorTest.groovy
index b923680..dc38b6b 100644
--- a/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqErrorTest.groovy
+++ b/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqErrorTest.groovy
@@ -29,7 +29,7 @@ class GinqErrorTest {
void "testGinq - from select - 1"() {
def err = shouldFail '''\
def numbers = [0, 1, 2]
- GINQ {
+ GQ {
from numbers
select n
}
@@ -42,7 +42,7 @@ class GinqErrorTest {
void "testGinq - from select - 2"() {
def err = shouldFail '''\
def numbers = [0, 1, 2]
- GINQ {
+ GQ {
from n as numbers
select n
}
@@ -55,7 +55,7 @@ class GinqErrorTest {
void "testGinq - from select - 3"() {
def err = shouldFail '''\
def numbers = [0, 1, 2]
- GINQ {
+ GQ {
from n, numbers
select n
}
@@ -69,7 +69,7 @@ class GinqErrorTest {
def err = shouldFail '''\
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[1, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2
select n1, n2
@@ -82,7 +82,7 @@ class GinqErrorTest {
@Test
void "testGinq - from on select - 1"() {
def err = shouldFail '''\
- GINQ {
+ GQ {
from n in [1, 2, 3]
on n > 1
select n
@@ -95,7 +95,7 @@ class GinqErrorTest {
@Test
void "testGinq - from groupby where - 1"() {
def err = shouldFail '''\
- GINQ {
+ GQ {
from n in [1, 2, 3]
groupby n
where n > 1
@@ -109,7 +109,7 @@ class GinqErrorTest {
@Test
void "testGinq - from orderby where - 1"() {
def err = shouldFail '''\
- GINQ {
+ GQ {
from n in [1, 2, 3]
orderby n
where n > 1
@@ -123,7 +123,7 @@ class GinqErrorTest {
@Test
void "testGinq - from limit where - 1"() {
def err = shouldFail '''\
- GINQ {
+ GQ {
from n in [1, 2, 3]
limit 1
where n > 1
@@ -150,7 +150,7 @@ class GinqErrorTest {
}
}
def persons = [new Person('Linda', 100, 'Female'), new Person('Daniel', 135, 'Male'), new Person('David', 121, 'Male')]
- assert [['Female', 1], ['Male', 2]] == GINQ {
+ assert [['Female', 1], ['Male', 2]] == GQ {
from p in persons
groupby p.gender
orderby count()
diff --git a/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqTest.groovy b/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqTest.groovy
index f1b4a38..c0a98f9 100644
--- a/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqTest.groovy
+++ b/subprojects/groovy-ginq/src/test/groovy/org/apache/groovy/ginq/GinqTest.groovy
@@ -29,7 +29,7 @@ class GinqTest {
@Test
void "testGinq - from select - 0"() {
assertScript '''
- assert [0, 1, 2] == GINQ {
+ assert [0, 1, 2] == GQ {
from n in [0, 1, 2]
select n
}.toList()
@@ -40,7 +40,7 @@ class GinqTest {
void "testGinq - from select - 1"() {
assertScript '''
def numbers = [0, 1, 2]
- assert [0, 1, 2] == GINQ {
+ assert [0, 1, 2] == GQ {
from n in numbers
select n
}.toList()
@@ -51,7 +51,7 @@ class GinqTest {
void "testGinq - from select - 2"() {
assertScript '''
def numbers = [0, 1, 2]
- assert [0, 2, 4] == GINQ {
+ assert [0, 2, 4] == GQ {
from n in numbers
select n * 2
}.toList()
@@ -72,7 +72,7 @@ class GinqTest {
}
def persons = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
- assert [35, 21, 30] == GINQ {
+ assert [35, 21, 30] == GQ {
from p in persons
select p.age
}.toList()
@@ -93,7 +93,7 @@ class GinqTest {
}
def persons = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
- assert [['Daniel', 35], ['Linda', 21], ['Peter', 30]] == GINQ {
+ assert [['Daniel', 35], ['Linda', 21], ['Peter', 30]] == GQ {
from p in persons
select p.name, p.age
}.toList()
@@ -114,7 +114,7 @@ class GinqTest {
}
def persons = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
- assert [[name:'Daniel', age:35], [name:'Linda', age:21], [name:'Peter', age:30]] == GINQ {
+ assert [[name:'Daniel', age:35], [name:'Linda', age:21], [name:'Peter', age:30]] == GQ {
from p in persons
select (name: p.name, age: p.age)
}.toList()
@@ -125,7 +125,7 @@ class GinqTest {
void "testGinq - from select - 6"() {
assertScript '''
def numbers = [0, 1, 2]
- assert [0, 1, 2] == GINQ {
+ assert [0, 1, 2] == GQ {
from n in numbers select n
}.toList()
'''
@@ -135,7 +135,7 @@ class GinqTest {
void "testGinq - from where select - 1"() {
assertScript '''
def numbers = [0, 1, 2, 3, 4, 5]
- assert [2, 4, 6] == GINQ {
+ assert [2, 4, 6] == GQ {
from n in numbers
where n > 0 && n <= 3
select n * 2
@@ -147,7 +147,7 @@ class GinqTest {
void "testGinq - from where select - 2"() {
assertScript '''
def numbers = [0, 1, 2, 3, 4, 5]
- assert [2, 4, 6] == GINQ {
+ assert [2, 4, 6] == GQ {
from n in numbers where n > 0 && n <= 3 select n * 2
}.toList()
'''
@@ -158,7 +158,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[1, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -171,7 +171,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[2, 1], [3, 2], [4, 3]] == GINQ {
+ assert [[2, 1], [3, 2], [4, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
select n1 + 1, n2
@@ -184,7 +184,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 2], [2, 3], [3, 4]] == GINQ {
+ assert [[1, 2], [2, 3], [3, 4]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
select n1, n2 + 1
@@ -197,7 +197,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 2], [2, 3]] == GINQ {
+ assert [[1, 2], [2, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 + 1 == n2
select n1, n2
@@ -210,7 +210,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 2], [2, 3]] == GINQ {
+ assert [[1, 2], [2, 3]] == GQ {
from n1 in nums1 innerjoin n2 in nums2 on n1 + 1 == n2 select n1, n2
}.toList()
'''
@@ -231,7 +231,7 @@ class GinqTest {
def persons1 = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
def persons2 = [new Person('Jack', 35), new Person('Rose', 21), new Person('Smith', 30)]
- assert [['Daniel', 'Jack'], ['Linda', 'Rose'], ['Peter', 'Smith']] == GINQ {
+ assert [['Daniel', 'Jack'], ['Linda', 'Rose'], ['Peter', 'Smith']] == GQ {
from p1 in persons1
innerjoin p2 in persons2 on p1.age == p2.age
select p1.name, p2.name
@@ -254,7 +254,7 @@ class GinqTest {
def persons1 = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
def persons2 = [new Person('Jack', 35), new Person('Rose', 21), new Person('Smith', 30)]
- assert [['DANIEL', 'JACK'], ['LINDA', 'ROSE'], ['PETER', 'SMITH']] == GINQ {
+ assert [['DANIEL', 'JACK'], ['LINDA', 'ROSE'], ['PETER', 'SMITH']] == GQ {
from p1 in persons1
innerjoin p2 in persons2 on p1.age == p2.age
select p1.name.toUpperCase(), p2.name.toUpperCase()
@@ -279,7 +279,7 @@ class GinqTest {
def persons1 = [new Person('Daniel', 35), new Person('Linda', 21), new Person('Peter', 30)]
def persons2 = [new Person('Jack', 35), new Person('Rose', 21), new Person('Smith', 30)]
- assert [['DANIEL', 'JACK'], ['LINDA', 'ROSE'], ['PETER', 'SMITH']] == GINQ {
+ assert [['DANIEL', 'JACK'], ['LINDA', 'ROSE'], ['PETER', 'SMITH']] == GQ {
from p1 in persons1
innerjoin p2 in persons2 on p1.age == p2.age
select same(p1.name.toUpperCase()), same(p2.name.toUpperCase())
@@ -290,7 +290,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin select - 9"() {
assertScript '''
- assert [1, 2, 3] == GINQ {
+ assert [1, 2, 3] == GQ {
from n in [1, 2, 3]
innerjoin k in [2, 3, 4] on n + 1 == k
select n
@@ -301,7 +301,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin select - 10"() {
assertScript '''
- assert [2, 3, 4] == GINQ {
+ assert [2, 3, 4] == GQ {
from n in [1, 2, 3]
innerjoin k in [2, 3, 4] on n + 1 == k
select k
@@ -315,7 +315,7 @@ class GinqTest {
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
def nums3 = [3, 4, 5]
- assert [[3, 3, 3]] == GINQ {
+ assert [[3, 3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n2 == n1
innerjoin n3 in nums3 on n3 == n2
@@ -330,7 +330,7 @@ class GinqTest {
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
def nums3 = [3, 4, 5]
- assert [[3, 3, 3]] == GINQ {
+ assert [[3, 3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n2 == n1
innerjoin n3 in nums3 on n3 == n1
@@ -345,7 +345,7 @@ class GinqTest {
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
def nums3 = [3, 4, 5]
- assert [[3, 3, 3]] == GINQ {
+ assert [[3, 3, 3]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -362,7 +362,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
where n1 > 1 && n2 <= 3
@@ -376,7 +376,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
where Math.pow(n1, 1) > 1 && Math.pow(n2, 1) <= 3
@@ -390,7 +390,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1 innerjoin n2 in nums2 on n1 == n2 where Math.pow(n1, 1) > 1 && Math.pow(n2, 1) <= 3 select n1, n2
}.toList()
'''
@@ -411,7 +411,7 @@ class GinqTest {
def persons1 = [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 30)]
def persons2 = [new Person('Jack', 35), new Person('Rose', 21), new Person('Smith', 30)]
- assert [['Daniel', 'Jack']] == GINQ {
+ assert [['Daniel', 'Jack']] == GQ {
from p1 in persons1
innerjoin p2 in persons2 on p1.age == p2.age
where p1.name.startsWith('D') && p2.name.endsWith('k')
@@ -437,7 +437,7 @@ class GinqTest {
def persons1 = [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 30)]
def persons2 = [new Person('Jack', 35), new Person('Rose', 21), new Person('Smith', 30)]
- assert [['Daniel', 'Jack']] == GINQ {
+ assert [['Daniel', 'Jack']] == GQ {
from p1 in persons1
innerjoin p2 in persons2 on p1.age == p2.age
where same(p1.name.startsWith('D')) && same(p2.name.endsWith('k'))
@@ -449,7 +449,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 0"() {
assertScript '''
- assert [1, 2, 3] == GINQ {
+ assert [1, 2, 3] == GQ {
from v in (
from n in [1, 2, 3]
select n
@@ -463,7 +463,7 @@ class GinqTest {
void "testGinq - nested from - 1"() {
assertScript '''
def numbers = [1, 2, 3]
- assert [1, 2, 3] == GINQ {
+ assert [1, 2, 3] == GQ {
from v in (
from n in numbers
select n
@@ -477,7 +477,7 @@ class GinqTest {
void "testGinq - nested from - 2"() {
assertScript '''
def numbers = [1, 2, 3]
- assert [1, 2] == GINQ {
+ assert [1, 2] == GQ {
from v in (
from n in numbers
where n < 3
@@ -492,7 +492,7 @@ class GinqTest {
void "testGinq - nested from - 3"() {
assertScript '''
def numbers = [1, 2, 3]
- assert [2] == GINQ {
+ assert [2] == GQ {
from v in (
from n in numbers
where n < 3
@@ -509,7 +509,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, 4, 5]
def nums2 = [1, 2, 3, 4, 5]
- assert [[3, 3], [5, 5]] == GINQ {
+ assert [[3, 3], [5, 5]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -527,7 +527,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, 4, 5]
def nums2 = [1, 2, 3, 4, 5]
- assert [[3, 3], [5, 5]] == GINQ {
+ assert [[3, 3], [5, 5]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -545,7 +545,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, 4, 5]
def nums2 = [1, 2, 3, 4, 5]
- assert [[3, 3], [5, 5]] == GINQ {
+ assert [[3, 3], [5, 5]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -563,7 +563,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, 4, 5]
def nums2 = [1, 2, 3, 4, 5]
- assert [[3, 3], [5, 5]] == GINQ {
+ assert [[3, 3], [5, 5]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -581,7 +581,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, 4, 5]
def nums2 = [1, 2, 3, 4, 5]
- assert [[3, 3], [5, 5]] == GINQ {
+ assert [[3, 3], [5, 5]] == GQ {
from v in (
from n1 in nums1
innerjoin n2 in nums2 on n1 == n2
@@ -597,7 +597,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 9"() {
assertScript '''
- assert [2, 6] == GINQ {
+ assert [2, 6] == GQ {
from v in (
from n in (
from m in [1, 2, 3]
@@ -614,7 +614,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 10"() {
assertScript '''
- assert [2, 6] == GINQ {
+ assert [2, 6] == GQ {
from v in (
from n in (
from m in [1, 2, 3]
@@ -631,7 +631,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 11"() {
assertScript '''
- assert [[1, 2], [2, 3]] == GINQ {
+ assert [[1, 2], [2, 3]] == GQ {
from v in (
from n in (
from m in [1, 2, 3]
@@ -648,7 +648,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 12"() {
assertScript '''
- assert [[1, 2], [2, 3]] == GINQ {
+ assert [[1, 2], [2, 3]] == GQ {
from v in (
from n in (
from m in [1, 2, 3]
@@ -665,7 +665,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 13"() {
assertScript '''
- assert [2, 6] == GINQ {
+ assert [2, 6] == GQ {
from v in (
from n in (
from m in [1, 2, 3]
@@ -683,7 +683,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 14"() {
assertScript '''
- assert [2, 3] == GINQ {
+ assert [2, 3] == GQ {
from n in [1, 2, 3]
innerjoin k in (
from m in [2, 3, 4]
@@ -697,7 +697,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 15"() {
assertScript '''
- assert [1, 2] == GINQ {
+ assert [1, 2] == GQ {
from n in [0, 1, 2]
where n in (
from m in [1, 2]
@@ -711,7 +711,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 16"() {
assertScript '''
- assert [[2, 2]] == GINQ {
+ assert [[2, 2]] == GQ {
from t in [[0, 0], [1, 1], [2, 2]]
where t in (
from m in [1, 2]
@@ -760,7 +760,7 @@ class GinqTest {
def luckyInfoList = [new LuckyInfo('Sun', 'Male', true), new LuckyInfo('Yang', 'Female', true),
new LuckyInfo('Yang', 'Male', false)]
- assert ['Daniel', 'Linda', 'Rose'] == GINQ {
+ assert ['Daniel', 'Linda', 'Rose'] == GQ {
from p in persons
where tuple(p.lastName, p.gender) in (
from luckyInfo in luckyInfoList
@@ -775,7 +775,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 18"() {
assertScript '''
- assert [1, 2] == GINQ {
+ assert [1, 2] == GQ {
from n in (
from m in [0, 1, 2]
select m
@@ -792,7 +792,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 19"() {
assertScript '''
- assert [2] == GINQ {
+ assert [2] == GQ {
from n in (
from m in [0, 1, 2]
where m > 0
@@ -811,7 +811,7 @@ class GinqTest {
@Test
void "testGinq - nested from - 20"() {
assertScript '''
- assert [[1, 1], [2, 4], [3, 9]] == GINQ {
+ assert [[1, 1], [2, 4], [3, 9]] == GQ {
from v in (
from n in [1, 2, 3]
select n, Math.pow(n, 2) as powerOfN
@@ -826,7 +826,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[1, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -839,7 +839,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
- assert [[1, null], [2, 2], [3, 3]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -852,7 +852,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null]
def nums2 = [2, 3, 4]
- assert [[1, null], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -865,7 +865,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null]
def nums2 = [2, 3, 4, null]
- assert [[1, null], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -878,7 +878,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4, null]
- assert [[1, null], [2, 2], [3, 3]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -891,7 +891,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null, null]
def nums2 = [2, 3, 4]
- assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -904,7 +904,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null, null]
def nums2 = [2, 3, 4, null]
- assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -917,7 +917,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null, null]
def nums2 = [2, 3, 4, null, null]
- assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -930,7 +930,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3, null]
def nums2 = [2, 3, 4, null, null]
- assert [[1, null], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -943,7 +943,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4, null, null]
- assert [[1, null], [2, 2], [3, 3]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -956,7 +956,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4, null, null]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1
leftjoin n2 in nums2 on n1 == n2
where n2 != null
@@ -970,7 +970,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [1, 2, 3]
- assert [[1, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[1, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -983,7 +983,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3]
def nums1 = [2, 3, 4]
- assert [[null, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -996,7 +996,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null]
def nums1 = [2, 3, 4]
- assert [[null, 1], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1009,7 +1009,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null]
def nums1 = [2, 3, 4, null]
- assert [[null, 1], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1022,7 +1022,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3]
def nums1 = [2, 3, 4, null]
- assert [[null, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1035,7 +1035,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null, null]
def nums1 = [2, 3, 4]
- assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1048,7 +1048,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null, null]
def nums1 = [2, 3, 4, null]
- assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1061,7 +1061,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null, null]
def nums1 = [2, 3, 4, null, null]
- assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1074,7 +1074,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3, null]
def nums1 = [2, 3, 4, null, null]
- assert [[null, 1], [2, 2], [3, 3], [null, null]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3], [null, null]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1087,7 +1087,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3]
def nums1 = [2, 3, 4, null, null]
- assert [[null, 1], [2, 2], [3, 3]] == GINQ {
+ assert [[null, 1], [2, 2], [3, 3]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1100,7 +1100,7 @@ class GinqTest {
assertScript '''
def nums2 = [1, 2, 3]
def nums1 = [2, 3, 4, null, null]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1
rightjoin n2 in nums2 on n1 == n2
where n1 != null
@@ -1114,7 +1114,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
- assert [[1, null], [2, 2], [3, 3], [null, 4]] == GINQ {
+ assert [[1, null], [2, 2], [3, 3], [null, 4]] == GQ {
from n1 in nums1
fulljoin n2 in nums2 on n1 == n2
select n1, n2
@@ -1127,7 +1127,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [2, 3, 4]
- assert [[2, 2], [3, 3]] == GINQ {
+ assert [[2, 2], [3, 3]] == GQ {
from n1 in nums1
fulljoin n2 in nums2 on n1 == n2
where n1 != null && n2 != null
@@ -1141,7 +1141,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [3, 4, 5]
- assert [[1, 3], [1, 4], [1, 5], [2, 3], [2, 4], [2, 5], [3, 3], [3, 4], [3, 5]] == GINQ {
+ assert [[1, 3], [1, 4], [1, 5], [2, 3], [2, 4], [2, 5], [3, 3], [3, 4], [3, 5]] == GQ {
from n1 in nums1
crossjoin n2 in nums2
select n1, n2
@@ -1154,7 +1154,7 @@ class GinqTest {
assertScript '''
def nums1 = [1, 2, 3]
def nums2 = [3, 4, 5]
- assert [[3, 3], [3, 5]] == GINQ {
+ assert [[3, 3], [3, 5]] == GQ {
from n1 in nums1
crossjoin n2 in nums2
where n1 > 2 && n2 != 4
@@ -1166,7 +1166,7 @@ class GinqTest {
@Test
void "testGinq - from orderby select - 1"() {
assertScript '''
- assert [1, 2, 5, 6] == GINQ {
+ assert [1, 2, 5, 6] == GQ {
from n in [1, 5, 2, 6]
orderby n
select n
@@ -1188,7 +1188,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 21)] == GINQ {
+ assert [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 21)] == GQ {
from p in persons
orderby p.age in desc
select p
@@ -1210,7 +1210,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Daniel', 35), new Person('David', 21), new Person('Linda', 21)] == GINQ {
+ assert [new Person('Daniel', 35), new Person('David', 21), new Person('Linda', 21)] == GQ {
from p in persons
orderby p.age in desc, p.name
select p
@@ -1232,7 +1232,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Daniel', 35), new Person('David', 21), new Person('Linda', 21)] == GINQ {
+ assert [new Person('Daniel', 35), new Person('David', 21), new Person('Linda', 21)] == GQ {
from p in persons
orderby p.age in desc, p.name in asc
select p
@@ -1254,7 +1254,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 21)] == GINQ {
+ assert [new Person('Daniel', 35), new Person('Linda', 21), new Person('David', 21)] == GQ {
from p in persons
orderby p.age in desc, p.name in desc
select p
@@ -1276,7 +1276,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Linda', 21), new Person('David', 21), new Person('Daniel', 35)] == GINQ {
+ assert [new Person('Linda', 21), new Person('David', 21), new Person('Daniel', 35)] == GQ {
from p in persons
orderby p.age, p.name in desc
select p
@@ -1298,7 +1298,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 21), new Person('Daniel', 35), new Person('David', 21)]
- assert [new Person('Linda', 21), new Person('David', 21), new Person('Daniel', 35)] == GINQ {
+ assert [new Person('Linda', 21), new Person('David', 21), new Person('Daniel', 35)] == GQ {
from p in persons
orderby p.age in asc, p.name in desc
select p
@@ -1309,7 +1309,7 @@ class GinqTest {
@Test
void "testGinq - from orderby select - 8"() {
assertScript '''
- assert [1, 2, 5, 6] == GINQ {
+ assert [1, 2, 5, 6] == GQ {
from n in [1, 5, 2, 6]
orderby 1 / n in desc
select n
@@ -1320,7 +1320,7 @@ class GinqTest {
@Test
void "testGinq - from orderby select - 9"() {
assertScript '''
- assert [1, 2, 5, 6] == GINQ {
+ assert [1, 2, 5, 6] == GQ {
from n in [1, 5, 2, 6]
orderby Math.pow(1 / n, 1) in desc
select n
@@ -1331,7 +1331,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin orderby select - 1"() {
assertScript '''
- assert [2, 3] == GINQ {
+ assert [2, 3] == GQ {
from n1 in [1, 2, 3]
innerjoin n2 in [2, 3, 4] on n1 == n2
orderby n1
@@ -1343,7 +1343,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin orderby select - 2"() {
assertScript '''
- assert [3, 2] == GINQ {
+ assert [3, 2] == GQ {
from n1 in [1, 2, 3]
innerjoin n2 in [2, 3, 4] on n1 == n2
orderby n1 in desc
@@ -1355,7 +1355,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin orderby select - 3"() {
assertScript '''
- assert [[3, 3], [2, 2]] == GINQ {
+ assert [[3, 3], [2, 2]] == GQ {
from n1 in [1, 2, 3]
innerjoin n2 in [2, 3, 4] on n1 == n2
orderby n1 in desc, n2 in desc
@@ -1367,7 +1367,7 @@ class GinqTest {
@Test
void "testGinq - from limit select - 1"() {
assertScript '''
- assert [1, 2, 3] == GINQ {
+ assert [1, 2, 3] == GQ {
from n in [1, 2, 3, 4, 5]
limit 3
select n
@@ -1378,7 +1378,7 @@ class GinqTest {
@Test
void "testGinq - from limit select - 2"() {
assertScript '''
- assert [2, 3, 4] == GINQ {
+ assert [2, 3, 4] == GQ {
from n in [1, 2, 3, 4, 5]
limit 1, 3
select n
@@ -1389,7 +1389,7 @@ class GinqTest {
@Test
void "testGinq - from orderby limit select - 3"() {
assertScript '''
- assert [5, 4, 3] == GINQ {
+ assert [5, 4, 3] == GQ {
from n in [1, 2, 3, 4, 5]
orderby n in desc
limit 3
@@ -1401,7 +1401,7 @@ class GinqTest {
@Test
void "testGinq - from orderby limit select - 4"() {
assertScript '''
- assert [4, 3, 2] == GINQ {
+ assert [4, 3, 2] == GQ {
from n in [1, 2, 3, 4, 5]
orderby n in desc
limit 1, 3
@@ -1413,7 +1413,7 @@ class GinqTest {
@Test
void "testGinq - from where orderby limit select - 1"() {
assertScript '''
- assert [5, 4, 3] == GINQ {
+ assert [5, 4, 3] == GQ {
from n in [1, 2, 3, 4, 5]
where n >= 2
orderby n in desc
@@ -1426,7 +1426,7 @@ class GinqTest {
@Test
void "testGinq - from where orderby limit select - 2"() {
assertScript '''
- assert [4, 3, 2] == GINQ {
+ assert [4, 3, 2] == GQ {
from n in [1, 2, 3, 4, 5]
where n >= 2
orderby n in desc
@@ -1439,7 +1439,7 @@ class GinqTest {
@Test
void "testGinq - from where orderby limit select - 3"() {
assertScript '''
- assert [5, 4] == GINQ {
+ assert [5, 4] == GQ {
from n in [1, 2, 3, 4, 5]
where n > 3
orderby n in desc
@@ -1452,7 +1452,7 @@ class GinqTest {
@Test
void "testGinq - from where orderby limit select - 4"() {
assertScript '''
- assert [4] == GINQ {
+ assert [4] == GQ {
from n in [1, 2, 3, 4, 5]
where n > 3
orderby n in desc
@@ -1465,7 +1465,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where orderby limit select - 1"() {
assertScript '''
- assert [[4, 4], [3, 3]] == GINQ {
+ assert [[4, 4], [3, 3]] == GQ {
from n1 in [1, 2, 3, 4, 5]
innerjoin n2 in [2, 3, 4, 5, 6] on n2 == n1
where n1 > 2
@@ -1479,7 +1479,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where orderby limit select - 2"() {
assertScript '''
- assert [[4, 4, 4]] == GINQ {
+ assert [[4, 4, 4]] == GQ {
from n1 in [1, 2, 3, 4, 5]
innerjoin n2 in [2, 3, 4, 5, 6] on n2 == n1
innerjoin n3 in [3, 4, 5, 6, 7] on n3 == n2
@@ -1494,7 +1494,7 @@ class GinqTest {
@Test
void "testGinq - from groupby select - 1"() {
assertScript '''
- assert [[1, 2], [3, 2], [6, 3]] == GINQ {
+ assert [[1, 2], [3, 2], [6, 3]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
groupby n
select n, count(n) // reference the column `n` in the groupby clause, and `count` is a built-in aggregate function
@@ -1505,7 +1505,7 @@ class GinqTest {
@Test
void "testGinq - from groupby select - 2"() {
assertScript '''
- assert [[1, 2], [3, 6], [6, 18]] == GINQ {
+ assert [[1, 2], [3, 6], [6, 18]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
groupby n
select n, sum(n)
@@ -1529,7 +1529,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 100, 'Female'), new Person('Daniel', 135, 'Male'), new Person('David', 121, 'Male')]
- assert [['Female', 1], ['Male', 2]] == GINQ {
+ assert [['Female', 1], ['Male', 2]] == GQ {
from p in persons
groupby p.gender
orderby count()
@@ -1554,7 +1554,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 100, 'Female'), new Person('Daniel', 135, 'Male'), new Person('David', 121, 'Male')]
- assert [['Female', 1], ['Male', 2]] == GINQ {
+ assert [['Female', 1], ['Male', 2]] == GQ {
from p in persons
groupby p.gender
orderby count(p)
@@ -1579,7 +1579,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 100, 'Female'), new Person('Daniel', 135, 'Male'), new Person('David', 121, 'Male')]
- assert [['Female', 1], ['Male', 2]] == GINQ {
+ assert [['Female', 1], ['Male', 2]] == GQ {
from p in persons
groupby p.gender
orderby count(p.gender)
@@ -1604,7 +1604,7 @@ class GinqTest {
}
}
def persons = [new Person('Linda', 100, 'Female'), new Person('Daniel', 135, 'Male'), new Person('David', 121, 'Male')]
- assert [['Female', 1], ['Male', 2]] == GINQ {
+ assert [['Female', 1], ['Male', 2]] == GQ {
from p in persons
groupby p.gender
orderby count(p.name)
@@ -1616,7 +1616,7 @@ class GinqTest {
@Test
void "testGinq - from groupby select - 7"() {
assertScript '''
- assert [[1, 2], [3, 6], [6, 18]] == GINQ {
+ assert [[1, 2], [3, 6], [6, 18]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
groupby n
select n, agg(_q.stream().map(e -> e).reduce(BigDecimal.ZERO, BigDecimal::add)) // the most powerful aggregate function, `_q` represents the grouped Queryable object
@@ -1645,7 +1645,7 @@ class GinqTest {
def persons = [new Person('Daniel', 'Sun', 35, 'Male'), new Person('Linda', 'Yang', 21, 'Female'),
new Person('Peter', 'Yang', 30, 'Male'), new Person('Rose', 'Yang', 30, 'Female')]
- assert [['Male', 30, 35], ['Female', 21, 30]] == GINQ {
+ assert [['Male', 30, 35], ['Female', 21, 30]] == GQ {
from p in persons
groupby p.gender
select p.gender, min(p.age), max(p.age)
@@ -1656,7 +1656,7 @@ class GinqTest {
@Test
void "testGinq - from where groupby select - 1"() {
assertScript '''
- assert [[1, 2], [6, 3]] == GINQ {
+ assert [[1, 2], [6, 3]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
where n != 3
groupby n
@@ -1668,7 +1668,7 @@ class GinqTest {
@Test
void "testGinq - from where groupby orderby select - 1"() {
assertScript '''
- assert [[6, 3], [1, 2]] == GINQ {
+ assert [[6, 3], [1, 2]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
where n != 3
groupby n
@@ -1681,7 +1681,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby orderby select - 1"() {
assertScript '''
- assert [[6, 9], [1, 4]] == GINQ {
+ assert [[6, 9], [1, 4]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
innerjoin m in [1, 1, 3, 3, 6, 6, 6] on n == m
where n != 3
@@ -1695,7 +1695,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby orderby select - 2"() {
assertScript '''
- assert [[1, 4], [6, 9]] == GINQ {
+ assert [[1, 4], [6, 9]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
innerjoin m in [1, 1, 3, 3, 6, 6, 6] on n == m
where n != 3
@@ -1709,7 +1709,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby orderby select - 3"() {
assertScript '''
- assert [[2, 3, 1], [1, 2, 1]] == GINQ {
+ assert [[2, 3, 1], [1, 2, 1]] == GQ {
from n in [1, 2, 3]
innerjoin m in [2, 3, 4] on n + 1 == m
where n != 3
@@ -1723,7 +1723,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby orderby select - 4"() {
assertScript '''
- assert [[1, 2, 1], [2, 3, 1]] == GINQ {
+ assert [[1, 2, 1], [2, 3, 1]] == GQ {
from n in [1, 2, 3]
innerjoin m in [2, 3, 4] on n + 1 == m
where n != 3
@@ -1737,7 +1737,7 @@ class GinqTest {
@Test
void "testGinq - from groupby having select - 1"() {
assertScript '''
- assert [[3, 2], [6, 3]] == GINQ {
+ assert [[3, 2], [6, 3]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
groupby n
having n >= 3
@@ -1749,7 +1749,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby having orderby select - 1"() {
assertScript '''
- assert [[1, 2, 1]] == GINQ {
+ assert [[1, 2, 1]] == GQ {
from n in [1, 2, 3]
innerjoin m in [2, 3, 4] on n + 1 == m
where n != 3
@@ -1764,7 +1764,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby having orderby select - 2"() {
assertScript '''
- assert [[6, 9]] == GINQ {
+ assert [[6, 9]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
innerjoin m in [1, 1, 3, 3, 6, 6, 6] on n == m
where n != 3
@@ -1779,7 +1779,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby having orderby select - 3"() {
assertScript '''
- assert [[6, 9]] == GINQ {
+ assert [[6, 9]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
innerjoin m in [1, 1, 3, 3, 6, 6, 6] on n == m
where n != 3
@@ -1794,7 +1794,7 @@ class GinqTest {
@Test
void "testGinq - from innerjoin where groupby having orderby select - 4"() {
assertScript '''
- assert [[6, 9]] == GINQ {
+ assert [[6, 9]] == GQ {
from n in [1, 1, 3, 3, 6, 6, 6]
innerjoin m in [1, 1, 3, 3, 6, 6, 6] on n == m
where n != 3
@@ -1833,7 +1833,7 @@ class GinqTest {
[taskId: 3, taskContent: 'task3', assignee: 'Paul', manDay: 3]
]
- assert expected == GINQ {
+ assert expected == GQ {
from p in json.persons
innerjoin t in json.tasks on t.assignee == p.id
where t.id in [1, 3, 4]
@@ -1846,7 +1846,7 @@ class GinqTest {
@Test
void "testGinq - ascii table - 1"() {
assertScript '''
- def q = GINQ {
+ def q = GQ {
from n in [1, 2, 3]
select n as first_col, n + 1 as second_col
}
@@ -1862,7 +1862,7 @@ class GinqTest {
@Test
void "testGinq - as List - 1"() {
assertScript '''
- assert [4, 16, 36, 64, 100] == GINQ {from n in 1..<11 where n % 2 == 0 select n ** 2} as List
+ assert [4, 16, 36, 64, 100] == GQ {from n in 1..<11 where n % 2 == 0 select n ** 2} as List
'''
}
@@ -1871,7 +1871,7 @@ class GinqTest {
assertScript '''
@groovy.transform.CompileStatic
def x() {
- GINQ {from n in 1..<11 where n % 2 == 0 select n ** 2} as List
+ GQ {from n in 1..<11 where n % 2 == 0 select n ** 2} as List
}
assert [4, 16, 36, 64, 100] == x()
'''