diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fc287ca..cf21ed4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,7 +45,7 @@ jobs: #don't precompile, here, dockerfile does docker build -t market-rest --build-arg module=market-rest . docker build -t market-web --build-arg module=market-web . - docker-compose -f docker-compose.yaml up -d + docker compose -f docker-compose.yaml up -d chmod u+x ../setup/wait-container-ready.sh ../setup/wait-container-ready.sh db "ready for start up" ../setup/wait-container-ready.sh market-rest "Started RestApplication" @@ -54,7 +54,7 @@ jobs: working-directory: ./sut-gestaoHospital run: | mvn package -q -DskipTests=true - docker-compose up -d --force-recreate --build + docker compose up -d --force-recreate --build chmod u+x ../setup/wait-container-ready.sh ../setup/wait-container-ready.sh mongodb "HospitalDB.product_collection" ../setup/wait-container-ready.sh gestaohospital "Started GestaohospitalarApplication" diff --git a/pom.xml b/pom.xml index 594e1c3..bb0c38f 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 3.3.0 4.3.0 - 1.4.267 + 1.4.273 diff --git a/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-data.txt b/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-data.txt index 35fa035..869856b 100644 --- a/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-data.txt +++ b/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-data.txt @@ -1,17 +1,18 @@ "category":{"id":1,"name":"Tiger"} "category":{"id":2,"name":"Lion"} "category":{"id":3,"name":"Monkey"} -"pet":{"id":1,"category":{"id":1,"name":"Tiger"},"name":"Max","photoUrls":["http://localhost/photos/000303.jpg"],"tags":[{"id":703,"name":"Puppy"}],"status":"available"} -"pet":{"id":2,"category":{"id":2,"name":"Lion"},"name":"Luna","photoUrls":["http://localhost/photos/000403.jpg"],"tags":[{"id":803,"name":"Young"}],"status":"pending"} -"pet":{"id":3,"category":{"id":2,"name":"Lion"},"name":"Charlie","photoUrls":["http://localhost/photos/000503.jpg"],"tags":[{"id":903,"name":"Old"}],"status":"sold"} -"pet":{"id":4,"category":{"id":1,"name":"Tiger"},"name":"Bella","photoUrls":["http://localhost/photos/000603.jpg"],"status":"available"} -"pet":{"id":5,"category":{"id":1,"name":"Tiger"},"name":"Cooper","tags":[{"id":1003,"name":"Puppy-1"}],"status":"pending"} -"order":{"id":1,"petId":1,"customerId":1,"quantity":11,"shipDate":"2024-01-26","status":"placed","complete":false} -"order":{"id":2,"petId":1,"customerId":1,"quantity":7,"shipDate":"2024-01-27","status":"approved","complete":true} -"order":{"id":3,"petId":2,"customerId":1,"quantity":3,"shipDate":"2024-01-28","status":"approved","complete":false} -"order":{"id":4,"petId":1,"customerId":2,"quantity":12,"shipDate":"2024-01-29","status":"approved","complete":true} -"order":{"id":5,"petId":4,"customerId":1,"quantity":8,"shipDate":"2024-01-30","status":"approved","complete":false} -"order":{"id":6,"petId":5,"customerId":1,"quantity":4,"shipDate":"2024-02-01","status":"approved","complete":true} -"customer":{"id":1,"username":"James Smith","address":[{"street":"Main St","city":"Springfield","state":"California","zip":"0"}]} +"pet":{"id":1,"category":{"id":1,"name":"Tiger"},"name":"Max","photoUrls":["http://localhost/photos/000303.jpg"],"tags":[{"id":803,"name":"Puppy"}],"status":"pending"} +"pet":{"id":2,"category":{"id":2,"name":"Lion"},"name":"Luna","photoUrls":["http://localhost/photos/000403.jpg","http://localhost/photos/000503.jpg"],"tags":[{"id":903,"name":"Young"}],"status":"sold"} +"pet":{"id":3,"category":{"id":1,"name":"Tiger"},"name":"Charlie","photoUrls":["http://localhost/photos/000603.jpg"],"tags":[{"id":1003,"name":"Old"}],"status":"available"} +"pet":{"id":4,"category":{"id":1,"name":"Tiger"},"name":"Bella","photoUrls":["http://localhost/photos/000703.jpg"],"status":"pending"} +"pet":{"id":5,"category":{"id":1,"name":"Tiger"},"name":"Cooper","tags":[{"id":1103,"name":"Puppy-1"}],"status":"sold"} +"order":{"id":1,"petId":1,"customerId":1,"quantity":3,"shipDate":"2024-01-28","status":"placed","complete":false} +"order":{"id":2,"petId":1,"customerId":1,"quantity":12,"shipDate":"2024-01-29","status":"approved","complete":true} +"order":{"id":3,"petId":2,"customerId":1,"quantity":8,"shipDate":"2024-01-30","status":"approved","complete":false} +"order":{"id":4,"petId":2,"customerId":1,"quantity":4,"shipDate":"2024-02-01","status":"approved","complete":true} +"order":{"id":5,"petId":1,"customerId":2,"quantity":13,"shipDate":"2024-02-02","status":"approved","complete":false} +"order":{"id":6,"petId":4,"customerId":1,"quantity":9,"shipDate":"2024-02-03","status":"approved","complete":true} +"order":{"id":7,"petId":5,"customerId":1,"quantity":5,"shipDate":"2024-02-04","status":"approved","complete":false} +"customer":{"id":1,"username":"James Smith","address":[{"street":"Main St","city":"Springfield","state":"California","zip":"0"},{"street":"Broadway","city":"Franklin","state":"Texas","zip":"1"}]} "customer":{"id":2,"username":"Mary Johnson"} -"customer":{"id":3,"username":"Robert Williams","address":[{"street":"Broadway","city":"Franklin","state":"Texas","zip":"1"}]} +"customer":{"id":3,"username":"Robert Williams","address":[{"street":"Park Ave","city":"Greenville","state":"Florida","zip":"0"}]} diff --git a/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-output.txt b/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-output.txt index b4ab982..e19972f 100644 --- a/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-output.txt +++ b/st-tdg-eval/src/test/resources/testTotalPetsToDeliverByAddress-output.txt @@ -1,2 +1,2 @@ -{"zip":"0","total":22} -{"zip":"1","total":0} +{"zip":"0","total":38} +{"zip":"1","total":38} diff --git a/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pet-orders-by-address.txt b/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pet-orders-by-address.txt index 4a5afc0..3043f1c 100644 --- a/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pet-orders-by-address.txt +++ b/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pet-orders-by-address.txt @@ -1,17 +1,18 @@ "category":{"id":1,"name":"2"} "category":{"id":2,"name":"102"} "category":{"id":3,"name":"202"} -"pet":{"id":1,"category":{"id":1,"name":"2"},"name":"1102","photoUrls":["303"],"tags":[{"id":703,"name":"704"}],"status":"available"} -"pet":{"id":2,"category":{"id":2,"name":"102"},"name":"1202","photoUrls":["403"],"tags":[{"id":803,"name":"804"}],"status":"pending"} -"pet":{"id":3,"category":{"id":2,"name":"102"},"name":"1302","photoUrls":["503"],"tags":[{"id":903,"name":"904"}],"status":"sold"} -"pet":{"id":4,"category":{"id":1,"name":"2"},"name":"1402","photoUrls":["603"],"tags":[],"status":"available"} -"pet":{"id":5,"category":{"id":1,"name":"2"},"name":"1502","photoUrls":[],"tags":[{"id":1003,"name":"1004"}],"status":"pending"} -"order":{"id":1,"petId":1,"customerId":1,"quantity":2104,"shipDate":"2007-01-26T00:00:00.000+00:00","status":"placed","complete":false} -"order":{"id":2,"petId":1,"customerId":1,"quantity":2204,"shipDate":"2007-01-27T00:00:00.000+00:00","status":"approved","complete":true} -"order":{"id":3,"petId":2,"customerId":1,"quantity":2304,"shipDate":"2007-01-28T00:00:00.000+00:00","status":"approved","complete":false} -"order":{"id":4,"petId":1,"customerId":2,"quantity":2404,"shipDate":"2007-01-29T00:00:00.000+00:00","status":"approved","complete":true} -"order":{"id":5,"petId":4,"customerId":1,"quantity":2504,"shipDate":"2007-01-30T00:00:00.000+00:00","status":"approved","complete":false} -"order":{"id":6,"petId":5,"customerId":1,"quantity":2604,"shipDate":"2007-02-01T00:00:00.000+00:00","status":"approved","complete":true} -"customer":{"id":1,"username":"1802","address":[{"street":"1603","city":"1604","state":"1605","zip":"0"}]} -"customer":{"id":2,"username":"1902","address":[]} -"customer":{"id":3,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"1"}]} +"pet":{"id":1,"category":{"id":1,"name":"2"},"name":"1202","photoUrls":["303"],"tags":[{"id":803,"name":"804"}],"status":"pending"} +"pet":{"id":2,"category":{"id":2,"name":"102"},"name":"1302","photoUrls":["403","503"],"tags":[{"id":903,"name":"904"}],"status":"sold"} +"pet":{"id":3,"category":{"id":1,"name":"2"},"name":"1402","photoUrls":["603"],"tags":[{"id":1003,"name":"1004"}],"status":"available"} +"pet":{"id":4,"category":{"id":1,"name":"2"},"name":"1502","photoUrls":["703"],"tags":[],"status":"pending"} +"pet":{"id":5,"category":{"id":1,"name":"2"},"name":"1602","photoUrls":[],"tags":[{"id":1103,"name":"1104"}],"status":"sold"} +"order":{"id":1,"petId":1,"customerId":1,"quantity":2304,"shipDate":"2007-01-28T00:00:00.000+00:00","status":"placed","complete":false} +"order":{"id":2,"petId":1,"customerId":1,"quantity":2404,"shipDate":"2007-01-29T00:00:00.000+00:00","status":"approved","complete":true} +"order":{"id":3,"petId":2,"customerId":1,"quantity":2504,"shipDate":"2007-01-30T00:00:00.000+00:00","status":"approved","complete":false} +"order":{"id":4,"petId":2,"customerId":1,"quantity":2604,"shipDate":"2007-02-01T00:00:00.000+00:00","status":"approved","complete":true} +"order":{"id":5,"petId":1,"customerId":2,"quantity":2704,"shipDate":"2007-02-02T00:00:00.000+00:00","status":"approved","complete":false} +"order":{"id":6,"petId":4,"customerId":1,"quantity":2804,"shipDate":"2007-02-03T00:00:00.000+00:00","status":"approved","complete":true} +"order":{"id":7,"petId":5,"customerId":1,"quantity":2904,"shipDate":"2007-02-04T00:00:00.000+00:00","status":"approved","complete":false} +"customer":{"id":1,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"0"},{"street":"1803","city":"1804","state":"1805","zip":"1"}]} +"customer":{"id":2,"username":"2102","address":[]} +"customer":{"id":3,"username":"2202","address":[{"street":"1903","city":"1904","state":"1905","zip":"0"}]} diff --git a/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pets-by-address.txt b/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pets-by-address.txt index 04750d9..5b6e4c6 100644 --- a/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pets-by-address.txt +++ b/st-tdg-test/src/test/resources/petstore/qagrow-live-total-pets-by-address.txt @@ -1,18 +1,18 @@ "category":{"id":1,"name":"2"} "category":{"id":2,"name":"102"} "category":{"id":3,"name":"202"} -"pet":{"id":1,"category":{"id":1,"name":"2"},"name":"1102","photoUrls":["303"],"tags":[{"id":703,"name":"704"}],"status":"available"} -"pet":{"id":2,"category":{"id":2,"name":"102"},"name":"1202","photoUrls":["403"],"tags":[{"id":803,"name":"804"}],"status":"pending"} -"pet":{"id":3,"category":{"id":2,"name":"102"},"name":"1302","photoUrls":["603"],"tags":[],"status":"sold"} -"pet":{"id":4,"category":{"id":1,"name":"2"},"name":"1402","photoUrls":["503"],"tags":[{"id":903,"name":"904"}],"status":"available"} -"pet":{"id":5,"category":{"id":1,"name":"2"},"name":"1502","photoUrls":[],"tags":[{"id":1003,"name":"1004"}],"status":"pending"} -"order":{"id":1,"petId":1,"customerId":1,"quantity":2104,"shipDate":"2007-01-26T00:00:00.000+00:00","status":"placed","complete":false} -"order":{"id":2,"petId":1,"customerId":1,"quantity":0,"shipDate":"2007-01-27T00:00:00.000+00:00","status":"approved","complete":true} -"order":{"id":3,"petId":2,"customerId":1,"quantity":0,"shipDate":"2007-01-28T00:00:00.000+00:00","status":"approved","complete":false} -"order":{"id":4,"petId":1,"customerId":1,"quantity":0,"shipDate":"2007-01-29T00:00:00.000+00:00","status":"approved","complete":true} -"order":{"id":5,"petId":1,"customerId":2,"quantity":2504,"shipDate":"2007-01-30T00:00:00.000+00:00","status":"approved","complete":false} -"order":{"id":6,"petId":3,"customerId":1,"quantity":2604,"shipDate":"2007-02-01T00:00:00.000+00:00","status":"approved","complete":true} -"order":{"id":7,"petId":5,"customerId":1,"quantity":2704,"shipDate":"2007-02-02T00:00:00.000+00:00","status":"approved","complete":false} -"customer":{"id":1,"username":"1802","address":[{"street":"1603","city":"1604","state":"1605","zip":"0"}]} -"customer":{"id":2,"username":"1902","address":[]} -"customer":{"id":3,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"1"}]} +"pet":{"id":1,"category":{"id":1,"name":"2"},"name":"1302","photoUrls":["303","603"],"tags":[{"id":903,"name":"904"}],"status":"sold"} +"pet":{"id":2,"category":{"id":2,"name":"102"},"name":"1402","photoUrls":["403","503"],"tags":[{"id":1003,"name":"1004"}],"status":"available"} +"pet":{"id":3,"category":{"id":1,"name":"2"},"name":"1502","photoUrls":["703"],"tags":[{"id":1103,"name":"1104"}],"status":"pending"} +"pet":{"id":4,"category":{"id":1,"name":"2"},"name":"1602","photoUrls":["803"],"tags":[],"status":"sold"} +"pet":{"id":5,"category":{"id":1,"name":"2"},"name":"1702","photoUrls":[],"tags":[{"id":1203,"name":"1204"}],"status":"available"} +"order":{"id":1,"petId":1,"customerId":1,"quantity":2404,"shipDate":"2007-01-29T00:00:00.000+00:00","status":"placed","complete":true} +"order":{"id":2,"petId":1,"customerId":1,"quantity":1,"shipDate":"2007-01-30T00:00:00.000+00:00","status":"approved","complete":false} +"order":{"id":3,"petId":2,"customerId":1,"quantity":2604,"shipDate":"2007-02-01T00:00:00.000+00:00","status":"approved","complete":true} +"order":{"id":4,"petId":2,"customerId":1,"quantity":0,"shipDate":"2007-02-02T00:00:00.000+00:00","status":"approved","complete":false} +"order":{"id":5,"petId":1,"customerId":2,"quantity":2804,"shipDate":"2007-02-03T00:00:00.000+00:00","status":"approved","complete":true} +"order":{"id":6,"petId":4,"customerId":1,"quantity":2904,"shipDate":"2007-02-04T00:00:00.000+00:00","status":"approved","complete":false} +"order":{"id":7,"petId":5,"customerId":1,"quantity":3004,"shipDate":"2007-02-05T00:00:00.000+00:00","status":"approved","complete":true} +"customer":{"id":1,"username":"2102","address":[{"street":"1803","city":"1804","state":"1805","zip":"0"},{"street":"1903","city":"1904","state":"1905","zip":"1"}]} +"customer":{"id":2,"username":"2202","address":[]} +"customer":{"id":3,"username":"2302","address":[{"street":"2003","city":"2004","state":"2005","zip":"0"}]} diff --git a/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pet-orders-by-address.txt b/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pet-orders-by-address.txt index d016dd4..66570ae 100644 --- a/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pet-orders-by-address.txt +++ b/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pet-orders-by-address.txt @@ -1,17 +1,18 @@ "Category":{"id":1,"name":"2"} "Category":{"id":2,"name":"102"} "Category":{"id":3,"name":"202"} -"Pet":{"id":1,"name":"1102","category":{"id":1,"name":"2"},"photoUrls":["303"],"tags":[{"id":703,"name":"704"}],"status":"available"} -"Pet":{"id":2,"name":"1202","category":{"id":2,"name":"102"},"photoUrls":["403"],"tags":[{"id":803,"name":"804"}],"status":"pending"} -"Pet":{"id":3,"name":"1302","category":{"id":2,"name":"102"},"photoUrls":["503"],"tags":[{"id":903,"name":"904"}],"status":"sold"} -"Pet":{"id":4,"name":"1402","category":{"id":1,"name":"2"},"photoUrls":["603"],"tags":[],"status":"available"} -"Pet":{"id":5,"name":"1502","category":{"id":1,"name":"2"},"photoUrls":[],"tags":[{"id":1003,"name":"1004"}],"status":"pending"} -"Customer":{"id":1,"username":"1802","address":[{"street":"1603","city":"1604","state":"1605","zip":"0"}]} -"Customer":{"id":2,"username":"1902","address":[]} -"Customer":{"id":3,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"1"}]} -"Order":{"id":1,"petId":1,"customerId":1,"quantity":2104,"shipDate":"2007-01-26","status":"placed","complete":false} -"Order":{"id":2,"petId":1,"customerId":1,"quantity":2204,"shipDate":"2007-01-27","status":"approved","complete":true} -"Order":{"id":3,"petId":2,"customerId":1,"quantity":2304,"shipDate":"2007-01-28","status":"approved","complete":false} -"Order":{"id":4,"petId":1,"customerId":2,"quantity":2404,"shipDate":"2007-01-29","status":"approved","complete":true} -"Order":{"id":5,"petId":4,"customerId":1,"quantity":2504,"shipDate":"2007-01-30","status":"approved","complete":false} -"Order":{"id":6,"petId":5,"customerId":1,"quantity":2604,"shipDate":"2007-02-01","status":"approved","complete":true} \ No newline at end of file +"Pet":{"id":1,"name":"1202","category":{"id":1,"name":"2"},"photoUrls":["303"],"tags":[{"id":803,"name":"804"}],"status":"pending"} +"Pet":{"id":2,"name":"1302","category":{"id":2,"name":"102"},"photoUrls":["403","503"],"tags":[{"id":903,"name":"904"}],"status":"sold"} +"Pet":{"id":3,"name":"1402","category":{"id":1,"name":"2"},"photoUrls":["603"],"tags":[{"id":1003,"name":"1004"}],"status":"available"} +"Pet":{"id":4,"name":"1502","category":{"id":1,"name":"2"},"photoUrls":["703"],"tags":[],"status":"pending"} +"Pet":{"id":5,"name":"1602","category":{"id":1,"name":"2"},"photoUrls":[],"tags":[{"id":1103,"name":"1104"}],"status":"sold"} +"Customer":{"id":1,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"0"},{"street":"1803","city":"1804","state":"1805","zip":"1"}]} +"Customer":{"id":2,"username":"2102","address":[]} +"Customer":{"id":3,"username":"2202","address":[{"street":"1903","city":"1904","state":"1905","zip":"0"}]} +"Order":{"id":1,"petId":1,"customerId":1,"quantity":2304,"shipDate":"2007-01-28","status":"placed","complete":false} +"Order":{"id":2,"petId":1,"customerId":1,"quantity":2404,"shipDate":"2007-01-29","status":"approved","complete":true} +"Order":{"id":3,"petId":2,"customerId":1,"quantity":2504,"shipDate":"2007-01-30","status":"approved","complete":false} +"Order":{"id":4,"petId":2,"customerId":1,"quantity":2604,"shipDate":"2007-02-01","status":"approved","complete":true} +"Order":{"id":5,"petId":1,"customerId":2,"quantity":2704,"shipDate":"2007-02-02","status":"approved","complete":false} +"Order":{"id":6,"petId":4,"customerId":1,"quantity":2804,"shipDate":"2007-02-03","status":"approved","complete":true} +"Order":{"id":7,"petId":5,"customerId":1,"quantity":2904,"shipDate":"2007-02-04","status":"approved","complete":false} \ No newline at end of file diff --git a/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pets-by-address.txt b/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pets-by-address.txt index 823fd25..7bf7282 100644 --- a/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pets-by-address.txt +++ b/st-tdg-test/src/test/resources/petstore/qagrow-local-total-pets-by-address.txt @@ -1,18 +1,18 @@ "Category":{"id":1,"name":"2"} "Category":{"id":2,"name":"102"} "Category":{"id":3,"name":"202"} -"Pet":{"id":1,"name":"1102","category":{"id":1,"name":"2"},"photoUrls":["303"],"tags":[{"id":703,"name":"704"}],"status":"available"} -"Pet":{"id":2,"name":"1202","category":{"id":2,"name":"102"},"photoUrls":["403"],"tags":[{"id":803,"name":"804"}],"status":"pending"} -"Pet":{"id":3,"name":"1302","category":{"id":2,"name":"102"},"photoUrls":["603"],"tags":[],"status":"sold"} -"Pet":{"id":4,"name":"1402","category":{"id":1,"name":"2"},"photoUrls":["503"],"tags":[{"id":903,"name":"904"}],"status":"available"} -"Pet":{"id":5,"name":"1502","category":{"id":1,"name":"2"},"photoUrls":[],"tags":[{"id":1003,"name":"1004"}],"status":"pending"} -"Customer":{"id":1,"username":"1802","address":[{"street":"1603","city":"1604","state":"1605","zip":"0"}]} -"Customer":{"id":2,"username":"1902","address":[]} -"Customer":{"id":3,"username":"2002","address":[{"street":"1703","city":"1704","state":"1705","zip":"1"}]} -"Order":{"id":1,"petId":1,"customerId":1,"quantity":2104,"shipDate":"2007-01-26","status":"placed","complete":false} -"Order":{"id":2,"petId":1,"customerId":1,"quantity":0,"shipDate":"2007-01-27","status":"approved","complete":true} -"Order":{"id":3,"petId":2,"customerId":1,"quantity":0,"shipDate":"2007-01-28","status":"approved","complete":false} -"Order":{"id":4,"petId":1,"customerId":1,"quantity":0,"shipDate":"2007-01-29","status":"approved","complete":true} -"Order":{"id":5,"petId":1,"customerId":2,"quantity":2504,"shipDate":"2007-01-30","status":"approved","complete":false} -"Order":{"id":6,"petId":3,"customerId":1,"quantity":2604,"shipDate":"2007-02-01","status":"approved","complete":true} -"Order":{"id":7,"petId":5,"customerId":1,"quantity":2704,"shipDate":"2007-02-02","status":"approved","complete":false} \ No newline at end of file +"Pet":{"id":1,"name":"1302","category":{"id":1,"name":"2"},"photoUrls":["303","603"],"tags":[{"id":903,"name":"904"}],"status":"sold"} +"Pet":{"id":2,"name":"1402","category":{"id":2,"name":"102"},"photoUrls":["403","503"],"tags":[{"id":1003,"name":"1004"}],"status":"available"} +"Pet":{"id":3,"name":"1502","category":{"id":1,"name":"2"},"photoUrls":["703"],"tags":[{"id":1103,"name":"1104"}],"status":"pending"} +"Pet":{"id":4,"name":"1602","category":{"id":1,"name":"2"},"photoUrls":["803"],"tags":[],"status":"sold"} +"Pet":{"id":5,"name":"1702","category":{"id":1,"name":"2"},"photoUrls":[],"tags":[{"id":1203,"name":"1204"}],"status":"available"} +"Customer":{"id":1,"username":"2102","address":[{"street":"1803","city":"1804","state":"1805","zip":"0"},{"street":"1903","city":"1904","state":"1905","zip":"1"}]} +"Customer":{"id":2,"username":"2202","address":[]} +"Customer":{"id":3,"username":"2302","address":[{"street":"2003","city":"2004","state":"2005","zip":"0"}]} +"Order":{"id":1,"petId":1,"customerId":1,"quantity":2404,"shipDate":"2007-01-29","status":"placed","complete":true} +"Order":{"id":2,"petId":1,"customerId":1,"quantity":1,"shipDate":"2007-01-30","status":"approved","complete":false} +"Order":{"id":3,"petId":2,"customerId":1,"quantity":2604,"shipDate":"2007-02-01","status":"approved","complete":true} +"Order":{"id":4,"petId":2,"customerId":1,"quantity":0,"shipDate":"2007-02-02","status":"approved","complete":false} +"Order":{"id":5,"petId":1,"customerId":2,"quantity":2804,"shipDate":"2007-02-03","status":"approved","complete":true} +"Order":{"id":6,"petId":4,"customerId":1,"quantity":2904,"shipDate":"2007-02-04","status":"approved","complete":false} +"Order":{"id":7,"petId":5,"customerId":1,"quantity":3004,"shipDate":"2007-02-05","status":"approved","complete":true} \ No newline at end of file diff --git a/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-address-order-status.xml b/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-address-order-status.xml index 9214928..7983d7b 100644 --- a/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-address-order-status.xml +++ b/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-address-order-status.xml @@ -5,8 +5,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -16,8 +16,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -31,8 +31,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -46,8 +46,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -61,8 +61,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -81,17 +81,17 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - LEFT JOIN "Order" ON Customer.id = Order.customerId - LEFT JOIN Pet ON Order.petId = Pet.id + LEFT JOIN "Order" ON Customer.id = "Order".customerId + LEFT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE ((Order.customerId IS NULL) AND (Customer.id IS NOT NULL)) + WHERE (("Order".customerId IS NULL) AND (Customer.id IS NOT NULL)) AND (Customer_address_xa.zip = '99999') --The JOIN tables fulfill: --COMMENT: Reduced conditions: ["Order".status = 'placed'] ; - --summary: [Customer] left [Order] ON Customer.id = Order.customerId + --summary: [Customer] left [Order] ON Customer.id = "Order".customerId --There exist a set of rows joined from tables Customer, Customer_address_xa --which does not join to any table in Order --The following condition in the WHERE holds: @@ -101,16 +101,16 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.petId IS NULL) AND (Pet.id IS NOT NULL) + WHERE ("Order".petId IS NULL) AND (Pet.id IS NOT NULL) --The JOIN tables fulfill: --COMMENT: Reduced conditions: [Customer_address_xa.zip = '99999'] ; ["Order".status = 'placed'] ; - --summary: [Order] right [Pet] ON Order.petId = Pet.id + --summary: [Order] right [Pet] ON "Order".petId = Pet.id --There exist a set of rows joined from tables Pet, Pet_tags_xa, Pet_photoUrls_xa, Category Pet_category_xref --which does not join to any table in Order @@ -118,8 +118,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -136,8 +136,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -154,8 +154,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa RIGHT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id diff --git a/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-category-order-status.xml b/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-category-order-status.xml index 164cf91..88d64dc 100644 --- a/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-category-order-status.xml +++ b/st-tdg-test/src/test/resources/petstore/rules-placed-pet-orders-by-category-order-status.xml @@ -5,8 +5,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -16,8 +16,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -31,8 +31,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -46,8 +46,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -61,8 +61,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -79,16 +79,16 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - LEFT JOIN "Order" ON Customer.id = Order.customerId - LEFT JOIN Pet ON Order.petId = Pet.id + LEFT JOIN "Order" ON Customer.id = "Order".customerId + LEFT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.customerId IS NULL) AND (Customer.id IS NOT NULL) + WHERE ("Order".customerId IS NULL) AND (Customer.id IS NOT NULL) --The JOIN tables fulfill: --COMMENT: Reduced conditions: [Pet.category::name = 'Dogs'] ; ["Order".status = 'placed'] ; - --summary: [Customer] left [Order] ON Customer.id = Order.customerId + --summary: [Customer] left [Order] ON Customer.id = "Order".customerId --There exist a set of rows joined from tables Customer, Customer_address_xa --which does not join to any table in Order @@ -96,17 +96,17 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE ((Order.petId IS NULL) AND (Pet.id IS NOT NULL)) + WHERE (("Order".petId IS NULL) AND (Pet.id IS NOT NULL)) AND (Pet.category::name = 'Dogs') --The JOIN tables fulfill: --COMMENT: Reduced conditions: ["Order".status = 'placed'] ; - --summary: [Order] right [Pet] ON Order.petId = Pet.id + --summary: [Order] right [Pet] ON "Order".petId = Pet.id --There exist a set of rows joined from tables Pet, Pet_tags_xa, Pet_photoUrls_xa, Category Pet_category_xref --which does not join to any table in Order --The following condition in the WHERE holds: @@ -116,8 +116,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -134,8 +134,8 @@ SELECT * FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -152,8 +152,8 @@ SELECT * FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa RIGHT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id diff --git a/st-tdg-test/src/test/resources/petstore/rules-placed-pet0-orders-by-category-order-status.xml b/st-tdg-test/src/test/resources/petstore/rules-placed-pet0-orders-by-category-order-status.xml index c5af91c..02c7fb0 100644 --- a/st-tdg-test/src/test/resources/petstore/rules-placed-pet0-orders-by-category-order-status.xml +++ b/st-tdg-test/src/test/resources/petstore/rules-placed-pet0-orders-by-category-order-status.xml @@ -4,15 +4,15 @@ tds Customer0, "Order0", Pet0 where Pet0.category::name='Dogs' and "Order0".status='placed' SELECT * FROM Customer0 - INNER JOIN "Order0" ON Customer0.id = Order0.customerId - INNER JOIN Pet0 ON Order0.petId = Pet0.id + INNER JOIN "Order0" ON Customer0.id = "Order0".customerId + INNER JOIN Pet0 ON "Order0".petId = Pet0.id WHERE Pet0.category::name = 'Dogs' AND "Order0".status = 'placed' 1STTT1.w.1.[Pet0.category::name = 'Dogs'] SELECT * FROM Customer0 - INNER JOIN "Order0" ON Customer0.id = Order0.customerId - INNER JOIN Pet0 ON Order0.petId = Pet0.id + INNER JOIN "Order0" ON Customer0.id = "Order0".customerId + INNER JOIN Pet0 ON "Order0".petId = Pet0.id WHERE (Pet0.category::name = 'Dogs') AND ("Order0".status = 'placed') --A set of joined tables such that: --The WHERE condition fulfills: @@ -22,8 +22,8 @@ 2STFT1.w.1.[Pet0.category::name = 'Dogs'] SELECT * FROM Customer0 - INNER JOIN "Order0" ON Customer0.id = Order0.customerId - INNER JOIN Pet0 ON Order0.petId = Pet0.id + INNER JOIN "Order0" ON Customer0.id = "Order0".customerId + INNER JOIN Pet0 ON "Order0".petId = Pet0.id WHERE NOT(Pet0.category::name = 'Dogs') AND ("Order0".status = 'placed') --A set of joined tables such that: --The WHERE condition fulfills: @@ -33,8 +33,8 @@ 3STFT1.w.2.["Order0".status = 'placed'] SELECT * FROM Customer0 - INNER JOIN "Order0" ON Customer0.id = Order0.customerId - INNER JOIN Pet0 ON Order0.petId = Pet0.id + INNER JOIN "Order0" ON Customer0.id = "Order0".customerId + INNER JOIN Pet0 ON "Order0".petId = Pet0.id WHERE NOT("Order0".status = 'placed') AND (Pet0.category::name = 'Dogs') --A set of joined tables such that: --The WHERE condition fulfills: @@ -44,27 +44,27 @@ 4JLO1.j.1.[INNER JOIN] SELECT * FROM Customer0 - LEFT JOIN "Order0" ON Customer0.id = Order0.customerId - LEFT JOIN Pet0 ON Order0.petId = Pet0.id - WHERE (Order0.customerId IS NULL) AND (Customer0.id IS NOT NULL) + LEFT JOIN "Order0" ON Customer0.id = "Order0".customerId + LEFT JOIN Pet0 ON "Order0".petId = Pet0.id + WHERE ("Order0".customerId IS NULL) AND (Customer0.id IS NOT NULL) --The JOIN tables fulfill: --COMMENT: Reduced conditions: [Pet0.category::name = 'Dogs'] ; ["Order0".status = 'placed'] ; - --summary: [Customer0] left [Order0] ON Customer0.id = Order0.customerId + --summary: [Customer0] left [Order0] ON Customer0.id = "Order0".customerId --There exist some row in table Customer0 --which does not join to any table in Order0 5JRO1.j.2.[INNER JOIN] SELECT * FROM Customer0 - RIGHT JOIN "Order0" ON Customer0.id = Order0.customerId - RIGHT JOIN Pet0 ON Order0.petId = Pet0.id - WHERE ((Order0.petId IS NULL) AND (Pet0.id IS NOT NULL)) + RIGHT JOIN "Order0" ON Customer0.id = "Order0".customerId + RIGHT JOIN Pet0 ON "Order0".petId = Pet0.id + WHERE (("Order0".petId IS NULL) AND (Pet0.id IS NOT NULL)) AND (Pet0.category::name = 'Dogs') --The JOIN tables fulfill: --COMMENT: Reduced conditions: ["Order0".status = 'placed'] ; - --summary: [Order0] right [Pet0] ON Order0.petId = Pet0.id + --summary: [Order0] right [Pet0] ON "Order0".petId = Pet0.id --There exist some row in table Pet0 --which does not join to any table in Order0 --The following condition in the WHERE holds: diff --git a/st-tdg-test/src/test/resources/petstore/rules-total-pet-orders-by-address.xml b/st-tdg-test/src/test/resources/petstore/rules-total-pet-orders-by-address.xml index fb224d3..895b32d 100644 --- a/st-tdg-test/src/test/resources/petstore/rules-total-pet-orders-by-address.xml +++ b/st-tdg-test/src/test/resources/petstore/rules-total-pet-orders-by-address.xml @@ -5,8 +5,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -17,8 +17,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -32,8 +32,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -47,8 +47,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -66,17 +66,17 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - LEFT JOIN "Order" ON Customer.id = Order.customerId - LEFT JOIN Pet ON Order.petId = Pet.id + LEFT JOIN "Order" ON Customer.id = "Order".customerId + LEFT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.customerId IS NULL) AND (Customer.id IS NOT NULL) + WHERE ("Order".customerId IS NULL) AND (Customer.id IS NOT NULL) GROUP BY Customer_address_xa.zip --The JOIN tables fulfill: --COMMENT: Reduced conditions: [WHERE "Order".status = 'approved'] ; - --summary: [Customer] left [Order] ON Customer.id = Order.customerId + --summary: [Customer] left [Order] ON Customer.id = "Order".customerId --There exist a set of rows joined from tables Customer, Customer_address_xa --which does not join to any table in Order @@ -84,17 +84,17 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.petId IS NULL) AND (Pet.id IS NOT NULL) + WHERE ("Order".petId IS NULL) AND (Pet.id IS NOT NULL) GROUP BY Customer_address_xa.zip --The JOIN tables fulfill: --COMMENT: Reduced conditions: [WHERE "Order".status = 'approved'] ; - --summary: [Order] right [Pet] ON Order.petId = Pet.id + --summary: [Order] right [Pet] ON "Order".petId = Pet.id --There exist a set of rows joined from tables Pet, Pet_tags_xa, Pet_photoUrls_xa, Category Pet_category_xref --which does not join to any table in Order @@ -102,8 +102,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -121,8 +121,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -140,8 +140,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa RIGHT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -158,8 +158,8 @@ SELECT Customer_address_xa.zip , COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -174,8 +174,8 @@ SELECT COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id diff --git a/st-tdg-test/src/test/resources/petstore/rules-total-pets-by-address.xml b/st-tdg-test/src/test/resources/petstore/rules-total-pets-by-address.xml index 1776bb6..c5c4df5 100644 --- a/st-tdg-test/src/test/resources/petstore/rules-total-pets-by-address.xml +++ b/st-tdg-test/src/test/resources/petstore/rules-total-pets-by-address.xml @@ -5,8 +5,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -17,8 +17,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -32,8 +32,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -47,8 +47,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -66,17 +66,17 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - LEFT JOIN "Order" ON Customer.id = Order.customerId - LEFT JOIN Pet ON Order.petId = Pet.id + LEFT JOIN "Order" ON Customer.id = "Order".customerId + LEFT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.customerId IS NULL) AND (Customer.id IS NOT NULL) + WHERE ("Order".customerId IS NULL) AND (Customer.id IS NOT NULL) GROUP BY Customer_address_xa.zip --The JOIN tables fulfill: --COMMENT: Reduced conditions: [WHERE "Order".status = 'approved'] ; - --summary: [Customer] left [Order] ON Customer.id = Order.customerId + --summary: [Customer] left [Order] ON Customer.id = "Order".customerId --There exist a set of rows joined from tables Customer, Customer_address_xa --which does not join to any table in Order @@ -84,17 +84,17 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id - WHERE (Order.petId IS NULL) AND (Pet.id IS NOT NULL) + WHERE ("Order".petId IS NULL) AND (Pet.id IS NOT NULL) GROUP BY Customer_address_xa.zip --The JOIN tables fulfill: --COMMENT: Reduced conditions: [WHERE "Order".status = 'approved'] ; - --summary: [Order] right [Pet] ON Order.petId = Pet.id + --summary: [Order] right [Pet] ON "Order".petId = Pet.id --There exist a set of rows joined from tables Pet, Pet_tags_xa, Pet_photoUrls_xa, Category Pet_category_xref --which does not join to any table in Order @@ -102,8 +102,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa INNER JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -121,8 +121,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer INNER JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id INNER JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa INNER JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -140,8 +140,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - RIGHT JOIN "Order" ON Customer.id = Order.customerId - RIGHT JOIN Pet ON Order.petId = Pet.id + RIGHT JOIN "Order" ON Customer.id = "Order".customerId + RIGHT JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa RIGHT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -158,8 +158,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -174,8 +174,8 @@ SELECT COUNT(*) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id @@ -189,8 +189,8 @@ SELECT Customer_address_xa.zip , SUM("Order".quantity) FROM Customer LEFT JOIN Customer_address_xa ON Customer.id = Customer_address_xa.fk_xa - INNER JOIN "Order" ON Customer.id = Order.customerId - INNER JOIN Pet ON Order.petId = Pet.id + INNER JOIN "Order" ON Customer.id = "Order".customerId + INNER JOIN Pet ON "Order".petId = Pet.id LEFT JOIN Pet_tags_xa ON Pet.id = Pet_tags_xa.fk_xa LEFT JOIN Pet_photoUrls_xa ON Pet.id = Pet_photoUrls_xa.fk_xa LEFT JOIN Category Pet_category_xref ON Pet.category::id = Pet_category_xref.id