From 8e30bcaea4559ce1f698ce3560e7969aa617cecf Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 1 Jun 2022 11:09:51 +0200 Subject: [PATCH] [jOOQ/demo#1] main branch should use jOOQ 3.16 --- jOOQ-demo-oss/jOOQ-demo-java/pom.xml | 2 +- .../org/jooq/demo/java/db/DefaultCatalog.java | 6 +- .../org/jooq/demo/java/db/tables/Actor.java | 102 ----- .../jooq/demo/java/db/tables/ActorInfo.java | 49 +-- .../org/jooq/demo/java/db/tables/Address.java | 150 ------- .../jooq/demo/java/db/tables/Category.java | 102 ----- .../org/jooq/demo/java/db/tables/City.java | 84 ---- .../org/jooq/demo/java/db/tables/Country.java | 67 ---- .../jooq/demo/java/db/tables/Customer.java | 344 ---------------- .../demo/java/db/tables/CustomerList.java | 51 +-- .../org/jooq/demo/java/db/tables/Film.java | 236 ----------- .../jooq/demo/java/db/tables/FilmActor.java | 66 --- .../demo/java/db/tables/FilmCategory.java | 66 --- .../jooq/demo/java/db/tables/FilmInStock.java | 32 -- .../jooq/demo/java/db/tables/FilmList.java | 48 +-- .../demo/java/db/tables/FilmNotInStock.java | 32 -- .../jooq/demo/java/db/tables/Inventory.java | 101 ----- .../jooq/demo/java/db/tables/Language.java | 31 -- .../db/tables/NicerButSlowerFilmList.java | 48 +-- .../org/jooq/demo/java/db/tables/Payment.java | 83 ---- .../demo/java/db/tables/PaymentP2007_01.java | 83 ---- .../demo/java/db/tables/PaymentP2007_02.java | 83 ---- .../demo/java/db/tables/PaymentP2007_03.java | 83 ---- .../demo/java/db/tables/PaymentP2007_04.java | 83 ---- .../demo/java/db/tables/PaymentP2007_05.java | 83 ---- .../demo/java/db/tables/PaymentP2007_06.java | 83 ---- .../org/jooq/demo/java/db/tables/Rental.java | 328 --------------- .../demo/java/db/tables/RewardsReport.java | 31 -- .../java/db/tables/SalesByFilmCategory.java | 44 +- .../demo/java/db/tables/SalesByStore.java | 47 +-- .../org/jooq/demo/java/db/tables/Staff.java | 376 ------------------ .../jooq/demo/java/db/tables/StaffList.java | 47 +-- .../org/jooq/demo/java/db/tables/Store.java | 166 -------- .../jooq/demo/java/db/tables/pojos/Actor.java | 6 +- .../demo/java/db/tables/pojos/ActorInfo.java | 2 +- .../demo/java/db/tables/pojos/Address.java | 14 +- .../demo/java/db/tables/pojos/Category.java | 4 +- .../jooq/demo/java/db/tables/pojos/City.java | 6 +- .../demo/java/db/tables/pojos/Country.java | 4 +- .../demo/java/db/tables/pojos/Customer.java | 18 +- .../java/db/tables/pojos/CustomerList.java | 4 +- .../jooq/demo/java/db/tables/pojos/Film.java | 26 +- .../demo/java/db/tables/pojos/FilmActor.java | 4 +- .../java/db/tables/pojos/FilmCategory.java | 4 +- .../demo/java/db/tables/pojos/FilmList.java | 12 +- .../demo/java/db/tables/pojos/Inventory.java | 6 +- .../demo/java/db/tables/pojos/Language.java | 4 +- .../tables/pojos/NicerButSlowerFilmList.java | 12 +- .../demo/java/db/tables/pojos/Payment.java | 10 +- .../java/db/tables/pojos/PaymentP2007_01.java | 10 +- .../java/db/tables/pojos/PaymentP2007_02.java | 10 +- .../java/db/tables/pojos/PaymentP2007_03.java | 10 +- .../java/db/tables/pojos/PaymentP2007_04.java | 10 +- .../java/db/tables/pojos/PaymentP2007_05.java | 10 +- .../java/db/tables/pojos/PaymentP2007_06.java | 10 +- .../demo/java/db/tables/pojos/Rental.java | 8 +- .../java/db/tables/pojos/RewardsReport.java | 18 +- .../db/tables/pojos/SalesByFilmCategory.java | 2 +- .../java/db/tables/pojos/SalesByStore.java | 4 +- .../jooq/demo/java/db/tables/pojos/Staff.java | 20 +- .../demo/java/db/tables/pojos/StaffList.java | 4 +- .../jooq/demo/java/db/tables/pojos/Store.java | 6 +- .../org/jooq/demo/java/Demo01Querying.java | 31 +- .../org/jooq/demo/java/Demo02DynamicSQL.java | 2 +- .../demo/java/Demo11QueryObjectModel.java | 19 +- .../org/jooq/demo/java/Demo13Reactive.java | 75 ++-- jOOQ-demo-oss/jOOQ-demo-kotlin/pom.xml | 4 +- .../org/jooq/demo/kotlin/db/DefaultCatalog.kt | 6 +- .../org/jooq/demo/kotlin/db/tables/Actor.kt | 76 ---- .../jooq/demo/kotlin/db/tables/ActorInfo.kt | 37 +- .../org/jooq/demo/kotlin/db/tables/Address.kt | 116 ------ .../jooq/demo/kotlin/db/tables/Category.kt | 76 ---- .../org/jooq/demo/kotlin/db/tables/City.kt | 64 --- .../org/jooq/demo/kotlin/db/tables/Country.kt | 48 --- .../jooq/demo/kotlin/db/tables/Customer.kt | 274 ------------- .../demo/kotlin/db/tables/CustomerList.kt | 39 +- .../org/jooq/demo/kotlin/db/tables/Film.kt | 187 --------- .../jooq/demo/kotlin/db/tables/FilmActor.kt | 52 --- .../demo/kotlin/db/tables/FilmCategory.kt | 52 --- .../jooq/demo/kotlin/db/tables/FilmInStock.kt | 20 - .../jooq/demo/kotlin/db/tables/FilmList.kt | 36 +- .../demo/kotlin/db/tables/FilmNotInStock.kt | 20 - .../jooq/demo/kotlin/db/tables/Inventory.kt | 80 ---- .../jooq/demo/kotlin/db/tables/Language.kt | 19 - .../db/tables/NicerButSlowerFilmList.kt | 36 +- .../org/jooq/demo/kotlin/db/tables/Payment.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_01.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_02.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_03.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_04.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_05.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_06.kt | 68 ---- .../org/jooq/demo/kotlin/db/tables/Rental.kt | 264 ------------ .../demo/kotlin/db/tables/RewardsReport.kt | 19 - .../kotlin/db/tables/SalesByFilmCategory.kt | 32 +- .../demo/kotlin/db/tables/SalesByStore.kt | 35 +- .../org/jooq/demo/kotlin/db/tables/Staff.kt | 299 -------------- .../jooq/demo/kotlin/db/tables/StaffList.kt | 35 +- .../org/jooq/demo/kotlin/db/tables/Store.kt | 131 ------ .../db/tables/records/ActorInfoRecord.kt | 8 +- .../kotlin/db/tables/records/ActorRecord.kt | 8 +- .../kotlin/db/tables/records/AddressRecord.kt | 16 +- .../db/tables/records/CategoryRecord.kt | 6 +- .../kotlin/db/tables/records/CityRecord.kt | 8 +- .../kotlin/db/tables/records/CountryRecord.kt | 6 +- .../db/tables/records/CustomerListRecord.kt | 18 +- .../db/tables/records/CustomerRecord.kt | 20 +- .../db/tables/records/FilmActorRecord.kt | 6 +- .../db/tables/records/FilmCategoryRecord.kt | 6 +- .../db/tables/records/FilmInStockRecord.kt | 2 +- .../db/tables/records/FilmListRecord.kt | 16 +- .../db/tables/records/FilmNotInStockRecord.kt | 2 +- .../kotlin/db/tables/records/FilmRecord.kt | 28 +- .../db/tables/records/InventoryRecord.kt | 8 +- .../db/tables/records/LanguageRecord.kt | 6 +- .../records/NicerButSlowerFilmListRecord.kt | 16 +- .../tables/records/PaymentP2007_01Record.kt | 12 +- .../tables/records/PaymentP2007_02Record.kt | 12 +- .../tables/records/PaymentP2007_03Record.kt | 12 +- .../tables/records/PaymentP2007_04Record.kt | 12 +- .../tables/records/PaymentP2007_05Record.kt | 12 +- .../tables/records/PaymentP2007_06Record.kt | 12 +- .../kotlin/db/tables/records/PaymentRecord.kt | 12 +- .../kotlin/db/tables/records/RentalRecord.kt | 14 +- .../db/tables/records/RewardsReportRecord.kt | 20 +- .../records/SalesByFilmCategoryRecord.kt | 4 +- .../db/tables/records/SalesByStoreRecord.kt | 6 +- .../db/tables/records/StaffListRecord.kt | 16 +- .../kotlin/db/tables/records/StaffRecord.kt | 22 +- .../kotlin/db/tables/records/StoreRecord.kt | 8 +- .../org/jooq/demo/kotlin/Demo01Querying.kt | 25 +- .../demo/kotlin/Demo11QueryObjectModel.kt | 69 ++-- .../org/jooq/demo/kotlin/Demo13Reactive.kt | 159 ++++---- jOOQ-demo-oss/jOOQ-demo-scala/pom.xml | 2 +- .../jooq/demo/skala/db/DefaultCatalog.scala | 6 +- .../org/jooq/demo/skala/db/tables/Actor.scala | 71 ---- .../jooq/demo/skala/db/tables/ActorInfo.scala | 35 +- .../jooq/demo/skala/db/tables/Address.scala | 109 ----- .../jooq/demo/skala/db/tables/Category.scala | 71 ---- .../org/jooq/demo/skala/db/tables/City.scala | 59 --- .../jooq/demo/skala/db/tables/Country.scala | 46 --- .../jooq/demo/skala/db/tables/Customer.scala | 247 ------------ .../demo/skala/db/tables/CustomerList.scala | 37 +- .../org/jooq/demo/skala/db/tables/Film.scala | 171 -------- .../jooq/demo/skala/db/tables/FilmActor.scala | 45 --- .../demo/skala/db/tables/FilmCategory.scala | 45 --- .../demo/skala/db/tables/FilmInStock.scala | 18 - .../jooq/demo/skala/db/tables/FilmList.scala | 35 +- .../demo/skala/db/tables/FilmNotInStock.scala | 18 - .../jooq/demo/skala/db/tables/Inventory.scala | 72 ---- .../jooq/demo/skala/db/tables/Language.scala | 18 - .../db/tables/NicerButSlowerFilmList.scala | 35 +- .../jooq/demo/skala/db/tables/Payment.scala | 58 --- .../skala/db/tables/PaymentP2007_01.scala | 58 --- .../skala/db/tables/PaymentP2007_02.scala | 58 --- .../skala/db/tables/PaymentP2007_03.scala | 58 --- .../skala/db/tables/PaymentP2007_04.scala | 58 --- .../skala/db/tables/PaymentP2007_05.scala | 58 --- .../skala/db/tables/PaymentP2007_06.scala | 58 --- .../jooq/demo/skala/db/tables/Rental.scala | 235 ----------- .../demo/skala/db/tables/RewardsReport.scala | 18 - .../skala/db/tables/SalesByFilmCategory.scala | 31 +- .../demo/skala/db/tables/SalesByStore.scala | 34 +- .../org/jooq/demo/skala/db/tables/Staff.scala | 271 ------------- .../jooq/demo/skala/db/tables/StaffList.scala | 33 +- .../org/jooq/demo/skala/db/tables/Store.scala | 121 ------ .../org/jooq/demo/skala/Demo01Querying.scala | 102 ++--- .../demo/skala/Demo11QueryObjectModel.scala | 18 +- .../org/jooq/demo/skala/Demo13Reactive.scala | 81 ++-- jOOQ-demo-oss/jOOQ-demo-utils/pom.xml | 2 +- jOOQ-demo-oss/pom.xml | 7 +- jOOQ-demo-pro/jOOQ-demo-java/pom.xml | 2 +- .../org/jooq/demo/java/db/DefaultCatalog.java | 6 +- .../org/jooq/demo/java/db/tables/Actor.java | 102 ----- .../jooq/demo/java/db/tables/ActorInfo.java | 49 +-- .../org/jooq/demo/java/db/tables/Address.java | 150 ------- .../jooq/demo/java/db/tables/Category.java | 102 ----- .../org/jooq/demo/java/db/tables/City.java | 84 ---- .../org/jooq/demo/java/db/tables/Country.java | 67 ---- .../jooq/demo/java/db/tables/Customer.java | 344 ---------------- .../demo/java/db/tables/CustomerList.java | 51 +-- .../org/jooq/demo/java/db/tables/Film.java | 236 ----------- .../jooq/demo/java/db/tables/FilmActor.java | 66 --- .../demo/java/db/tables/FilmCategory.java | 66 --- .../jooq/demo/java/db/tables/FilmInStock.java | 32 -- .../jooq/demo/java/db/tables/FilmList.java | 48 +-- .../demo/java/db/tables/FilmNotInStock.java | 32 -- .../jooq/demo/java/db/tables/Inventory.java | 101 ----- .../jooq/demo/java/db/tables/Language.java | 31 -- .../db/tables/NicerButSlowerFilmList.java | 48 +-- .../org/jooq/demo/java/db/tables/Payment.java | 83 ---- .../demo/java/db/tables/PaymentP2007_01.java | 83 ---- .../demo/java/db/tables/PaymentP2007_02.java | 83 ---- .../demo/java/db/tables/PaymentP2007_03.java | 83 ---- .../demo/java/db/tables/PaymentP2007_04.java | 83 ---- .../demo/java/db/tables/PaymentP2007_05.java | 83 ---- .../demo/java/db/tables/PaymentP2007_06.java | 83 ---- .../org/jooq/demo/java/db/tables/Rental.java | 328 --------------- .../demo/java/db/tables/RewardsReport.java | 31 -- .../java/db/tables/SalesByFilmCategory.java | 44 +- .../demo/java/db/tables/SalesByStore.java | 47 +-- .../org/jooq/demo/java/db/tables/Staff.java | 376 ------------------ .../jooq/demo/java/db/tables/StaffList.java | 47 +-- .../org/jooq/demo/java/db/tables/Store.java | 166 -------- .../jooq/demo/java/db/tables/pojos/Actor.java | 6 +- .../demo/java/db/tables/pojos/ActorInfo.java | 2 +- .../demo/java/db/tables/pojos/Address.java | 14 +- .../demo/java/db/tables/pojos/Category.java | 4 +- .../jooq/demo/java/db/tables/pojos/City.java | 6 +- .../demo/java/db/tables/pojos/Country.java | 4 +- .../demo/java/db/tables/pojos/Customer.java | 18 +- .../java/db/tables/pojos/CustomerList.java | 4 +- .../jooq/demo/java/db/tables/pojos/Film.java | 26 +- .../demo/java/db/tables/pojos/FilmActor.java | 4 +- .../java/db/tables/pojos/FilmCategory.java | 4 +- .../demo/java/db/tables/pojos/FilmList.java | 12 +- .../demo/java/db/tables/pojos/Inventory.java | 6 +- .../demo/java/db/tables/pojos/Language.java | 4 +- .../tables/pojos/NicerButSlowerFilmList.java | 12 +- .../demo/java/db/tables/pojos/Payment.java | 10 +- .../java/db/tables/pojos/PaymentP2007_01.java | 10 +- .../java/db/tables/pojos/PaymentP2007_02.java | 10 +- .../java/db/tables/pojos/PaymentP2007_03.java | 10 +- .../java/db/tables/pojos/PaymentP2007_04.java | 10 +- .../java/db/tables/pojos/PaymentP2007_05.java | 10 +- .../java/db/tables/pojos/PaymentP2007_06.java | 10 +- .../demo/java/db/tables/pojos/Rental.java | 8 +- .../java/db/tables/pojos/RewardsReport.java | 18 +- .../db/tables/pojos/SalesByFilmCategory.java | 2 +- .../java/db/tables/pojos/SalesByStore.java | 4 +- .../jooq/demo/java/db/tables/pojos/Staff.java | 20 +- .../demo/java/db/tables/pojos/StaffList.java | 4 +- .../jooq/demo/java/db/tables/pojos/Store.java | 6 +- .../org/jooq/demo/java/Demo01Querying.java | 31 +- .../org/jooq/demo/java/Demo02DynamicSQL.java | 2 +- .../demo/java/Demo11QueryObjectModel.java | 83 ++-- .../org/jooq/demo/java/Demo13Reactive.java | 75 ++-- jOOQ-demo-pro/jOOQ-demo-kotlin/pom.xml | 4 +- .../org/jooq/demo/kotlin/db/DefaultCatalog.kt | 6 +- .../org/jooq/demo/kotlin/db/tables/Actor.kt | 76 ---- .../jooq/demo/kotlin/db/tables/ActorInfo.kt | 37 +- .../org/jooq/demo/kotlin/db/tables/Address.kt | 116 ------ .../jooq/demo/kotlin/db/tables/Category.kt | 76 ---- .../org/jooq/demo/kotlin/db/tables/City.kt | 64 --- .../org/jooq/demo/kotlin/db/tables/Country.kt | 48 --- .../jooq/demo/kotlin/db/tables/Customer.kt | 274 ------------- .../demo/kotlin/db/tables/CustomerList.kt | 39 +- .../org/jooq/demo/kotlin/db/tables/Film.kt | 187 --------- .../jooq/demo/kotlin/db/tables/FilmActor.kt | 52 --- .../demo/kotlin/db/tables/FilmCategory.kt | 52 --- .../jooq/demo/kotlin/db/tables/FilmInStock.kt | 20 - .../jooq/demo/kotlin/db/tables/FilmList.kt | 36 +- .../demo/kotlin/db/tables/FilmNotInStock.kt | 20 - .../jooq/demo/kotlin/db/tables/Inventory.kt | 80 ---- .../jooq/demo/kotlin/db/tables/Language.kt | 19 - .../db/tables/NicerButSlowerFilmList.kt | 36 +- .../org/jooq/demo/kotlin/db/tables/Payment.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_01.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_02.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_03.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_04.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_05.kt | 68 ---- .../demo/kotlin/db/tables/PaymentP2007_06.kt | 68 ---- .../org/jooq/demo/kotlin/db/tables/Rental.kt | 264 ------------ .../demo/kotlin/db/tables/RewardsReport.kt | 19 - .../kotlin/db/tables/SalesByFilmCategory.kt | 32 +- .../demo/kotlin/db/tables/SalesByStore.kt | 35 +- .../org/jooq/demo/kotlin/db/tables/Staff.kt | 299 -------------- .../jooq/demo/kotlin/db/tables/StaffList.kt | 35 +- .../org/jooq/demo/kotlin/db/tables/Store.kt | 131 ------ .../db/tables/records/ActorInfoRecord.kt | 8 +- .../kotlin/db/tables/records/ActorRecord.kt | 8 +- .../kotlin/db/tables/records/AddressRecord.kt | 16 +- .../db/tables/records/CategoryRecord.kt | 6 +- .../kotlin/db/tables/records/CityRecord.kt | 8 +- .../kotlin/db/tables/records/CountryRecord.kt | 6 +- .../db/tables/records/CustomerListRecord.kt | 18 +- .../db/tables/records/CustomerRecord.kt | 20 +- .../db/tables/records/FilmActorRecord.kt | 6 +- .../db/tables/records/FilmCategoryRecord.kt | 6 +- .../db/tables/records/FilmInStockRecord.kt | 2 +- .../db/tables/records/FilmListRecord.kt | 16 +- .../db/tables/records/FilmNotInStockRecord.kt | 2 +- .../kotlin/db/tables/records/FilmRecord.kt | 28 +- .../db/tables/records/InventoryRecord.kt | 8 +- .../db/tables/records/LanguageRecord.kt | 6 +- .../records/NicerButSlowerFilmListRecord.kt | 16 +- .../tables/records/PaymentP2007_01Record.kt | 12 +- .../tables/records/PaymentP2007_02Record.kt | 12 +- .../tables/records/PaymentP2007_03Record.kt | 12 +- .../tables/records/PaymentP2007_04Record.kt | 12 +- .../tables/records/PaymentP2007_05Record.kt | 12 +- .../tables/records/PaymentP2007_06Record.kt | 12 +- .../kotlin/db/tables/records/PaymentRecord.kt | 12 +- .../kotlin/db/tables/records/RentalRecord.kt | 14 +- .../db/tables/records/RewardsReportRecord.kt | 20 +- .../records/SalesByFilmCategoryRecord.kt | 4 +- .../db/tables/records/SalesByStoreRecord.kt | 6 +- .../db/tables/records/StaffListRecord.kt | 16 +- .../kotlin/db/tables/records/StaffRecord.kt | 22 +- .../kotlin/db/tables/records/StoreRecord.kt | 8 +- .../org/jooq/demo/kotlin/Demo01Querying.kt | 25 +- .../demo/kotlin/Demo11QueryObjectModel.kt | 69 ++-- .../org/jooq/demo/kotlin/Demo13Reactive.kt | 159 ++++---- jOOQ-demo-pro/jOOQ-demo-scala/pom.xml | 2 +- .../jooq/demo/skala/db/DefaultCatalog.scala | 6 +- .../org/jooq/demo/skala/db/tables/Actor.scala | 71 ---- .../jooq/demo/skala/db/tables/ActorInfo.scala | 35 +- .../jooq/demo/skala/db/tables/Address.scala | 109 ----- .../jooq/demo/skala/db/tables/Category.scala | 71 ---- .../org/jooq/demo/skala/db/tables/City.scala | 59 --- .../jooq/demo/skala/db/tables/Country.scala | 46 --- .../jooq/demo/skala/db/tables/Customer.scala | 247 ------------ .../demo/skala/db/tables/CustomerList.scala | 37 +- .../org/jooq/demo/skala/db/tables/Film.scala | 171 -------- .../jooq/demo/skala/db/tables/FilmActor.scala | 45 --- .../demo/skala/db/tables/FilmCategory.scala | 45 --- .../demo/skala/db/tables/FilmInStock.scala | 18 - .../jooq/demo/skala/db/tables/FilmList.scala | 35 +- .../demo/skala/db/tables/FilmNotInStock.scala | 18 - .../jooq/demo/skala/db/tables/Inventory.scala | 72 ---- .../jooq/demo/skala/db/tables/Language.scala | 18 - .../db/tables/NicerButSlowerFilmList.scala | 35 +- .../jooq/demo/skala/db/tables/Payment.scala | 58 --- .../skala/db/tables/PaymentP2007_01.scala | 58 --- .../skala/db/tables/PaymentP2007_02.scala | 58 --- .../skala/db/tables/PaymentP2007_03.scala | 58 --- .../skala/db/tables/PaymentP2007_04.scala | 58 --- .../skala/db/tables/PaymentP2007_05.scala | 58 --- .../skala/db/tables/PaymentP2007_06.scala | 58 --- .../jooq/demo/skala/db/tables/Rental.scala | 235 ----------- .../demo/skala/db/tables/RewardsReport.scala | 18 - .../skala/db/tables/SalesByFilmCategory.scala | 31 +- .../demo/skala/db/tables/SalesByStore.scala | 34 +- .../org/jooq/demo/skala/db/tables/Staff.scala | 271 ------------- .../jooq/demo/skala/db/tables/StaffList.scala | 33 +- .../org/jooq/demo/skala/db/tables/Store.scala | 121 ------ .../org/jooq/demo/skala/Demo01Querying.scala | 102 ++--- .../demo/skala/Demo11QueryObjectModel.scala | 90 +++-- .../org/jooq/demo/skala/Demo13Reactive.scala | 81 ++-- jOOQ-demo-pro/jOOQ-demo-utils/pom.xml | 2 +- jOOQ-demo-pro/pom.xml | 7 +- 342 files changed, 1328 insertions(+), 17330 deletions(-) diff --git a/jOOQ-demo-oss/jOOQ-demo-java/pom.xml b/jOOQ-demo-oss/jOOQ-demo-java/pom.xml index 5f316db..cec69c8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/pom.xml +++ b/jOOQ-demo-oss/jOOQ-demo-java/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-demo - 0.9.0 + 3.16.6 jooq-demo-java diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java index 10feac3..69df488 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java @@ -45,10 +45,10 @@ public final List getSchemas() { } /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference + * release, namely: 3.16. You can turn off the generation of this reference * by specifying /configuration/generator/generate/jooqVersionReference */ - private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17; + private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16; } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java index 3b988c8..16423a7 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java @@ -7,32 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.ActorRecord; -import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -132,72 +123,6 @@ public UniqueKey getPrimaryKey() { return Keys.ACTOR_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists() { - return filmActorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists(Function> subquery) { - return oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists() { - return filmExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists(Function> subquery) { - return manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset() { - return filmActorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset() { - return filmMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public Actor as(String alias) { return new Actor(DSL.name(alias), this); @@ -208,11 +133,6 @@ public Actor as(Name alias) { return new Actor(alias, this); } - @Override - public Actor as(Table alias) { - return new Actor(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -229,14 +149,6 @@ public Actor rename(Name name) { return new Actor(name, null); } - /** - * Rename this table - */ - @Override - public Actor rename(Table name) { - return new Actor(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -245,18 +157,4 @@ public Actor rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java index c2727b3..fe05c12 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -71,22 +66,7 @@ private ActorInfo(Name alias, Table aliased) { } private ActorInfo(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;")); } /** @@ -129,11 +109,6 @@ public ActorInfo as(Name alias) { return new ActorInfo(alias, this); } - @Override - public ActorInfo as(Table alias) { - return new ActorInfo(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -150,14 +125,6 @@ public ActorInfo rename(Name name) { return new ActorInfo(name, null); } - /** - * Rename this table - */ - @Override - public ActorInfo rename(Table name) { - return new ActorInfo(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -166,18 +133,4 @@ public ActorInfo rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java index 76872c1..fc7bb14 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java @@ -7,34 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.CityRecord; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -171,118 +160,6 @@ public City city() { return _city; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists() { - return customerExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists(Function> subquery) { - return oneToManyExists(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists() { - return staffExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists(Function> subquery) { - return oneToManyExists(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists() { - return storeExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists(Function> subquery) { - return oneToManyExists(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - public Field cityRow() { - return cityRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - public Field cityRow(Function> subquery) { - return toOneRow(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((City) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset() { - return customerMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset() { - return staffMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset() { - return storeMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Store) t)); - } - @Override public Address as(String alias) { return new Address(DSL.name(alias), this); @@ -293,11 +170,6 @@ public Address as(Name alias) { return new Address(alias, this); } - @Override - public Address as(Table alias) { - return new Address(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -314,14 +186,6 @@ public Address rename(Name name) { return new Address(name, null); } - /** - * Rename this table - */ - @Override - public Address rename(Table name) { - return new Address(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -330,18 +194,4 @@ public Address rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java index d0b25fc..8a2d01b 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java @@ -5,30 +5,21 @@ import java.time.LocalDateTime; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.CategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -118,72 +109,6 @@ public UniqueKey getPrimaryKey() { return Keys.CATEGORY_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists() { - return filmCategoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists(Function> subquery) { - return oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists() { - return filmExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists(Function> subquery) { - return manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset() { - return filmCategoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset() { - return filmMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public Category as(String alias) { return new Category(DSL.name(alias), this); @@ -194,11 +119,6 @@ public Category as(Name alias) { return new Category(alias, this); } - @Override - public Category as(Table alias) { - return new Category(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -215,14 +135,6 @@ public Category rename(Name name) { return new Category(name, null); } - /** - * Rename this table - */ - @Override - public Category rename(Table name) { - return new Category(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -231,18 +143,4 @@ public Category rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java index 7972aaa..5ae57f9 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java @@ -7,32 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; import org.jooq.demo.java.db.tables.records.CityRecord; -import org.jooq.demo.java.db.tables.records.CountryRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -149,54 +140,6 @@ public Country country() { return _country; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - public Condition addressExists() { - return addressExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - public Condition addressExists(Function> subquery) { - return oneToManyExists(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - public Field countryRow() { - return countryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - public Field countryRow(Function> subquery) { - return toOneRow(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((Country) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - public Field> addressMultiset() { - return addressMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - public Field> addressMultiset(Function> subquery) { - return oneToManyMultiset(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((Address) t)); - } - @Override public City as(String alias) { return new City(DSL.name(alias), this); @@ -207,11 +150,6 @@ public City as(Name alias) { return new City(alias, this); } - @Override - public City as(Table alias) { - return new City(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -228,14 +166,6 @@ public City rename(Name name) { return new City(name, null); } - /** - * Rename this table - */ - @Override - public City rename(Table name) { - return new City(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -244,18 +174,4 @@ public City rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java index bbbb693..37a1dc5 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java @@ -5,28 +5,20 @@ import java.time.LocalDateTime; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CityRecord; import org.jooq.demo.java.db.tables.records.CountryRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; @@ -117,38 +109,6 @@ public UniqueKey getPrimaryKey() { return Keys.COUNTRY_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - public Condition cityExists() { - return cityExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - public Condition cityExists(Function> subquery) { - return oneToManyExists(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((City) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - public Field> cityMultiset() { - return cityMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - public Field> cityMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((City) t)); - } - @Override public Country as(String alias) { return new Country(DSL.name(alias), this); @@ -159,11 +119,6 @@ public Country as(Name alias) { return new Country(alias, this); } - @Override - public Country as(Table alias) { - return new Country(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -180,14 +135,6 @@ public Country rename(Name name) { return new Country(name, null); } - /** - * Rename this table - */ - @Override - public Country rename(Table name) { - return new Country(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -196,18 +143,4 @@ public Country rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java index 9a524fc..1c1a181 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java @@ -8,40 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function10; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row10; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -199,306 +182,6 @@ public Address address() { return _address; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Customer as(String alias) { return new Customer(DSL.name(alias), this); @@ -509,11 +192,6 @@ public Customer as(Name alias) { return new Customer(alias, this); } - @Override - public Customer as(Table alias) { - return new Customer(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -530,14 +208,6 @@ public Customer rename(Name name) { return new Customer(name, null); } - /** - * Rename this table - */ - @Override - public Customer rename(Table name) { - return new Customer(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -546,18 +216,4 @@ public Customer rename(Table name) { public Row10 fieldsRow() { return (Row10) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function10 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function10 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java index 7ded9ed..e78bf0e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function9; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row9; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,24 +91,7 @@ private CustomerList(Name alias, Table aliased) { } private CustomerList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));")); } /** @@ -156,11 +134,6 @@ public CustomerList as(Name alias) { return new CustomerList(alias, this); } - @Override - public CustomerList as(Table alias) { - return new CustomerList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -177,14 +150,6 @@ public CustomerList rename(Name name) { return new CustomerList(name, null); } - /** - * Rename this table - */ - @Override - public CustomerList rename(Table name) { - return new CustomerList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- @@ -193,18 +158,4 @@ public CustomerList rename(Table name) { public Row9 fieldsRow() { return (Row9) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function9 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function9 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java index 9c67c30..c5d433f 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java @@ -8,37 +8,24 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function14; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row14; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.enums.MpaaRating; -import org.jooq.demo.java.db.tables.records.ActorRecord; -import org.jooq.demo.java.db.tables.records.CategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; import org.jooq.demo.java.db.tables.records.FilmRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.LanguageRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -224,202 +211,6 @@ public Language filmOriginalLanguageIdFkey() { return _filmOriginalLanguageIdFkey; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists() { - return filmActorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists(Function> subquery) { - return oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists() { - return filmCategoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists(Function> subquery) { - return oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists() { - return inventoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists(Function> subquery) { - return oneToManyExists(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - public Condition actorExists() { - return actorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - public Condition actorExists(Function> subquery) { - return manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - public Condition categoryExists() { - return categoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - public Condition categoryExists(Function> subquery) { - return manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmLanguageIdFkeyRow() { - return filmLanguageIdFkeyRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmLanguageIdFkeyRow(Function> subquery) { - return toOneRow(Keys.FILM__FILM_LANGUAGE_ID_FKEY, t -> subquery.apply((Language) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmOriginalLanguageIdFkeyRow() { - return filmOriginalLanguageIdFkeyRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmOriginalLanguageIdFkeyRow(Function> subquery) { - return toOneRow(Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, t -> subquery.apply((Language) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset() { - return filmActorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset() { - return filmCategoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset() { - return inventoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - public Field> actorMultiset() { - return actorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - public Field> actorMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - public Field> categoryMultiset() { - return categoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - public Field> categoryMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - @Override public Film as(String alias) { return new Film(DSL.name(alias), this); @@ -430,11 +221,6 @@ public Film as(Name alias) { return new Film(alias, this); } - @Override - public Film as(Table alias) { - return new Film(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -451,14 +237,6 @@ public Film rename(Name name) { return new Film(name, null); } - /** - * Rename this table - */ - @Override - public Film rename(Table name) { - return new Film(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- @@ -467,18 +245,4 @@ public Film rename(Table name) { public Row14 fieldsRow() { return (Row14) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function14 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function14 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java index 9686a2b..b9e8b79 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java @@ -7,29 +7,22 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.ActorRecord; import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -147,38 +140,6 @@ public Film film() { return _film; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field actorRow() { - return actorRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field actorRow(Function> subquery) { - return toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public FilmActor as(String alias) { return new FilmActor(DSL.name(alias), this); @@ -189,11 +150,6 @@ public FilmActor as(Name alias) { return new FilmActor(alias, this); } - @Override - public FilmActor as(Table alias) { - return new FilmActor(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -210,14 +166,6 @@ public FilmActor rename(Name name) { return new FilmActor(name, null); } - /** - * Rename this table - */ - @Override - public FilmActor rename(Table name) { - return new FilmActor(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -226,18 +174,4 @@ public FilmActor rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java index 97e58ea..268cb45 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java @@ -7,27 +7,20 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CategoryRecord; import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -140,38 +133,6 @@ public Category category() { return _category; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field categoryRow() { - return categoryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field categoryRow(Function> subquery) { - return toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - @Override public FilmCategory as(String alias) { return new FilmCategory(DSL.name(alias), this); @@ -182,11 +143,6 @@ public FilmCategory as(Name alias) { return new FilmCategory(alias, this); } - @Override - public FilmCategory as(Table alias) { - return new FilmCategory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -203,14 +159,6 @@ public FilmCategory rename(Name name) { return new FilmCategory(name, null); } - /** - * Rename this table - */ - @Override - public FilmCategory rename(Table name) { - return new FilmCategory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -219,18 +167,4 @@ public FilmCategory rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java index 7fa9654..8c1d6d8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java @@ -4,15 +4,10 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row1; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,11 +91,6 @@ public FilmInStock as(Name alias) { return new FilmInStock(alias, this, parameters); } - @Override - public FilmInStock as(Table alias) { - return new FilmInStock(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -117,14 +107,6 @@ public FilmInStock rename(Name name) { return new FilmInStock(name, null, parameters); } - /** - * Rename this table - */ - @Override - public FilmInStock rename(Table name) { - return new FilmInStock(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -163,18 +145,4 @@ public FilmInStock call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function1 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function1 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java index 3ee9fad..0c6a49c 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -93,22 +89,7 @@ private FilmList(Name alias, Table aliased) { } private FilmList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;")); } /** @@ -151,11 +132,6 @@ public FilmList as(Name alias) { return new FilmList(alias, this); } - @Override - public FilmList as(Table alias) { - return new FilmList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -172,14 +148,6 @@ public FilmList rename(Name name) { return new FilmList(name, null); } - /** - * Rename this table - */ - @Override - public FilmList rename(Table name) { - return new FilmList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -188,18 +156,4 @@ public FilmList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java index e0d2437..5da3ab0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java @@ -4,15 +4,10 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row1; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,11 +91,6 @@ public FilmNotInStock as(Name alias) { return new FilmNotInStock(alias, this, parameters); } - @Override - public FilmNotInStock as(Table alias) { - return new FilmNotInStock(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -117,14 +107,6 @@ public FilmNotInStock rename(Name name) { return new FilmNotInStock(name, null, parameters); } - /** - * Rename this table - */ - @Override - public FilmNotInStock rename(Table name) { - return new FilmNotInStock(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -163,18 +145,4 @@ public FilmNotInStock call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function1 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function1 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java index f82eb1c..fa2bd94 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java @@ -7,33 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -161,70 +151,6 @@ public Store store() { return _store; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Inventory as(String alias) { return new Inventory(DSL.name(alias), this); @@ -235,11 +161,6 @@ public Inventory as(Name alias) { return new Inventory(alias, this); } - @Override - public Inventory as(Table alias) { - return new Inventory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -256,14 +177,6 @@ public Inventory rename(Name name) { return new Inventory(name, null); } - /** - * Rename this table - */ - @Override - public Inventory rename(Table name) { - return new Inventory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -272,18 +185,4 @@ public Inventory rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java index 421baec..bb01e45 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java @@ -5,18 +5,14 @@ import java.time.LocalDateTime; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -123,11 +119,6 @@ public Language as(Name alias) { return new Language(alias, this); } - @Override - public Language as(Table alias) { - return new Language(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -144,14 +135,6 @@ public Language rename(Name name) { return new Language(name, null); } - /** - * Rename this table - */ - @Override - public Language rename(Table name) { - return new Language(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -160,18 +143,4 @@ public Language rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java index 8b3dd86..7f7ae0e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -93,22 +89,7 @@ private NicerButSlowerFilmList(Name alias, Table a } private NicerButSlowerFilmList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;")); } /** @@ -153,11 +134,6 @@ public NicerButSlowerFilmList as(Name alias) { return new NicerButSlowerFilmList(alias, this); } - @Override - public NicerButSlowerFilmList as(Table alias) { - return new NicerButSlowerFilmList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -174,14 +150,6 @@ public NicerButSlowerFilmList rename(Name name) { return new NicerButSlowerFilmList(name, null); } - /** - * Rename this table - */ - @Override - public NicerButSlowerFilmList rename(Table name) { - return new NicerButSlowerFilmList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -190,18 +158,4 @@ public NicerButSlowerFilmList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java index de30a5b..ff32b5b 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -181,54 +173,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Payment as(String alias) { return new Payment(DSL.name(alias), this); @@ -239,11 +183,6 @@ public Payment as(Name alias) { return new Payment(alias, this); } - @Override - public Payment as(Table alias) { - return new Payment(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -260,14 +199,6 @@ public Payment rename(Name name) { return new Payment(name, null); } - /** - * Rename this table - */ - @Override - public Payment rename(Table name) { - return new Payment(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -276,18 +207,4 @@ public Payment rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java index 2f70f25..ea1091f 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_01 as(Name alias) { return new PaymentP2007_01(alias, this); } - @Override - public PaymentP2007_01 as(Table alias) { - return new PaymentP2007_01(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_01 rename(Name name) { return new PaymentP2007_01(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_01 rename(Table name) { - return new PaymentP2007_01(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_01 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java index a7819e2..7eb4846 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_02 as(Name alias) { return new PaymentP2007_02(alias, this); } - @Override - public PaymentP2007_02 as(Table alias) { - return new PaymentP2007_02(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_02 rename(Name name) { return new PaymentP2007_02(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_02 rename(Table name) { - return new PaymentP2007_02(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_02 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java index 5e7e72f..3ab5cef 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_03 as(Name alias) { return new PaymentP2007_03(alias, this); } - @Override - public PaymentP2007_03 as(Table alias) { - return new PaymentP2007_03(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_03 rename(Name name) { return new PaymentP2007_03(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_03 rename(Table name) { - return new PaymentP2007_03(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_03 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java index 311ef5b..32d8402 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_04 as(Name alias) { return new PaymentP2007_04(alias, this); } - @Override - public PaymentP2007_04 as(Table alias) { - return new PaymentP2007_04(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_04 rename(Name name) { return new PaymentP2007_04(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_04 rename(Table name) { - return new PaymentP2007_04(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_04 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java index 8883072..658f780 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_05 as(Name alias) { return new PaymentP2007_05(alias, this); } - @Override - public PaymentP2007_05 as(Table alias) { - return new PaymentP2007_05(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_05 rename(Name name) { return new PaymentP2007_05(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_05 rename(Table name) { - return new PaymentP2007_05(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_05 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java index 3e66b97..375057a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_06 as(Name alias) { return new PaymentP2007_06(alias, this); } - @Override - public PaymentP2007_06 as(Table alias) { - return new PaymentP2007_06(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_06 rename(Name name) { return new PaymentP2007_06(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_06 rename(Table name) { - return new PaymentP2007_06(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_06 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java index f8964dc..1203160 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java @@ -7,40 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function7; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row7; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -194,290 +177,6 @@ public Staff staff() { return _staff; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field inventoryRow() { - return inventoryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field inventoryRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - @Override public Rental as(String alias) { return new Rental(DSL.name(alias), this); @@ -488,11 +187,6 @@ public Rental as(Name alias) { return new Rental(alias, this); } - @Override - public Rental as(Table alias) { - return new Rental(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -509,14 +203,6 @@ public Rental rename(Name name) { return new Rental(name, null); } - /** - * Rename this table - */ - @Override - public Rental rename(Table name) { - return new Rental(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- @@ -525,18 +211,4 @@ public Rental rename(Table name) { public Row7 fieldsRow() { return (Row7) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function7 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function7 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java index 6e184f5..21191b4 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java @@ -7,16 +7,12 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.function.Function; import org.jooq.Field; -import org.jooq.Function10; import org.jooq.Identity; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row10; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -150,11 +146,6 @@ public RewardsReport as(Name alias) { return new RewardsReport(alias, this, parameters); } - @Override - public RewardsReport as(Table alias) { - return new RewardsReport(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -171,14 +162,6 @@ public RewardsReport rename(Name name) { return new RewardsReport(name, null, parameters); } - /** - * Rename this table - */ - @Override - public RewardsReport rename(Table name) { - return new RewardsReport(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -217,18 +200,4 @@ public RewardsReport call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function10 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function10 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java index f7a73f2..b397cea 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function2; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row2; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -62,18 +58,7 @@ private SalesByFilmCategory(Name alias, Table aliased } private SalesByFilmCategory(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;")); } /** @@ -118,11 +103,6 @@ public SalesByFilmCategory as(Name alias) { return new SalesByFilmCategory(alias, this); } - @Override - public SalesByFilmCategory as(Table alias) { - return new SalesByFilmCategory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -139,14 +119,6 @@ public SalesByFilmCategory rename(Name name) { return new SalesByFilmCategory(name, null); } - /** - * Rename this table - */ - @Override - public SalesByFilmCategory rename(Table name) { - return new SalesByFilmCategory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- @@ -155,18 +127,4 @@ public SalesByFilmCategory rename(Table name) { public Row2 fieldsRow() { return (Row2) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function2 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function2 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java index 3593130..9102533 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -67,21 +63,7 @@ private SalesByStore(Name alias, Table aliased) { } private SalesByStore(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;")); } /** @@ -124,11 +106,6 @@ public SalesByStore as(Name alias) { return new SalesByStore(alias, this); } - @Override - public SalesByStore as(Table alias) { - return new SalesByStore(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -145,14 +122,6 @@ public SalesByStore rename(Name name) { return new SalesByStore(name, null); } - /** - * Rename this table - */ - @Override - public SalesByStore rename(Table name) { - return new SalesByStore(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -161,18 +130,4 @@ public SalesByStore rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java index 19e363d..34d48da 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java @@ -7,38 +7,21 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function11; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row11; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; import org.jooq.demo.java.db.tables.records.StaffRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -196,338 +179,6 @@ public Store store() { return _store; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists() { - return storeExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists(Function> subquery) { - return oneToManyExists(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset() { - return storeMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Store) t)); - } - @Override public Staff as(String alias) { return new Staff(DSL.name(alias), this); @@ -538,11 +189,6 @@ public Staff as(Name alias) { return new Staff(alias, this); } - @Override - public Staff as(Table alias) { - return new Staff(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -559,14 +205,6 @@ public Staff rename(Name name) { return new Staff(name, null); } - /** - * Rename this table - */ - @Override - public Staff rename(Table name) { - return new Staff(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- @@ -575,18 +213,4 @@ public Staff rename(Table name) { public Row11 fieldsRow() { return (Row11) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function11 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function11 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java index 9e10fde..17af429 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -91,20 +86,7 @@ private StaffList(Name alias, Table aliased) { } private StaffList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));")); } /** @@ -147,11 +129,6 @@ public StaffList as(Name alias) { return new StaffList(alias, this); } - @Override - public StaffList as(Table alias) { - return new StaffList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -168,14 +145,6 @@ public StaffList rename(Name name) { return new StaffList(name, null); } - /** - * Rename this table - */ - @Override - public StaffList rename(Table name) { - return new StaffList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -184,18 +153,4 @@ public StaffList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java index 0e776e6..85a37ad 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java @@ -7,33 +7,22 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; @@ -162,134 +151,6 @@ public Address address() { return _address; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists() { - return customerExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists(Function> subquery) { - return oneToManyExists(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists() { - return inventoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists(Function> subquery) { - return oneToManyExists(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists() { - return staffExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists(Function> subquery) { - return oneToManyExists(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset() { - return customerMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset() { - return inventoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset() { - return staffMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Staff) t)); - } - @Override public Store as(String alias) { return new Store(DSL.name(alias), this); @@ -300,11 +161,6 @@ public Store as(Name alias) { return new Store(alias, this); } - @Override - public Store as(Table alias) { - return new Store(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -321,14 +177,6 @@ public Store rename(Name name) { return new Store(name, null); } - /** - * Rename this table - */ - @Override - public Store rename(Table name) { - return new Store(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -337,18 +185,4 @@ public Store rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java index 71f5ab2..b3a3d46 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Actor( - Long actorId, - String firstName, - String lastName, + Long actorId, + String firstName, + String lastName, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java index e476bf5..1440762 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java @@ -12,7 +12,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record ActorInfo( - Long actorId, + Long actorId, String firstName, String lastName, String filmInfo diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java index 4cd5ee3..5056e3e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java @@ -13,13 +13,13 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Address( - Long addressId, - String address, - String address2, - String district, - Long cityId, - String postalCode, - String phone, + Long addressId, + String address, + String address2, + String district, + Long cityId, + String postalCode, + String phone, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java index 03e9fb7..49ed198 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Category( - Long categoryId, - String name, + Long categoryId, + String name, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java index afe3f14..091c476 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record City( - Long cityId, - String city, - Long countryId, + Long cityId, + String city, + Long countryId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java index 2cb1df2..7d3cc52 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Country( - Long countryId, - String country, + Long countryId, + String country, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java index 567642e..2b23d00 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java @@ -14,16 +14,16 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Customer( - Long customerId, - Long storeId, - String firstName, - String lastName, - String email, - Long addressId, - Boolean activebool, - LocalDate createDate, + Long customerId, + Long storeId, + String firstName, + String lastName, + String email, + Long addressId, + Boolean activebool, + LocalDate createDate, LocalDateTime lastUpdate, - Integer active + Integer active ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java index 69cea41..58eea63 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java @@ -12,7 +12,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record CustomerList( - Long id, + Long id, String name, String address, String zipCode, @@ -20,7 +20,7 @@ public record CustomerList( String city, String country, String notes, - Long sid + Long sid ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java index 227e651..2ff44c6 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java @@ -16,20 +16,20 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Film( - Long filmId, - String title, - String description, - Integer releaseYear, - Long languageId, - Long originalLanguageId, - Short rentalDuration, - BigDecimal rentalRate, - Short length, - BigDecimal replacementCost, - MpaaRating rating, + Long filmId, + String title, + String description, + Integer releaseYear, + Long languageId, + Long originalLanguageId, + Short rentalDuration, + BigDecimal rentalRate, + Short length, + BigDecimal replacementCost, + MpaaRating rating, LocalDateTime lastUpdate, - String[] specialFeatures, - Object fulltext + String[] specialFeatures, + Object fulltext ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java index 27d5d80..858eabf 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmActor( - Long actorId, - Long filmId, + Long actorId, + Long filmId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java index 71eb7eb..0825708 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmCategory( - Long filmId, - Long categoryId, + Long filmId, + Long categoryId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java index 11ba5c5..7addd51 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java @@ -15,14 +15,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmList( - Long fid, - String title, - String description, - String category, + Long fid, + String title, + String description, + String category, BigDecimal price, - Short length, + Short length, MpaaRating rating, - String actors + String actors ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java index 80c696d..25da4e1 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Inventory( - Long inventoryId, - Long filmId, - Long storeId, + Long inventoryId, + Long filmId, + Long storeId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java index ebe7ac6..e2daebf 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Language( - Long languageId, - String name, + Long languageId, + String name, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java index 73ef9f1..f51e5bd 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java @@ -15,14 +15,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record NicerButSlowerFilmList( - Long fid, - String title, - String description, - String category, + Long fid, + String title, + String description, + String category, BigDecimal price, - Short length, + Short length, MpaaRating rating, - String actors + String actors ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java index 2f58a2e..2bb623c 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Payment( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java index 6a45a8f..3d38f78 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_01( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java index af8de52..285392d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_02( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java index 65538ac..4bbae01 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_03( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java index 93d510d..181ac77 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_04( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java index 10c6e40..dd2d085 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_05( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java index 4879ce8..75fa7d3 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_06( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java index 22c51fc..5baea9e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java @@ -13,12 +13,12 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Rental( - Long rentalId, + Long rentalId, LocalDateTime rentalDate, - Long inventoryId, - Long customerId, + Long inventoryId, + Long customerId, LocalDateTime returnDate, - Long staffId, + Long staffId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java index bb6956f..4839750 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java @@ -14,16 +14,16 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record RewardsReport( - Long customerId, - Long storeId, - String firstName, - String lastName, - String email, - Long addressId, - Boolean activebool, - LocalDate createDate, + Long customerId, + Long storeId, + String firstName, + String lastName, + String email, + Long addressId, + Boolean activebool, + LocalDate createDate, LocalDateTime lastUpdate, - Integer active + Integer active ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java index a34b6a0..01a2b94 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java @@ -13,7 +13,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record SalesByFilmCategory( - String category, + String category, BigDecimal totalSales ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java index 925b29b..187b4a7 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record SalesByStore( - String store, - String manager, + String store, + String manager, BigDecimal totalSales ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java index be1ded6..b944d97 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java @@ -13,17 +13,17 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Staff( - Long staffId, - String firstName, - String lastName, - Long addressId, - String email, - Long storeId, - Boolean active, - String username, - String password, + Long staffId, + String firstName, + String lastName, + Long addressId, + String email, + Long storeId, + Boolean active, + String username, + String password, LocalDateTime lastUpdate, - byte[] picture + byte[] picture ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java index 6c32e23..54accf3 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java @@ -12,14 +12,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record StaffList( - Long id, + Long id, String name, String address, String zipCode, String phone, String city, String country, - Long sid + Long sid ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java index e364c57..37143f7 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Store( - Long storeId, - Long managerStaffId, - Long addressId, + Long storeId, + Long managerStaffId, + Long addressId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java index edc4b91..3045c92 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java @@ -197,21 +197,22 @@ public void implicitJoins() { .fetch(); } - @Test - public void nestedRecords() { - title("Need all columns of those active records?"); - - var r = - ctx.select(CUSTOMER, CUSTOMER.address().city().country()) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle(); - - println("Customer %s %s from %s".formatted(r.value1().getFirstName(), r.value1().getLastName(), r.value2().getCountry())); - - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// public void nestedRecords() { +// title("Need all columns of those active records?"); +// +// var r = +// ctx.select(CUSTOMER, CUSTOMER.address().city().country()) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle(); +// +// println("Customer %s %s from %s".formatted(r.value1().getFirstName(), r.value1().getLastName(), r.value2().getCountry())); +// +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test public void nestedRowValuesWithAdHocConverters() { diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java index a5fe143..58b4cb1 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java @@ -29,7 +29,7 @@ public void testDynamicSQL() { Table from = ACTOR; Condition where = ACTOR.ACTOR_ID.in(1L, 2L, 3L); List> orderBy = List.of(ACTOR.FIRST_NAME); - Field limit = val(5); + Param limit = val(5); ctx.select(select) .from(from) diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java index 9eaebb3..e496bbd 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java @@ -35,14 +35,15 @@ public void qom() { println("FROM : " + select.$from()); println("WHERE : " + select.$where()); - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):"); - println( - select.$select(Stream.concat(Stream.of(ACTOR.ACTOR_ID), select.$select().stream()).toList()) - .$orderBy(List.of(ACTOR.ACTOR_ID.asc())) - ); - - title("The old query is untouched:"); - println(select); + /* Available in jOOQ 3.17 only */ +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):"); +// println( +// select.$select(Stream.concat(Stream.of(ACTOR.ACTOR_ID), select.$select().stream()).toList()) +// .$orderBy(List.of(ACTOR.ACTOR_ID.asc())) +// ); +// +// title("The old query is untouched:"); +// println(select); } @Test @@ -106,6 +107,7 @@ public void replacement() { + } @@ -130,6 +132,7 @@ public void replacement() { + } diff --git a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java index 1bfbe27..a7ab54d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java +++ b/jOOQ-demo-oss/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java @@ -28,43 +28,44 @@ record Actor(String firstName, String lastName) {} .forEach(System.out::println); } - @Test - public void reactiveTransactions() { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher(c -> Flux - .from(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl() - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log() - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")))) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList() - .doOnError(Throwable::printStackTrace) - .onErrorReturn(List.of()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx.select(ACTOR.ACTOR_ID).from(ACTOR).where(ACTOR.ACTOR_ID.eq(201L))) - .collectList() - .block() - .forEach(System.out::println); - } + // Available in jOOQ 3.17 only +// @Test +// public void reactiveTransactions() { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher(c -> Flux +// .from(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl() +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log() +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")))) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList() +// .doOnError(Throwable::printStackTrace) +// .onErrorReturn(List.of()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx.select(ACTOR.ACTOR_ID).from(ACTOR).where(ACTOR.ACTOR_ID.eq(201L))) +// .collectList() +// .block() +// .forEach(System.out::println); +// } @After public void teardown() throws SQLException { diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/pom.xml b/jOOQ-demo-oss/jOOQ-demo-kotlin/pom.xml index 568cdc8..ed7bb8d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/pom.xml +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-demo - 0.9.0 + 3.16.6 jooq-demo-kotlin @@ -33,10 +33,12 @@ org.jooq jooq-kotlin + org.jetbrains.kotlin kotlin-stdlib-jdk8 diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt index 67b01cd..d0abddd 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt @@ -34,10 +34,10 @@ open class DefaultCatalog : CatalogImpl("") { ) /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference + * release, namely: 3.16. You can turn off the generation of this reference * by specifying /configuration/generator/generate/jooqVersionReference */ - private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17 + private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16 } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt index c1b652e..8b0263b 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt @@ -5,35 +5,25 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_ACTOR_LAST_NAME import org.jooq.demo.kotlin.db.keys.ACTOR_PKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.ActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -116,59 +106,8 @@ open class Actor( override fun getIndexes(): List = listOf(IDX_ACTOR_LAST_NAME) override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = ACTOR_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(): Condition = filmActorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(subquery: (FilmActor) -> TableLike): Condition = oneToManyExists(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(): Condition = filmExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(subquery: (Film) -> TableLike): Condition = manyToManyExists(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(): Field> = filmActorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(subquery: (FilmActor) -> TableLike): Field> = oneToManyMultiset(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(): Field> = filmMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(subquery: (Film) -> TableLike): Field> = manyToManyMultiset(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): Actor = Actor(DSL.name(alias), this) override fun `as`(alias: Name): Actor = Actor(alias, this) - override fun `as`(alias: Table<*>): Actor = Actor(alias.getQualifiedName(), this) /** * Rename this table @@ -180,23 +119,8 @@ open class Actor( */ override fun rename(name: Name): Actor = Actor(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Actor = Actor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt index c8d4116..83d368d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,22 +39,7 @@ open class ActorInfo( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """) + TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;") ) { companion object { @@ -115,7 +96,6 @@ open class ActorInfo( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): ActorInfo = ActorInfo(DSL.name(alias), this) override fun `as`(alias: Name): ActorInfo = ActorInfo(alias, this) - override fun `as`(alias: Table<*>): ActorInfo = ActorInfo(alias.getQualifiedName(), this) /** * Rename this table @@ -127,23 +107,8 @@ open class ActorInfo( */ override fun rename(name: Name): ActorInfo = ActorInfo(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): ActorInfo = ActorInfo(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt index 122a7b2..b9867fa 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt @@ -5,39 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_CITY_ID import org.jooq.demo.kotlin.db.keys.ADDRESS_PKEY import org.jooq.demo.kotlin.db.keys.ADDRESS__ADDRESS_CITY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_ADDRESS_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STORE__STORE_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.CityRecord -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -153,96 +140,8 @@ open class Address( return _city; } - - val city: City - get(): City = city() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(): Condition = customerExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(subquery: (Customer) -> TableLike): Condition = oneToManyExists(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(): Condition = staffExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(subquery: (Staff) -> TableLike): Condition = oneToManyExists(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(): Condition = storeExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(subquery: (Store) -> TableLike): Condition = oneToManyExists(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - fun cityRow(): Field = cityRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - fun cityRow(subquery: (City) -> TableLike): Field = toOneRow(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as City) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(): Field> = customerMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(subquery: (Customer) -> TableLike): Field> = oneToManyMultiset(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(): Field> = staffMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(subquery: (Staff) -> TableLike): Field> = oneToManyMultiset(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(): Field> = storeMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(subquery: (Store) -> TableLike): Field> = oneToManyMultiset(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Store) }) override fun `as`(alias: String): Address = Address(DSL.name(alias), this) override fun `as`(alias: Name): Address = Address(alias, this) - override fun `as`(alias: Table<*>): Address = Address(alias.getQualifiedName(), this) /** * Rename this table @@ -254,23 +153,8 @@ open class Address( */ override fun rename(name: Name): Address = Address(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Address = Address(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt index dfeda4d..11949a0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt @@ -5,31 +5,21 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.keys.CATEGORY_PKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.CategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -106,59 +96,8 @@ open class Category( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = CATEGORY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(): Condition = filmCategoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(subquery: (FilmCategory) -> TableLike): Condition = oneToManyExists(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(): Condition = filmExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(subquery: (Film) -> TableLike): Condition = manyToManyExists(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(): Field> = filmCategoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(subquery: (FilmCategory) -> TableLike): Field> = oneToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(): Field> = filmMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(subquery: (Film) -> TableLike): Field> = manyToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): Category = Category(DSL.name(alias), this) override fun `as`(alias: Name): Category = Category(alias, this) - override fun `as`(alias: Table<*>): Category = Category(alias.getQualifiedName(), this) /** * Rename this table @@ -170,23 +109,8 @@ open class Category( */ override fun rename(name: Name): Category = Category(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Category = Category(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt index e625610..4713241 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt @@ -5,35 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_COUNTRY_ID -import org.jooq.demo.kotlin.db.keys.ADDRESS__ADDRESS_CITY_ID_FKEY import org.jooq.demo.kotlin.db.keys.CITY_PKEY import org.jooq.demo.kotlin.db.keys.CITY__CITY_COUNTRY_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord import org.jooq.demo.kotlin.db.tables.records.CityRecord -import org.jooq.demo.kotlin.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -129,48 +120,8 @@ open class City( return _country; } - - val country: Country - get(): Country = country() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - fun addressExists(): Condition = addressExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - fun addressExists(subquery: (Address) -> TableLike): Condition = oneToManyExists(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - fun countryRow(): Field = countryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - fun countryRow(subquery: (Country) -> TableLike): Field = toOneRow(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as Country) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - fun addressMultiset(): Field> = addressMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - fun addressMultiset(subquery: (Address) -> TableLike): Field> = oneToManyMultiset(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as Address) }) override fun `as`(alias: String): City = City(DSL.name(alias), this) override fun `as`(alias: Name): City = City(alias, this) - override fun `as`(alias: Table<*>): City = City(alias.getQualifiedName(), this) /** * Rename this table @@ -182,23 +133,8 @@ open class City( */ override fun rename(name: Name): City = City(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): City = City(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt index 53c2e04..7b6d1e8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt @@ -5,28 +5,20 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public -import org.jooq.demo.kotlin.db.keys.CITY__CITY_COUNTRY_ID_FKEY import org.jooq.demo.kotlin.db.keys.COUNTRY_PKEY -import org.jooq.demo.kotlin.db.tables.records.CityRecord import org.jooq.demo.kotlin.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -104,33 +96,8 @@ open class Country( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = COUNTRY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - fun cityExists(): Condition = cityExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - fun cityExists(subquery: (City) -> TableLike): Condition = oneToManyExists(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as City) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - fun cityMultiset(): Field> = cityMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - fun cityMultiset(subquery: (City) -> TableLike): Field> = oneToManyMultiset(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as City) }) override fun `as`(alias: String): Country = Country(DSL.name(alias), this) override fun `as`(alias: Name): Country = Country(alias, this) - override fun `as`(alias: Table<*>): Country = Country(alias.getQualifiedName(), this) /** * Rename this table @@ -142,23 +109,8 @@ open class Country( */ override fun rename(name: Name): Country = Country(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Country = Country(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt index 3722297..9ddb4aa 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt @@ -6,25 +6,19 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -34,25 +28,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_LAST_NAME import org.jooq.demo.kotlin.db.keys.CUSTOMER_PKEY import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -180,9 +156,6 @@ open class Customer( return _store; } - val store: Store - get(): Store = store() - /** * Get the implicit join path to the public.address table. */ @@ -192,240 +165,8 @@ open class Customer( return _address; } - - val address: Address - get(): Address = address() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Customer = Customer(DSL.name(alias), this) override fun `as`(alias: Name): Customer = Customer(alias, this) - override fun `as`(alias: Table<*>): Customer = Customer(alias.getQualifiedName(), this) /** * Rename this table @@ -437,23 +178,8 @@ open class Customer( */ override fun rename(name: Name): Customer = Customer(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Customer = Customer(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row10 = super.fieldsRow() as Row10 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt index 9c45053..0300342 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row9 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,24 +39,7 @@ open class CustomerList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { companion object { @@ -142,7 +121,6 @@ open class CustomerList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): CustomerList = CustomerList(DSL.name(alias), this) override fun `as`(alias: Name): CustomerList = CustomerList(alias, this) - override fun `as`(alias: Table<*>): CustomerList = CustomerList(alias.getQualifiedName(), this) /** * Rename this table @@ -154,23 +132,8 @@ open class CustomerList( */ override fun rename(name: Name): CustomerList = CustomerList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): CustomerList = CustomerList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row9 = super.fieldsRow() as Row9 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt index 19832f2..f64f351 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt @@ -6,25 +6,19 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row14 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -33,21 +27,10 @@ import org.jooq.demo.kotlin.db.indexes.FILM_FULLTEXT_IDX import org.jooq.demo.kotlin.db.indexes.IDX_FK_LANGUAGE_ID import org.jooq.demo.kotlin.db.indexes.IDX_FK_ORIGINAL_LANGUAGE_ID import org.jooq.demo.kotlin.db.indexes.IDX_TITLE -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_PKEY import org.jooq.demo.kotlin.db.keys.FILM__FILM_LANGUAGE_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.ActorRecord -import org.jooq.demo.kotlin.db.tables.records.CategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord import org.jooq.demo.kotlin.db.tables.records.FilmRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.LanguageRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -193,9 +176,6 @@ open class Film( return _filmLanguageIdFkey; } - val filmLanguageIdFkey: Language - get(): Language = filmLanguageIdFkey() - /** * Get the implicit join path to the public.language table, via * the film_original_language_id_fkey key. @@ -206,160 +186,8 @@ open class Film( return _filmOriginalLanguageIdFkey; } - - val filmOriginalLanguageIdFkey: Language - get(): Language = filmOriginalLanguageIdFkey() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(): Condition = filmActorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(subquery: (FilmActor) -> TableLike): Condition = oneToManyExists(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(): Condition = filmCategoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(subquery: (FilmCategory) -> TableLike): Condition = oneToManyExists(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(): Condition = inventoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(subquery: (Inventory) -> TableLike): Condition = oneToManyExists(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - fun actorExists(): Condition = actorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - fun actorExists(subquery: (Actor) -> TableLike): Condition = manyToManyExists(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - fun categoryExists(): Condition = categoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - fun categoryExists(subquery: (Category) -> TableLike): Condition = manyToManyExists(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmLanguageIdFkeyRow(): Field = filmLanguageIdFkeyRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmLanguageIdFkeyRow(subquery: (Language) -> TableLike): Field = toOneRow(FILM__FILM_LANGUAGE_ID_FKEY, { subquery(it as Language) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmOriginalLanguageIdFkeyRow(): Field = filmOriginalLanguageIdFkeyRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmOriginalLanguageIdFkeyRow(subquery: (Language) -> TableLike): Field = toOneRow(FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, { subquery(it as Language) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(): Field> = filmActorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(subquery: (FilmActor) -> TableLike): Field> = oneToManyMultiset(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(): Field> = filmCategoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(subquery: (FilmCategory) -> TableLike): Field> = oneToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(): Field> = inventoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(subquery: (Inventory) -> TableLike): Field> = oneToManyMultiset(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - fun actorMultiset(): Field> = actorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - fun actorMultiset(subquery: (Actor) -> TableLike): Field> = manyToManyMultiset(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - fun categoryMultiset(): Field> = categoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - fun categoryMultiset(subquery: (Category) -> TableLike): Field> = manyToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) override fun `as`(alias: String): Film = Film(DSL.name(alias), this) override fun `as`(alias: Name): Film = Film(alias, this) - override fun `as`(alias: Table<*>): Film = Film(alias.getQualifiedName(), this) /** * Rename this table @@ -371,23 +199,8 @@ open class Film( */ override fun rename(name: Name): Film = Film(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Film = Film(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row14?, Any?> = super.fieldsRow() as Row14?, Any?> - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, Int?, Long?, Long?, Short?, BigDecimal?, Short?, BigDecimal?, MpaaRating?, LocalDateTime?, Array?, Any?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, Int?, Long?, Long?, Short?, BigDecimal?, Short?, BigDecimal?, MpaaRating?, LocalDateTime?, Array?, Any?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt index 52c2832..ea14d01 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt @@ -5,7 +5,6 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -14,13 +13,10 @@ import org.jooq.ForeignKey import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -28,9 +24,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_FILM_ID import org.jooq.demo.kotlin.db.keys.FILM_ACTOR_PKEY import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.ActorRecord import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -122,9 +116,6 @@ open class FilmActor( return _actor; } - val actor: Actor - get(): Actor = actor() - /** * Get the implicit join path to the public.film table. */ @@ -134,36 +125,8 @@ open class FilmActor( return _film; } - - val film: Film - get(): Film = film() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun actorRow(): Field = actorRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun actorRow(subquery: (Actor) -> TableLike): Field = toOneRow(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): FilmActor = FilmActor(DSL.name(alias), this) override fun `as`(alias: Name): FilmActor = FilmActor(alias, this) - override fun `as`(alias: Table<*>): FilmActor = FilmActor(alias.getQualifiedName(), this) /** * Rename this table @@ -175,23 +138,8 @@ open class FilmActor( */ override fun rename(name: Name): FilmActor = FilmActor(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmActor = FilmActor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt index 5e4b496..4ec823d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt @@ -5,7 +5,6 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -13,22 +12,17 @@ import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY_PKEY import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CategoryRecord import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -119,9 +113,6 @@ open class FilmCategory( return _film; } - val film: Film - get(): Film = film() - /** * Get the implicit join path to the public.category table. */ @@ -131,36 +122,8 @@ open class FilmCategory( return _category; } - - val category: Category - get(): Category = category() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun categoryRow(): Field = categoryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun categoryRow(subquery: (Category) -> TableLike): Field = toOneRow(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) override fun `as`(alias: String): FilmCategory = FilmCategory(DSL.name(alias), this) override fun `as`(alias: Name): FilmCategory = FilmCategory(alias, this) - override fun `as`(alias: Table<*>): FilmCategory = FilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -172,23 +135,8 @@ open class FilmCategory( */ override fun rename(name: Name): FilmCategory = FilmCategory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmCategory = FilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt index b7d1923..74a7f4e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -85,7 +81,6 @@ open class FilmInStock( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmInStock = FilmInStock(DSL.name(alias), this, parameters) override fun `as`(alias: Name): FilmInStock = FilmInStock(alias, this, parameters) - override fun `as`(alias: Table<*>): FilmInStock = FilmInStock(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -97,11 +92,6 @@ open class FilmInStock( */ override fun rename(name: Name): FilmInStock = FilmInStock(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmInStock = FilmInStock(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -128,14 +118,4 @@ open class FilmInStock( pFilmId, pStoreId )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt index c5e230a..a31bf45 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -45,22 +42,7 @@ open class FilmList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { companion object { @@ -137,7 +119,6 @@ open class FilmList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmList = FilmList(DSL.name(alias), this) override fun `as`(alias: Name): FilmList = FilmList(alias, this) - override fun `as`(alias: Table<*>): FilmList = FilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -149,23 +130,8 @@ open class FilmList( */ override fun rename(name: Name): FilmList = FilmList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmList = FilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt index 3ac9915..9114e7c 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -85,7 +81,6 @@ open class FilmNotInStock( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmNotInStock = FilmNotInStock(DSL.name(alias), this, parameters) override fun `as`(alias: Name): FilmNotInStock = FilmNotInStock(alias, this, parameters) - override fun `as`(alias: Table<*>): FilmNotInStock = FilmNotInStock(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -97,11 +92,6 @@ open class FilmNotInStock( */ override fun rename(name: Name): FilmNotInStock = FilmNotInStock(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmNotInStock = FilmNotInStock(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -128,14 +118,4 @@ open class FilmNotInStock( pFilmId, pStoreId )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt index 849e992..e955100 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt @@ -5,25 +5,19 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -31,11 +25,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_STORE_ID_FILM_ID import org.jooq.demo.kotlin.db.keys.INVENTORY_PKEY import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_INVENTORY_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -133,9 +123,6 @@ open class Inventory( return _film; } - val film: Film - get(): Film = film() - /** * Get the implicit join path to the public.store table. */ @@ -145,60 +132,8 @@ open class Inventory( return _store; } - - val store: Store - get(): Store = store() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Inventory = Inventory(DSL.name(alias), this) override fun `as`(alias: Name): Inventory = Inventory(alias, this) - override fun `as`(alias: Table<*>): Inventory = Inventory(alias.getQualifiedName(), this) /** * Rename this table @@ -210,23 +145,8 @@ open class Inventory( */ override fun rename(name: Name): Inventory = Inventory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Inventory = Inventory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt index 3a107ae..f109116 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt @@ -5,17 +5,14 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -101,7 +98,6 @@ open class Language( override fun getPrimaryKey(): UniqueKey = LANGUAGE_PKEY override fun `as`(alias: String): Language = Language(DSL.name(alias), this) override fun `as`(alias: Name): Language = Language(alias, this) - override fun `as`(alias: Table<*>): Language = Language(alias.getQualifiedName(), this) /** * Rename this table @@ -113,23 +109,8 @@ open class Language( */ override fun rename(name: Name): Language = Language(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Language = Language(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt index adc6724..03ea367 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -45,22 +42,7 @@ open class NicerButSlowerFilmList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { companion object { @@ -140,7 +122,6 @@ open class NicerButSlowerFilmList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): NicerButSlowerFilmList = NicerButSlowerFilmList(DSL.name(alias), this) override fun `as`(alias: Name): NicerButSlowerFilmList = NicerButSlowerFilmList(alias, this) - override fun `as`(alias: Table<*>): NicerButSlowerFilmList = NicerButSlowerFilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -152,23 +133,8 @@ open class NicerButSlowerFilmList( */ override fun rename(name: Name): NicerButSlowerFilmList = NicerButSlowerFilmList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): NicerButSlowerFilmList = NicerButSlowerFilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt index 1321354..6e741dc 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -16,13 +15,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -32,10 +28,7 @@ import org.jooq.demo.kotlin.db.keys.PAYMENT_PKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -144,9 +137,6 @@ open class Payment( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -157,9 +147,6 @@ open class Payment( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -169,48 +156,8 @@ open class Payment( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Payment = Payment(DSL.name(alias), this) override fun `as`(alias: Name): Payment = Payment(alias, this) - override fun `as`(alias: Table<*>): Payment = Payment(alias.getQualifiedName(), this) /** * Rename this table @@ -222,23 +169,8 @@ open class Payment( */ override fun rename(name: Name): Payment = Payment(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Payment = Payment(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt index 902fdb1..ae73133 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_01_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_01_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_01( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_01( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_01( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_01_payment_date_check"), "(((payment_date >= '2007-01-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-02-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_01 = PaymentP2007_01(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_01 = PaymentP2007_01(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_01 = PaymentP2007_01(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_01( */ override fun rename(name: Name): PaymentP2007_01 = PaymentP2007_01(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_01 = PaymentP2007_01(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt index 30b2e39..9cebe18 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_02_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_02_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_02( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_02( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_02( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_02_payment_date_check"), "(((payment_date >= '2007-02-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-03-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_02 = PaymentP2007_02(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_02 = PaymentP2007_02(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_02 = PaymentP2007_02(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_02( */ override fun rename(name: Name): PaymentP2007_02 = PaymentP2007_02(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_02 = PaymentP2007_02(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt index ab859df..c4626bc 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_03_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_03_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_03( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_03( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_03( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_03_payment_date_check"), "(((payment_date >= '2007-03-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-04-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_03 = PaymentP2007_03(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_03 = PaymentP2007_03(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_03 = PaymentP2007_03(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_03( */ override fun rename(name: Name): PaymentP2007_03 = PaymentP2007_03(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_03 = PaymentP2007_03(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt index 40fc140..ac5d27e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_04_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_04_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_04( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_04( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_04( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_04_payment_date_check"), "(((payment_date >= '2007-04-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-05-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_04 = PaymentP2007_04(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_04 = PaymentP2007_04(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_04 = PaymentP2007_04(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_04( */ override fun rename(name: Name): PaymentP2007_04 = PaymentP2007_04(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_04 = PaymentP2007_04(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt index 55ef276..8a8bfb5 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_05_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_05_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_05( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_05( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_05( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_05_payment_date_check"), "(((payment_date >= '2007-05-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-06-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_05 = PaymentP2007_05(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_05 = PaymentP2007_05(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_05 = PaymentP2007_05(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_05( */ override fun rename(name: Name): PaymentP2007_05 = PaymentP2007_05(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_05 = PaymentP2007_05(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt index 3f4ad11..2ca08c9 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_06_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_06_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_06( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_06( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_06( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_06_payment_date_check"), "(((payment_date >= '2007-06-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-07-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_06 = PaymentP2007_06(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_06 = PaymentP2007_06(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_06 = PaymentP2007_06(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_06( */ override fun rename(name: Name): PaymentP2007_06 = PaymentP2007_06(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_06 = PaymentP2007_06(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt index 5d71fdb..dee3c62 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt @@ -5,52 +5,29 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row7 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_INVENTORY_ID import org.jooq.demo.kotlin.db.indexes.IDX_UNQ_RENTAL_RENTAL_DATE_INVENTORY_ID_CUSTOMER_ID -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL_PKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_INVENTORY_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -164,9 +141,6 @@ open class Rental( return _inventory; } - val inventory: Inventory - get(): Inventory = inventory() - /** * Get the implicit join path to the public.customer table. */ @@ -177,9 +151,6 @@ open class Rental( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -189,228 +160,8 @@ open class Rental( return _staff; } - - val staff: Staff - get(): Staff = staff() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun inventoryRow(): Field = inventoryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun inventoryRow(subquery: (Inventory) -> TableLike): Field = toOneRow(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_06) }) override fun `as`(alias: String): Rental = Rental(DSL.name(alias), this) override fun `as`(alias: Name): Rental = Rental(alias, this) - override fun `as`(alias: Table<*>): Rental = Rental(alias.getQualifiedName(), this) /** * Rename this table @@ -422,23 +173,8 @@ open class Rental( */ override fun rename(name: Name): Rental = Rental(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Rental = Rental(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row7 = super.fieldsRow() as Row7 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, LocalDateTime?, Long?, Long?, LocalDateTime?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, LocalDateTime?, Long?, Long?, LocalDateTime?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt index f61bb6a..e651ff2 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt @@ -7,17 +7,14 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -135,7 +132,6 @@ open class RewardsReport( override fun getIdentity(): Identity = super.getIdentity() as Identity override fun `as`(alias: String): RewardsReport = RewardsReport(DSL.name(alias), this, parameters) override fun `as`(alias: Name): RewardsReport = RewardsReport(alias, this, parameters) - override fun `as`(alias: Table<*>): RewardsReport = RewardsReport(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -147,11 +143,6 @@ open class RewardsReport( */ override fun rename(name: Name): RewardsReport = RewardsReport(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): RewardsReport = RewardsReport(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -178,14 +169,4 @@ open class RewardsReport( minMonthlyPurchases, minDollarAmountPurchased )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt index c1ccf46..74bc8b9 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row2 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -44,18 +41,7 @@ open class SalesByFilmCategory( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """) + TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;") ) { companion object { @@ -104,7 +90,6 @@ open class SalesByFilmCategory( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): SalesByFilmCategory = SalesByFilmCategory(DSL.name(alias), this) override fun `as`(alias: Name): SalesByFilmCategory = SalesByFilmCategory(alias, this) - override fun `as`(alias: Table<*>): SalesByFilmCategory = SalesByFilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -116,23 +101,8 @@ open class SalesByFilmCategory( */ override fun rename(name: Name): SalesByFilmCategory = SalesByFilmCategory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): SalesByFilmCategory = SalesByFilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row2 = super.fieldsRow() as Row2 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (String?, BigDecimal?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (String?, BigDecimal?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt index 83c2ed5..2299e61 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -44,21 +41,7 @@ open class SalesByStore( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """) + TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;") ) { companion object { @@ -110,7 +93,6 @@ open class SalesByStore( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): SalesByStore = SalesByStore(DSL.name(alias), this) override fun `as`(alias: Name): SalesByStore = SalesByStore(alias, this) - override fun `as`(alias: Table<*>): SalesByStore = SalesByStore(alias.getQualifiedName(), this) /** * Rename this table @@ -122,23 +104,8 @@ open class SalesByStore( */ override fun rename(name: Name): SalesByStore = SalesByStore(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): SalesByStore = SalesByStore(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (String?, String?, BigDecimal?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (String?, String?, BigDecimal?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt index 4d058c0..0f049aa 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt @@ -5,50 +5,25 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row11 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_STAFF_ID_FKEY import org.jooq.demo.kotlin.db.keys.STAFF_PKEY import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STORE__STORE_MANAGER_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord import org.jooq.demo.kotlin.db.tables.records.StaffRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -180,9 +155,6 @@ open class Staff( return _address; } - val address: Address - get(): Address = address() - /** * Get the implicit join path to the public.store table. */ @@ -192,264 +164,8 @@ open class Staff( return _store; } - - val store: Store - get(): Store = store() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(): Condition = storeExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(subquery: (Store) -> TableLike): Condition = oneToManyExists(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(): Field> = storeMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(subquery: (Store) -> TableLike): Field> = oneToManyMultiset(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Store) }) override fun `as`(alias: String): Staff = Staff(DSL.name(alias), this) override fun `as`(alias: Name): Staff = Staff(alias, this) - override fun `as`(alias: Table<*>): Staff = Staff(alias.getQualifiedName(), this) /** * Rename this table @@ -461,23 +177,8 @@ open class Staff( */ override fun rename(name: Name): Staff = Staff(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Staff = Staff(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row11 = super.fieldsRow() as Row11 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, Long?, String?, Long?, Boolean?, String?, String?, LocalDateTime?, ByteArray?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, Long?, String?, Long?, Boolean?, String?, String?, LocalDateTime?, ByteArray?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt index ec7b508..2ed6bed 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,20 +39,7 @@ open class StaffList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { companion object { @@ -133,7 +116,6 @@ open class StaffList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): StaffList = StaffList(DSL.name(alias), this) override fun `as`(alias: Name): StaffList = StaffList(alias, this) - override fun `as`(alias: Table<*>): StaffList = StaffList(alias.getQualifiedName(), this) /** * Rename this table @@ -145,23 +127,8 @@ open class StaffList( */ override fun rename(name: Name): StaffList = StaffList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): StaffList = StaffList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt index a3e49d0..a3e687a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt @@ -5,39 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_UNQ_MANAGER_STAFF_ID -import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_STORE_ID_FKEY import org.jooq.demo.kotlin.db.keys.STORE_PKEY import org.jooq.demo.kotlin.db.keys.STORE__STORE_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.STORE__STORE_MANAGER_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -136,9 +123,6 @@ open class Store( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.address table. */ @@ -148,108 +132,8 @@ open class Store( return _address; } - - val address: Address - get(): Address = address() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(): Condition = customerExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(subquery: (Customer) -> TableLike): Condition = oneToManyExists(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(): Condition = inventoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(subquery: (Inventory) -> TableLike): Condition = oneToManyExists(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(): Condition = staffExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(subquery: (Staff) -> TableLike): Condition = oneToManyExists(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(): Field> = customerMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(subquery: (Customer) -> TableLike): Field> = oneToManyMultiset(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(): Field> = inventoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(subquery: (Inventory) -> TableLike): Field> = oneToManyMultiset(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(): Field> = staffMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(subquery: (Staff) -> TableLike): Field> = oneToManyMultiset(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Staff) }) override fun `as`(alias: String): Store = Store(DSL.name(alias), this) override fun `as`(alias: Name): Store = Store(alias, this) - override fun `as`(alias: Table<*>): Store = Store(alias.getQualifiedName(), this) /** * Rename this table @@ -261,23 +145,8 @@ open class Store( */ override fun rename(name: Name): Store = Store(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Store = Store(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt index 575bd27..87def4f 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt @@ -17,19 +17,19 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class ActorInfoRecord() : TableRecordImpl(ActorInfo.ACTOR_INFO), Record4 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var filmInfo: String? + var filmInfo: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt index 90cd004..ff01ae5 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class ActorRecord() : UpdatableRecordImpl(Actor.ACTOR), Record4 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt index 6638b0b..7a2a7d0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class AddressRecord() : UpdatableRecordImpl(Address.ADDRESS), Record8 { - open var addressId: Long? + var addressId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var address: String? + var address: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address2: String? + var address2: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var district: String? + var district: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var cityId: Long? + var cityId: Long? set(value): Unit = set(4, value) get(): Long? = get(4) as Long? - open var postalCode: String? + var postalCode: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var phone: String? + var phone: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(7, value) get(): LocalDateTime? = get(7) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt index 612bec3..4b22093 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CategoryRecord() : UpdatableRecordImpl(Category.CATEGORY), Record3 { - open var categoryId: Long? + var categoryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt index 5429034..e71fb60 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CityRecord() : UpdatableRecordImpl(City.CITY), Record4 { - open var cityId: Long? + var cityId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var city: String? + var city: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var countryId: Long? + var countryId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt index 2a1b4e6..89cfc11 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CountryRecord() : UpdatableRecordImpl(Country.COUNTRY), Record3 { - open var countryId: Long? + var countryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var country: String? + var country: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt index 9b8fc19..491413e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt @@ -17,39 +17,39 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class CustomerListRecord() : TableRecordImpl(CustomerList.CUSTOMER_LIST), Record9 { - open var id: Long? + var id: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address: String? + var address: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var zipCode: String? + var zipCode: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var phone: String? + var phone: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var city: String? + var city: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var country: String? + var country: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var notes: String? + var notes: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? - open var sid: Long? + var sid: Long? set(value): Unit = set(8, value) get(): Long? = get(8) as Long? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt index 4220739..5b7f28e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt @@ -21,43 +21,43 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CustomerRecord() : UpdatableRecordImpl(Customer.CUSTOMER), Record10 { - open var customerId: Long? + var customerId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var activebool: Boolean? + var activebool: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var createDate: LocalDate? + var createDate: LocalDate? set(value): Unit = set(7, value) get(): LocalDate? = get(7) as LocalDate? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(8, value) get(): LocalDateTime? = get(8) as LocalDateTime? - open var active: Int? + var active: Int? set(value): Unit = set(9, value) get(): Int? = get(9) as Int? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt index 02b7be5..c18f7a8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmActorRecord() : UpdatableRecordImpl(FilmActor.FILM_ACTOR), Record3 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var filmId: Long? + var filmId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt index b263251..74c2d26 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmCategoryRecord() : UpdatableRecordImpl(FilmCategory.FILM_CATEGORY), Record3 { - open var filmId: Long? + var filmId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var categoryId: Long? + var categoryId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt index c8f9b2e..b2fe0c3 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt @@ -17,7 +17,7 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmInStockRecord() : TableRecordImpl(FilmInStock.FILM_IN_STOCK), Record1 { - open var pFilmCount: Int? + var pFilmCount: Int? set(value): Unit = set(0, value) get(): Int? = get(0) as Int? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt index cdd605e..144427f 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmListRecord() : TableRecordImpl(FilmList.FILM_LIST), Record8 { - open var fid: Long? + var fid: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var category: String? + var category: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var price: BigDecimal? + var price: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(5, value) get(): Short? = get(5) as Short? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(6, value) get(): MpaaRating? = get(6) as MpaaRating? - open var actors: String? + var actors: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt index fd078d2..d61baa0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt @@ -17,7 +17,7 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmNotInStockRecord() : TableRecordImpl(FilmNotInStock.FILM_NOT_IN_STOCK), Record1 { - open var pFilmCount: Int? + var pFilmCount: Int? set(value): Unit = set(0, value) get(): Int? = get(0) as Int? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt index 91ac7b7..aad060e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt @@ -22,59 +22,59 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmRecord() : UpdatableRecordImpl(Film.FILM), Record14?, Any?> { - open var filmId: Long? + var filmId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var releaseYear: Int? + var releaseYear: Int? set(value): Unit = set(3, value) get(): Int? = get(3) as Int? - open var languageId: Long? + var languageId: Long? set(value): Unit = set(4, value) get(): Long? = get(4) as Long? - open var originalLanguageId: Long? + var originalLanguageId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var rentalDuration: Short? + var rentalDuration: Short? set(value): Unit = set(6, value) get(): Short? = get(6) as Short? - open var rentalRate: BigDecimal? + var rentalRate: BigDecimal? set(value): Unit = set(7, value) get(): BigDecimal? = get(7) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(8, value) get(): Short? = get(8) as Short? - open var replacementCost: BigDecimal? + var replacementCost: BigDecimal? set(value): Unit = set(9, value) get(): BigDecimal? = get(9) as BigDecimal? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(10, value) get(): MpaaRating? = get(10) as MpaaRating? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(11, value) get(): LocalDateTime? = get(11) as LocalDateTime? - open var specialFeatures: Array? + var specialFeatures: Array? set(value): Unit = set(12, value) get(): Array? = get(12) as Array? - open var fulltext: Any? + var fulltext: Any? set(value): Unit = set(13, value) get(): Any? = get(13) as Any? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt index ca4af2b..0e38cdc 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class InventoryRecord() : UpdatableRecordImpl(Inventory.INVENTORY), Record4 { - open var inventoryId: Long? + var inventoryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var filmId: Long? + var filmId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt index c3870c1..d4d471a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class LanguageRecord() : UpdatableRecordImpl(Language.LANGUAGE), Record3 { - open var languageId: Long? + var languageId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt index 5dba4ac..ace93f6 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class NicerButSlowerFilmListRecord() : TableRecordImpl(NicerButSlowerFilmList.NICER_BUT_SLOWER_FILM_LIST), Record8 { - open var fid: Long? + var fid: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var category: String? + var category: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var price: BigDecimal? + var price: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(5, value) get(): Short? = get(5) as Short? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(6, value) get(): MpaaRating? = get(6) as MpaaRating? - open var actors: String? + var actors: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt index 21d6955..8337be1 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_01Record() : TableRecordImpl(PaymentP2007_01.PAYMENT_P2007_01), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt index 0e44060..7d35972 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_02Record() : TableRecordImpl(PaymentP2007_02.PAYMENT_P2007_02), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt index 382105a..2fef129 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_03Record() : TableRecordImpl(PaymentP2007_03.PAYMENT_P2007_03), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt index b49e0e7..0068439 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_04Record() : TableRecordImpl(PaymentP2007_04.PAYMENT_P2007_04), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt index 0430fea..9f926c6 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_05Record() : TableRecordImpl(PaymentP2007_05.PAYMENT_P2007_05), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt index 20b054c..338e799 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_06Record() : TableRecordImpl(PaymentP2007_06.PAYMENT_P2007_06), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt index 3137a3d..2348a6e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt @@ -21,27 +21,27 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentRecord() : UpdatableRecordImpl(Payment.PAYMENT), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt index b73274c..c772ed4 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt @@ -20,31 +20,31 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class RentalRecord() : UpdatableRecordImpl(Rental.RENTAL), Record7 { - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var rentalDate: LocalDateTime? + var rentalDate: LocalDateTime? set(value): Unit = set(1, value) get(): LocalDateTime? = get(1) as LocalDateTime? - open var inventoryId: Long? + var inventoryId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var returnDate: LocalDateTime? + var returnDate: LocalDateTime? set(value): Unit = set(4, value) get(): LocalDateTime? = get(4) as LocalDateTime? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(6, value) get(): LocalDateTime? = get(6) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt index 999ec10..1d0d72d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt @@ -20,43 +20,43 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class RewardsReportRecord() : TableRecordImpl(RewardsReport.REWARDS_REPORT), Record10 { - open var customerId: Long? + var customerId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var activebool: Boolean? + var activebool: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var createDate: LocalDate? + var createDate: LocalDate? set(value): Unit = set(7, value) get(): LocalDate? = get(7) as LocalDate? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(8, value) get(): LocalDateTime? = get(8) as LocalDateTime? - open var active: Int? + var active: Int? set(value): Unit = set(9, value) get(): Int? = get(9) as Int? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt index 44c6555..183a9d2 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt @@ -19,11 +19,11 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class SalesByFilmCategoryRecord() : TableRecordImpl(SalesByFilmCategory.SALES_BY_FILM_CATEGORY), Record2 { - open var category: String? + var category: String? set(value): Unit = set(0, value) get(): String? = get(0) as String? - open var totalSales: BigDecimal? + var totalSales: BigDecimal? set(value): Unit = set(1, value) get(): BigDecimal? = get(1) as BigDecimal? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt index 2da5b25..369b638 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt @@ -19,15 +19,15 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class SalesByStoreRecord() : TableRecordImpl(SalesByStore.SALES_BY_STORE), Record3 { - open var store: String? + var store: String? set(value): Unit = set(0, value) get(): String? = get(0) as String? - open var manager: String? + var manager: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var totalSales: BigDecimal? + var totalSales: BigDecimal? set(value): Unit = set(2, value) get(): BigDecimal? = get(2) as BigDecimal? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt index fc5a45b..27198b8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt @@ -17,35 +17,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class StaffListRecord() : TableRecordImpl(StaffList.STAFF_LIST), Record8 { - open var id: Long? + var id: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address: String? + var address: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var zipCode: String? + var zipCode: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var phone: String? + var phone: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var city: String? + var city: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var country: String? + var country: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var sid: Long? + var sid: Long? set(value): Unit = set(7, value) get(): Long? = get(7) as Long? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt index ceb3fdf..5603649 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt @@ -20,47 +20,47 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class StaffRecord() : UpdatableRecordImpl(Staff.STAFF), Record11 { - open var staffId: Long? + var staffId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var active: Boolean? + var active: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var username: String? + var username: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? - open var password: String? + var password: String? set(value): Unit = set(8, value) get(): String? = get(8) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(9, value) get(): LocalDateTime? = get(9) as LocalDateTime? - open var picture: ByteArray? + var picture: ByteArray? set(value): Unit = set(10, value) get(): ByteArray? = get(10) as ByteArray? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt index fd4af1a..845f64d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class StoreRecord() : UpdatableRecordImpl(Store.STORE), Record4 { - open var storeId: Long? + var storeId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var managerStaffId: Long? + var managerStaffId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt index 8e03855..3a0df03 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt @@ -195,18 +195,19 @@ class Demo01Querying : AbstractDemo() { .fetch() } - @Test - fun nestedRecords() { - title("Need all columns of those active records?") - val (customer, country) = ctx.select(CUSTOMER, CUSTOMER.address.city.country) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle() - println("Customer ${customer.firstName} ${customer.lastName} from ${country.formatJSON()}") - - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// fun nestedRecords() { +// title("Need all columns of those active records?") +// val (customer, country) = ctx.select(CUSTOMER, CUSTOMER.address.city.country) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle() +// println("Customer ${customer.firstName} ${customer.lastName} from ${country.formatJSON()}") +// +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test fun nestedRowValuesWithAdHocConverters() { diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt index 82aaa27..66fd10a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt @@ -24,14 +24,15 @@ class Demo11QueryObjectModel : AbstractDemo() { println("FROM : " + select.`$from`()) println("WHERE : " + select.`$where`()) - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") - println( - select.`$select`(listOf(ACTOR.ACTOR_ID) + select.`$select`()) - .`$orderBy`(listOf(ACTOR.ACTOR_ID.asc())) - ) - - title("The old query is untouched:") - println(select) + // Available in jOOQ 3.17 only +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") +// println( +// select.`$select`(listOf(ACTOR.ACTOR_ID) + select.`$select`()) +// .`$orderBy`(listOf(ACTOR.ACTOR_ID.asc())) +// ) +// +// title("The old query is untouched:") +// println(select) } @@ -69,42 +70,20 @@ class Demo11QueryObjectModel : AbstractDemo() { title("Replacing bind values") println(select1.`$replace` { p -> if (p is Param<*>) value(5) else p }) - title("Inverting the < predicate") - println(select1.`$replace`{ p -> if (p is QOM.Lt<*>) p.`$converse`() else p }) - - title("Appending a predicate"); - println(select1.`$replace`(appendSecurityCheck())) - - title("Appending a predicate even to subqueries") - var select2 = ctx - .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.lt( - select(max(ACTOR.ACTOR_ID)).from(ACTOR)) - ) - println(select2.`$replace`(appendSecurityCheck())) + // Available in jOOQ 3.17 only +// title("Inverting the < predicate") +// println(select1.`$replace`{ p -> if (p is QOM.Lt<*>) p.`$converse`() else p }) +// +// title("Appending a predicate"); +// println(select1.`$replace`(appendSecurityCheck())) +// +// title("Appending a predicate even to subqueries") +// var select2 = ctx +// .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.lt( +// select(max(ACTOR.ACTOR_ID)).from(ACTOR)) +// ) +// println(select2.`$replace`(appendSecurityCheck())) } - - private fun appendSecurityCheck(): (p: QueryPart) -> QueryPart { - return { p -> - val c = condition("security_check()") - - // Beware of performance and infinite recursions, though! - if (p is Select<*>) - - // Append the predicate if there is no predicate - if (p.`$where`() == null) - p.`$where`(c) - - // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) - else if (!p.`$where`()!!.`$traverse`(Traversers.recursing({ q -> !(q is Select<*>)}, Traversers.containing(c)) )) - p.`$where`(and(p.`$where`(), c)) - - else - p - else - p - } - } - } \ No newline at end of file diff --git a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt index 8462fd0..e3d3ed5 100644 --- a/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt +++ b/jOOQ-demo-oss/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt @@ -30,85 +30,86 @@ class Demo13Reactive : AbstractDemo() { .forEach { println(it) } } - @Test - fun reactiveTransactions() { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher { c -> Flux - .from(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl() - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log() - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - }) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList() - .doOnError(Throwable::printStackTrace) - .onErrorReturn(listOf()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx - .select(ACTOR.ACTOR_ID) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .toIterable() - .forEach { println(it) } - } - - @Test - fun coroutines() { - val actor: ActorRecord? = runBlocking { - findActor(1) - } - - println(actor) - } - - suspend fun findActor(id: Long): ActorRecord? { - return ctx - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(id)) - - // Turn any reactive streams Publisher into a suspension result using the - // kotlinx-coroutines-reactive extensions - .awaitFirstOrNull() - } - - @Test - fun coroutinesWithTransactions() { - val actor: ActorRecord = runBlocking { - insertActorTransaction() - } - - println(actor) - } - - suspend fun insertActorTransaction(): ActorRecord { - return ctx.transactionCoroutine(::insertActor) - } - - suspend fun insertActor(c: Configuration): ActorRecord = c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A") - .returning() - .awaitFirst() + // Available in jOOQ 3.17 only +// @Test +// fun reactiveTransactions() { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher { c -> Flux +// .from(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl() +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log() +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// }) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList() +// .doOnError(Throwable::printStackTrace) +// .onErrorReturn(listOf()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx +// .select(ACTOR.ACTOR_ID) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .toIterable() +// .forEach { println(it) } +// } +// +// @Test +// fun coroutines() { +// val actor: ActorRecord? = runBlocking { +// findActor(1) +// } +// +// println(actor) +// } +// +// suspend fun findActor(id: Long): ActorRecord? { +// return ctx +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(id)) +// +// // Turn any reactive streams Publisher into a suspension result using the +// // kotlinx-coroutines-reactive extensions +// .awaitFirstOrNull() +// } +// +// @Test +// fun coroutinesWithTransactions() { +// val actor: ActorRecord = runBlocking { +// insertActorTransaction() +// } +// +// println(actor) +// } +// +// suspend fun insertActorTransaction(): ActorRecord { +// return ctx.transactionCoroutine(::insertActor) +// } +// +// suspend fun insertActor(c: Configuration): ActorRecord = c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A") +// .returning() +// .awaitFirst() @After override fun teardown() { diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/pom.xml b/jOOQ-demo-oss/jOOQ-demo-scala/pom.xml index 6f8f973..97d99d0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/pom.xml +++ b/jOOQ-demo-oss/jOOQ-demo-scala/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-demo - 0.9.0 + 3.16.6 jooq-demo-scala diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala index c75710a..817a130 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala @@ -35,10 +35,10 @@ class DefaultCatalog extends CatalogImpl("") { ) /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference by + * release, namely: 3.16. You can turn off the generation of this reference by * specifying /configuration/generator/generate/jooqVersionReference */ - private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17 + private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16 } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala index 5b08c87..5bf2c79 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala @@ -10,30 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.ActorRecord -import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -122,57 +115,8 @@ extends TableImpl[ActorRecord]( override def getIdentity: Identity[ActorRecord, Long] = super.getIdentity.asInstanceOf[ Identity[ActorRecord, Long] ] override def getPrimaryKey: UniqueKey[ActorRecord] = Keys.ACTOR_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists(): Condition = filmActorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists[O <: Record](subquery: (FilmActor) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists(): Condition = filmExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists[O <: Record](subquery: (Film) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset(): Field[Result[FilmActorRecord]] = filmActorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset[O <: Record](subquery: (FilmActor) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset(): Field[Result[FilmRecord]] = filmMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset[O <: Record](subquery: (Film) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): Actor = new Actor(DSL.name(alias), this) override def as(alias: Name): Actor = new Actor(alias, this) - override def as(alias: Table[_]): Actor = new Actor(alias.getQualifiedName(), this) /** * Rename this table @@ -184,23 +128,8 @@ extends TableImpl[ActorRecord]( */ override def rename(name: Name): Actor = new Actor(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Actor = new Actor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, String, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala index f5d41d7..7326ea8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,22 +53,7 @@ extends TableImpl[ActorInfoRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """) + TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;") ) { /** @@ -120,7 +103,6 @@ extends TableImpl[ActorInfoRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): ActorInfo = new ActorInfo(DSL.name(alias), this) override def as(alias: Name): ActorInfo = new ActorInfo(alias, this) - override def as(alias: Table[_]): ActorInfo = new ActorInfo(alias.getQualifiedName(), this) /** * Rename this table @@ -132,23 +114,8 @@ extends TableImpl[ActorInfoRecord]( */ override def rename(name: Name): ActorInfo = new ActorInfo(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): ActorInfo = new ActorInfo(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, String, String] = super.fieldsRow.asInstanceOf[ Row4[Long, String, String, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala index 5ea8c80..fb393e8 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala @@ -10,32 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.CityRecord -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -151,93 +142,8 @@ extends TableImpl[AddressRecord]( * Get the implicit join path to the public.city table. */ lazy val city: City = { new City(this, Keys.ADDRESS__ADDRESS_CITY_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists(): Condition = customerExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists[O <: Record](subquery: (Customer) => TableLike[O]): Condition = oneToManyExists(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists(): Condition = staffExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists[O <: Record](subquery: (Staff) => TableLike[O]): Condition = oneToManyExists(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists(): Condition = storeExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists[O <: Record](subquery: (Store) => TableLike[O]): Condition = oneToManyExists(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - def cityRow(): Field[CityRecord] = cityRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - def cityRow[O <: Record](subquery: (City) => TableLike[O]): Field[O] = toOneRow(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset(): Field[Result[CustomerRecord]] = customerMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset[O <: Record](subquery: (Customer) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset(): Field[Result[StaffRecord]] = staffMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset[O <: Record](subquery: (Staff) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset(): Field[Result[StoreRecord]] = storeMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset[O <: Record](subquery: (Store) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) override def as(alias: String): Address = new Address(DSL.name(alias), this) override def as(alias: Name): Address = new Address(alias, this) - override def as(alias: Table[_]): Address = new Address(alias.getQualifiedName(), this) /** * Rename this table @@ -249,23 +155,8 @@ extends TableImpl[AddressRecord]( */ override def rename(name: Name): Address = new Address(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Address = new Address(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, Long, String, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, Long, String, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala index 081b48c..21542d7 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala @@ -8,28 +8,21 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.CategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -111,57 +104,8 @@ extends TableImpl[CategoryRecord]( override def getIdentity: Identity[CategoryRecord, Long] = super.getIdentity.asInstanceOf[ Identity[CategoryRecord, Long] ] override def getPrimaryKey: UniqueKey[CategoryRecord] = Keys.CATEGORY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists(): Condition = filmCategoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists[O <: Record](subquery: (FilmCategory) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists(): Condition = filmExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists[O <: Record](subquery: (Film) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset(): Field[Result[FilmCategoryRecord]] = filmCategoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset[O <: Record](subquery: (FilmCategory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset(): Field[Result[FilmRecord]] = filmMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset[O <: Record](subquery: (Film) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): Category = new Category(DSL.name(alias), this) override def as(alias: Name): Category = new Category(alias, this) - override def as(alias: Table[_]): Category = new Category(alias.getQualifiedName(), this) /** * Rename this table @@ -173,23 +117,8 @@ extends TableImpl[CategoryRecord]( */ override def rename(name: Name): Category = new Category(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Category = new Category(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala index 0e622f3..cf98f2e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala @@ -10,30 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord import org.jooq.demo.skala.db.tables.records.CityRecord -import org.jooq.demo.skala.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -129,45 +122,8 @@ extends TableImpl[CityRecord]( * Get the implicit join path to the public.country table. */ lazy val country: Country = { new Country(this, Keys.CITY__CITY_COUNTRY_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - def addressExists(): Condition = addressExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - def addressExists[O <: Record](subquery: (Address) => TableLike[O]): Condition = oneToManyExists(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - def countryRow(): Field[CountryRecord] = countryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - def countryRow[O <: Record](subquery: (Country) => TableLike[O]): Field[O] = toOneRow(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CountryRecord]) => subquery(t.asInstanceOf[Country])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.address one-to-many child table. - */ - def addressMultiset(): Field[Result[AddressRecord]] = addressMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.address one-to-many child table. - */ - def addressMultiset[O <: Record](subquery: (Address) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) override def as(alias: String): City = new City(DSL.name(alias), this) override def as(alias: Name): City = new City(alias, this) - override def as(alias: Table[_]): City = new City(alias.getQualifiedName(), this) /** * Rename this table @@ -179,23 +135,8 @@ extends TableImpl[CityRecord]( */ override def rename(name: Name): City = new City(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): City = new City(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, String, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala index 8075f6b..def5556 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala @@ -8,26 +8,20 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CityRecord import org.jooq.demo.skala.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -110,33 +104,8 @@ extends TableImpl[CountryRecord]( override def getIdentity: Identity[CountryRecord, Long] = super.getIdentity.asInstanceOf[ Identity[CountryRecord, Long] ] override def getPrimaryKey: UniqueKey[CountryRecord] = Keys.COUNTRY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - def cityExists(): Condition = cityExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - def cityExists[O <: Record](subquery: (City) => TableLike[O]): Condition = oneToManyExists(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.city one-to-many child table. - */ - def cityMultiset(): Field[Result[CityRecord]] = cityMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.city one-to-many child table. - */ - def cityMultiset[O <: Record](subquery: (City) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) override def as(alias: String): Country = new Country(DSL.name(alias), this) override def as(alias: Name): Country = new Country(alias, this) - override def as(alias: Table[_]): Country = new Country(alias.getQualifiedName(), this) /** * Rename this table @@ -148,23 +117,8 @@ extends TableImpl[CountryRecord]( */ override def rename(name: Name): Country = new Country(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Country = new Country(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala index 3761317..ffdd175 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala @@ -13,38 +13,23 @@ import java.time.LocalDate import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -175,225 +160,8 @@ extends TableImpl[CustomerRecord]( * Get the implicit join path to the public.address table. */ lazy val address: Address = { new Address(this, Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Customer = new Customer(DSL.name(alias), this) override def as(alias: Name): Customer = new Customer(alias, this) - override def as(alias: Table[_]): Customer = new Customer(alias.getQualifiedName(), this) /** * Rename this table @@ -405,23 +173,8 @@ extends TableImpl[CustomerRecord]( */ override def rename(name: Name): Customer = new Customer(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Customer = new Customer(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row10[Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer] = super.fieldsRow.asInstanceOf[ Row10[Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala index 450bbaa..cb012a1 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row9 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,24 +53,7 @@ extends TableImpl[CustomerListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { /** @@ -147,7 +128,6 @@ extends TableImpl[CustomerListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): CustomerList = new CustomerList(DSL.name(alias), this) override def as(alias: Name): CustomerList = new CustomerList(alias, this) - override def as(alias: Table[_]): CustomerList = new CustomerList(alias.getQualifiedName(), this) /** * Rename this table @@ -159,23 +139,8 @@ extends TableImpl[CustomerListRecord]( */ override def rename(name: Name): CustomerList = new CustomerList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): CustomerList = new CustomerList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row9[Long, String, String, String, String, String, String, String, Long] = super.fieldsRow.asInstanceOf[ Row9[Long, String, String, String, String, String, String, String, Long] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala index 1a3f184..61d3296 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala @@ -15,35 +15,24 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row14 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.enums.MpaaRating -import org.jooq.demo.skala.db.tables.records.ActorRecord -import org.jooq.demo.skala.db.tables.records.CategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord import org.jooq.demo.skala.db.tables.records.FilmRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.LanguageRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -201,153 +190,8 @@ extends TableImpl[FilmRecord]( * the film_original_language_id_fkey key. */ lazy val filmOriginalLanguageIdFkey: Language = { new Language(this, Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists(): Condition = filmActorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists[O <: Record](subquery: (FilmActor) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists(): Condition = filmCategoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists[O <: Record](subquery: (FilmCategory) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists(): Condition = inventoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists[O <: Record](subquery: (Inventory) => TableLike[O]): Condition = oneToManyExists(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - def actorExists(): Condition = actorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - def actorExists[O <: Record](subquery: (Actor) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - def categoryExists(): Condition = categoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - def categoryExists[O <: Record](subquery: (Category) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmLanguageIdFkeyRow(): Field[LanguageRecord] = filmLanguageIdFkeyRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmLanguageIdFkeyRow[O <: Record](subquery: (Language) => TableLike[O]): Field[O] = toOneRow(Keys.FILM__FILM_LANGUAGE_ID_FKEY, (t: Table[LanguageRecord]) => subquery(t.asInstanceOf[Language])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmOriginalLanguageIdFkeyRow(): Field[LanguageRecord] = filmOriginalLanguageIdFkeyRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmOriginalLanguageIdFkeyRow[O <: Record](subquery: (Language) => TableLike[O]): Field[O] = toOneRow(Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, (t: Table[LanguageRecord]) => subquery(t.asInstanceOf[Language])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset(): Field[Result[FilmActorRecord]] = filmActorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset[O <: Record](subquery: (FilmActor) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset(): Field[Result[FilmCategoryRecord]] = filmCategoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset[O <: Record](subquery: (FilmCategory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset(): Field[Result[InventoryRecord]] = inventoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset[O <: Record](subquery: (Inventory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.actor many-to-many child table. - */ - def actorMultiset(): Field[Result[ActorRecord]] = actorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.actor many-to-many child table. - */ - def actorMultiset[O <: Record](subquery: (Actor) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.category many-to-many child table. - */ - def categoryMultiset(): Field[Result[CategoryRecord]] = categoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.category many-to-many child table. - */ - def categoryMultiset[O <: Record](subquery: (Category) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) override def as(alias: String): Film = new Film(DSL.name(alias), this) override def as(alias: Name): Film = new Film(alias, this) - override def as(alias: Table[_]): Film = new Film(alias.getQualifiedName(), this) /** * Rename this table @@ -359,23 +203,8 @@ extends TableImpl[FilmRecord]( */ override def rename(name: Name): Film = new Film(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Film = new Film(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row14[Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object] = super.fieldsRow.asInstanceOf[ Row14[Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11(), r.value12(), r.value13(), r.value14())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11(), r.value12(), r.value13(), r.value14())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala index 2782c1c..486dd5b 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala @@ -10,7 +10,6 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -19,18 +18,14 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.ActorRecord import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -124,33 +119,8 @@ extends TableImpl[FilmActorRecord]( * Get the implicit join path to the public.film table. */ lazy val film: Film = { new Film(this, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def actorRow(): Field[ActorRecord] = actorRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def actorRow[O <: Record](subquery: (Actor) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): FilmActor = new FilmActor(DSL.name(alias), this) override def as(alias: Name): FilmActor = new FilmActor(alias, this) - override def as(alias: Table[_]): FilmActor = new FilmActor(alias.getQualifiedName(), this) /** * Rename this table @@ -162,23 +132,8 @@ extends TableImpl[FilmActorRecord]( */ override def rename(name: Name): FilmActor = new FilmActor(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmActor = new FilmActor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala index bb0dcf1..0ada8d0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala @@ -10,7 +10,6 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -18,17 +17,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CategoryRecord import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -120,33 +115,8 @@ extends TableImpl[FilmCategoryRecord]( * Get the implicit join path to the public.category table. */ lazy val category: Category = { new Category(this, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def categoryRow(): Field[CategoryRecord] = categoryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def categoryRow[O <: Record](subquery: (Category) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) override def as(alias: String): FilmCategory = new FilmCategory(DSL.name(alias), this) override def as(alias: Name): FilmCategory = new FilmCategory(alias, this) - override def as(alias: Table[_]): FilmCategory = new FilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -158,23 +128,8 @@ extends TableImpl[FilmCategoryRecord]( */ override def rename(name: Name): FilmCategory = new FilmCategory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmCategory = new FilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala index e89b5f7..d5a7934 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Integer import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -16,7 +15,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -91,7 +89,6 @@ extends TableImpl[FilmInStockRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmInStock = new FilmInStock(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): FilmInStock = new FilmInStock(alias, null, null, this, parameters) - override def as(alias: Table[_]): FilmInStock = new FilmInStock(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -103,11 +100,6 @@ extends TableImpl[FilmInStockRecord]( */ override def rename(name: Name): FilmInStock = new FilmInStock(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmInStock = new FilmInStock(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -134,14 +126,4 @@ extends TableImpl[FilmInStockRecord]( pFilmId, pStoreId ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala index e2e8994..4c7052a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala @@ -9,7 +9,6 @@ import java.lang.Long import java.lang.Short import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -58,22 +56,7 @@ extends TableImpl[FilmListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { /** @@ -143,7 +126,6 @@ extends TableImpl[FilmListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmList = new FilmList(DSL.name(alias), this) override def as(alias: Name): FilmList = new FilmList(alias, this) - override def as(alias: Table[_]): FilmList = new FilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -155,23 +137,8 @@ extends TableImpl[FilmListRecord]( */ override def rename(name: Name): FilmList = new FilmList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmList = new FilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala index 9d12bec..8062932 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Integer import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -16,7 +15,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -91,7 +89,6 @@ extends TableImpl[FilmNotInStockRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmNotInStock = new FilmNotInStock(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): FilmNotInStock = new FilmNotInStock(alias, null, null, this, parameters) - override def as(alias: Table[_]): FilmNotInStock = new FilmNotInStock(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -103,11 +100,6 @@ extends TableImpl[FilmNotInStockRecord]( */ override def rename(name: Name): FilmNotInStock = new FilmNotInStock(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmNotInStock = new FilmNotInStock(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -134,14 +126,4 @@ extends TableImpl[FilmNotInStockRecord]( pFilmId, pStoreId ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala index 7b19cdc..6a79553 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala @@ -10,31 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -135,57 +127,8 @@ extends TableImpl[InventoryRecord]( * Get the implicit join path to the public.store table. */ lazy val store: Store = { new Store(this, Keys.INVENTORY__INVENTORY_STORE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Inventory = new Inventory(DSL.name(alias), this) override def as(alias: Name): Inventory = new Inventory(alias, this) - override def as(alias: Table[_]): Inventory = new Inventory(alias.getQualifiedName(), this) /** * Rename this table @@ -197,23 +140,8 @@ extends TableImpl[InventoryRecord]( */ override def rename(name: Name): Inventory = new Inventory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Inventory = new Inventory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala index efe8b85..4fb7bfb 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -108,7 +106,6 @@ extends TableImpl[LanguageRecord]( override def getPrimaryKey: UniqueKey[LanguageRecord] = Keys.LANGUAGE_PKEY override def as(alias: String): Language = new Language(DSL.name(alias), this) override def as(alias: Name): Language = new Language(alias, this) - override def as(alias: Table[_]): Language = new Language(alias.getQualifiedName(), this) /** * Rename this table @@ -120,23 +117,8 @@ extends TableImpl[LanguageRecord]( */ override def rename(name: Name): Language = new Language(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Language = new Language(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala index 12e07e2..e0bd774 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala @@ -9,7 +9,6 @@ import java.lang.Long import java.lang.Short import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -58,22 +56,7 @@ extends TableImpl[NicerButSlowerFilmListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { /** @@ -145,7 +128,6 @@ extends TableImpl[NicerButSlowerFilmListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): NicerButSlowerFilmList = new NicerButSlowerFilmList(DSL.name(alias), this) override def as(alias: Name): NicerButSlowerFilmList = new NicerButSlowerFilmList(alias, this) - override def as(alias: Table[_]): NicerButSlowerFilmList = new NicerButSlowerFilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -157,23 +139,8 @@ extends TableImpl[NicerButSlowerFilmListRecord]( */ override def rename(name: Name): NicerButSlowerFilmList = new NicerButSlowerFilmList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): NicerButSlowerFilmList = new NicerButSlowerFilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala index 330bac1..1114eda 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -21,19 +20,14 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -149,45 +143,8 @@ extends TableImpl[PaymentRecord]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Payment = new Payment(DSL.name(alias), this) override def as(alias: Name): Payment = new Payment(alias, this) - override def as(alias: Table[_]): Payment = new Payment(alias.getQualifiedName(), this) /** * Rename this table @@ -199,23 +156,8 @@ extends TableImpl[PaymentRecord]( */ override def rename(name: Name): Payment = new Payment(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Payment = new Payment(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala index 4021403..c7975e1 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_01Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_01Record] ] = Arrays.asList[ Check[PaymentP2007_01Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_01_payment_date_check"), "(((payment_date >= '2007-01-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-02-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_01 = new PaymentP2007_01(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_01 = new PaymentP2007_01(alias, this) - override def as(alias: Table[_]): PaymentP2007_01 = new PaymentP2007_01(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_01Record]( */ override def rename(name: Name): PaymentP2007_01 = new PaymentP2007_01(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_01 = new PaymentP2007_01(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala index 51145b1..079e218 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_02Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_02Record] ] = Arrays.asList[ Check[PaymentP2007_02Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_02_payment_date_check"), "(((payment_date >= '2007-02-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-03-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_02 = new PaymentP2007_02(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_02 = new PaymentP2007_02(alias, this) - override def as(alias: Table[_]): PaymentP2007_02 = new PaymentP2007_02(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_02Record]( */ override def rename(name: Name): PaymentP2007_02 = new PaymentP2007_02(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_02 = new PaymentP2007_02(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala index 819978b..f41149f 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_03Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_03Record] ] = Arrays.asList[ Check[PaymentP2007_03Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_03_payment_date_check"), "(((payment_date >= '2007-03-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-04-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_03 = new PaymentP2007_03(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_03 = new PaymentP2007_03(alias, this) - override def as(alias: Table[_]): PaymentP2007_03 = new PaymentP2007_03(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_03Record]( */ override def rename(name: Name): PaymentP2007_03 = new PaymentP2007_03(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_03 = new PaymentP2007_03(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala index d515730..4d82046 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_04Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_04Record] ] = Arrays.asList[ Check[PaymentP2007_04Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_04_payment_date_check"), "(((payment_date >= '2007-04-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-05-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_04 = new PaymentP2007_04(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_04 = new PaymentP2007_04(alias, this) - override def as(alias: Table[_]): PaymentP2007_04 = new PaymentP2007_04(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_04Record]( */ override def rename(name: Name): PaymentP2007_04 = new PaymentP2007_04(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_04 = new PaymentP2007_04(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala index 90854aa..db44265 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_05Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_05Record] ] = Arrays.asList[ Check[PaymentP2007_05Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_05_payment_date_check"), "(((payment_date >= '2007-05-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-06-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_05 = new PaymentP2007_05(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_05 = new PaymentP2007_05(alias, this) - override def as(alias: Table[_]): PaymentP2007_05 = new PaymentP2007_05(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_05Record]( */ override def rename(name: Name): PaymentP2007_05 = new PaymentP2007_05(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_05 = new PaymentP2007_05(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala index 741c7a3..618d1fd 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_06Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_06Record] ] = Arrays.asList[ Check[PaymentP2007_06Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_06_payment_date_check"), "(((payment_date >= '2007-06-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-07-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_06 = new PaymentP2007_06(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_06 = new PaymentP2007_06(alias, this) - override def as(alias: Table[_]): PaymentP2007_06 = new PaymentP2007_06(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_06Record]( */ override def rename(name: Name): PaymentP2007_06 = new PaymentP2007_06(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_06 = new PaymentP2007_06(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala index 5b90d05..57f1e5e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala @@ -10,38 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row7 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -162,213 +147,8 @@ extends TableImpl[RentalRecord]( * Get the implicit join path to the public.staff table. */ lazy val staff: Staff = { new Staff(this, Keys.RENTAL__RENTAL_STAFF_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def inventoryRow(): Field[InventoryRecord] = inventoryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def inventoryRow[O <: Record](subquery: (Inventory) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) override def as(alias: String): Rental = new Rental(DSL.name(alias), this) override def as(alias: Name): Rental = new Rental(alias, this) - override def as(alias: Table[_]): Rental = new Rental(alias.getQualifiedName(), this) /** * Rename this table @@ -380,23 +160,8 @@ extends TableImpl[RentalRecord]( */ override def rename(name: Name): Rental = new Rental(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Rental = new Rental(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row7[Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row7[Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala index a7afcc8..5d500c5 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala @@ -12,7 +12,6 @@ import java.lang.String import java.math.BigDecimal import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -21,7 +20,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -143,7 +141,6 @@ extends TableImpl[RewardsReportRecord]( override def getIdentity: Identity[RewardsReportRecord, Long] = super.getIdentity.asInstanceOf[ Identity[RewardsReportRecord, Long] ] override def as(alias: String): RewardsReport = new RewardsReport(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): RewardsReport = new RewardsReport(alias, null, null, this, parameters) - override def as(alias: Table[_]): RewardsReport = new RewardsReport(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -155,11 +152,6 @@ extends TableImpl[RewardsReportRecord]( */ override def rename(name: Name): RewardsReport = new RewardsReport(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): RewardsReport = new RewardsReport(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -186,14 +178,4 @@ extends TableImpl[RewardsReportRecord]( minMonthlyPurchases, minDollarAmountPurchased ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala index 2f53e4d..7672a5a 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row2 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,18 +53,7 @@ extends TableImpl[SalesByFilmCategoryRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """) + TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;") ) { /** @@ -108,7 +95,6 @@ extends TableImpl[SalesByFilmCategoryRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): SalesByFilmCategory = new SalesByFilmCategory(DSL.name(alias), this) override def as(alias: Name): SalesByFilmCategory = new SalesByFilmCategory(alias, this) - override def as(alias: Table[_]): SalesByFilmCategory = new SalesByFilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -120,23 +106,8 @@ extends TableImpl[SalesByFilmCategoryRecord]( */ override def rename(name: Name): SalesByFilmCategory = new SalesByFilmCategory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): SalesByFilmCategory = new SalesByFilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row2[String, BigDecimal] = super.fieldsRow.asInstanceOf[ Row2[String, BigDecimal] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (String, BigDecimal) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (String, BigDecimal) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala index 833d5df..b98d34e 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,21 +53,7 @@ extends TableImpl[SalesByStoreRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """) + TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;") ) { /** @@ -114,7 +98,6 @@ extends TableImpl[SalesByStoreRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): SalesByStore = new SalesByStore(DSL.name(alias), this) override def as(alias: Name): SalesByStore = new SalesByStore(alias, this) - override def as(alias: Table[_]): SalesByStore = new SalesByStore(alias.getQualifiedName(), this) /** * Rename this table @@ -126,23 +109,8 @@ extends TableImpl[SalesByStoreRecord]( */ override def rename(name: Name): SalesByStore = new SalesByStore(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): SalesByStore = new SalesByStore(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[String, String, BigDecimal] = super.fieldsRow.asInstanceOf[ Row3[String, String, BigDecimal] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (String, String, BigDecimal) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (String, String, BigDecimal) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala index f9e3304..c9f0bb6 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala @@ -11,36 +11,21 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row11 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord import org.jooq.demo.skala.db.tables.records.StaffRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -175,249 +160,8 @@ extends TableImpl[StaffRecord]( * Get the implicit join path to the public.store table. */ lazy val store: Store = { new Store(this, Keys.STAFF__STAFF_STORE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists(): Condition = storeExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists[O <: Record](subquery: (Store) => TableLike[O]): Condition = oneToManyExists(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset(): Field[Result[StoreRecord]] = storeMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset[O <: Record](subquery: (Store) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) override def as(alias: String): Staff = new Staff(DSL.name(alias), this) override def as(alias: Name): Staff = new Staff(alias, this) - override def as(alias: Table[_]): Staff = new Staff(alias.getQualifiedName(), this) /** * Rename this table @@ -429,23 +173,8 @@ extends TableImpl[StaffRecord]( */ override def rename(name: Name): Staff = new Staff(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Staff = new Staff(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row11[Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]] = super.fieldsRow.asInstanceOf[ Row11[Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala index 6109447..dd7e446 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,20 +53,7 @@ extends TableImpl[StaffListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { /** @@ -138,7 +123,6 @@ extends TableImpl[StaffListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): StaffList = new StaffList(DSL.name(alias), this) override def as(alias: Name): StaffList = new StaffList(alias, this) - override def as(alias: Table[_]): StaffList = new StaffList(alias.getQualifiedName(), this) /** * Rename this table @@ -150,23 +134,8 @@ extends TableImpl[StaffListRecord]( */ override def rename(name: Name): StaffList = new StaffList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): StaffList = new StaffList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, String, String, String, Long] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, String, String, String, Long] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala index 57a1c60..99e6fbb 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala @@ -10,31 +10,22 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -136,105 +127,8 @@ extends TableImpl[StoreRecord]( * Get the implicit join path to the public.address table. */ lazy val address: Address = { new Address(this, Keys.STORE__STORE_ADDRESS_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists(): Condition = customerExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists[O <: Record](subquery: (Customer) => TableLike[O]): Condition = oneToManyExists(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists(): Condition = inventoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists[O <: Record](subquery: (Inventory) => TableLike[O]): Condition = oneToManyExists(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists(): Condition = staffExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists[O <: Record](subquery: (Staff) => TableLike[O]): Condition = oneToManyExists(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset(): Field[Result[CustomerRecord]] = customerMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset[O <: Record](subquery: (Customer) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset(): Field[Result[InventoryRecord]] = inventoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset[O <: Record](subquery: (Inventory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset(): Field[Result[StaffRecord]] = staffMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset[O <: Record](subquery: (Staff) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) override def as(alias: String): Store = new Store(DSL.name(alias), this) override def as(alias: Name): Store = new Store(alias, this) - override def as(alias: Table[_]): Store = new Store(alias.getQualifiedName(), this) /** * Rename this table @@ -246,23 +140,8 @@ extends TableImpl[StoreRecord]( */ override def rename(name: Name): Store = new Store(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Store = new Store(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala index 4bbea05..49091ce 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala @@ -171,18 +171,19 @@ class Demo01Querying extends AbstractDemo { .fetch } - @Test - def nestedRecords(): Unit = { - title("Need all columns of those active records?") - val r = ctx - .select(CUSTOMER, CUSTOMER.address.city.country) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle - println("Customer %s %s from %s".formatted(r.value1.getFirstName, r.value1.getLastName, r.value2.getCountry)) - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// def nestedRecords(): Unit = { +// title("Need all columns of those active records?") +// val r = ctx +// .select(CUSTOMER, CUSTOMER.address.city.country) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle +// println("Customer %s %s from %s".formatted(r.value1.getFirstName, r.value1.getLastName, r.value2.getCountry)) +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test def nestedRowValuesWithAdHocConverters(): Unit = { @@ -257,28 +258,26 @@ class Demo01Querying extends AbstractDemo { case class Category(name: String) case class Film(title: String, actors: util.List[Actor], categories: util.List[Category]) - // TODO: The amount of type witnesses required in the Scala version of this method are unwieldy - // I currently do not know if this is a limitation of the Scala / Java interop or me misunderstanding which - // implicit conversions should be used here... Please feel free to suggest improvements! - val result: util.List[Film] = ctx - .select( - FILM.TITLE, - multiset( - select(row(FILM_ACTOR.actor.FIRST_NAME, FILM_ACTOR.actor.LAST_NAME).mapping(Name(_, _))) - .from(FILM_ACTOR) - .where(FILM_ACTOR.FILM_ID.eq(FILM.FILM_ID))).mapping(Actor), - multiset( - select(FILM_CATEGORY.category.NAME) - .from(FILM_CATEGORY) - .where(FILM_CATEGORY.FILM_ID.eq(FILM.FILM_ID))).mapping(Category)) - .from(FILM) - .orderBy(FILM.TITLE) - .limit(5) - .fetch(Film) - - result.forEach { film => - println("Film %s with categories %s and actors %s ".formatted(film.title, film.categories, film.actors)) - } + // Some implicit classes used in this example are available in jOOQ 3.17, only +// val result: util.List[Film] = ctx +// .select( +// FILM.TITLE, +// multiset( +// select(row(FILM_ACTOR.actor.FIRST_NAME, FILM_ACTOR.actor.LAST_NAME).mapping(Name(_, _))) +// .from(FILM_ACTOR) +// .where(FILM_ACTOR.FILM_ID.eq(FILM.FILM_ID))).mapping(Actor), +// multiset( +// select(FILM_CATEGORY.category.NAME) +// .from(FILM_CATEGORY) +// .where(FILM_CATEGORY.FILM_ID.eq(FILM.FILM_ID))).mapping(Category)) +// .from(FILM) +// .orderBy(FILM.TITLE) +// .limit(5) +// .fetch(Film) +// +// result.forEach { film => +// println("Film %s with categories %s and actors %s ".formatted(film.title, film.categories, film.actors)) +// } // Try modifying the records and see what needs to be done to get the query to compile again } @@ -287,22 +286,23 @@ class Demo01Querying extends AbstractDemo { title("Arbitrary nested data structures are possible") case class Film(title: String, revenue: util.Map[LocalDate, BigDecimal]) - val result = ctx - .select( - FILM.TITLE, - multiset( - select(PAYMENT.PAYMENT_DATE.cast(LOCALDATE), sum(PAYMENT.AMOUNT)) - .from(PAYMENT) - .groupBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE)) - .orderBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE))).intoMap()) - .from(FILM) - .orderBy(FILM.TITLE) - .fetch(Film) - - result.forEach { film: Film => - println("") - println("Film %s with revenue: ".formatted(film.title)) - film.revenue.forEach((d: LocalDate, r: BigDecimal) => println(" %s: %s".formatted(d, r))) - } + // Some implicit classes used in this example are available in jOOQ 3.17, only +// val result = ctx +// .select( +// FILM.TITLE, +// multiset( +// select(PAYMENT.PAYMENT_DATE.cast(LOCALDATE), sum(PAYMENT.AMOUNT)) +// .from(PAYMENT) +// .groupBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE)) +// .orderBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE))).intoMap()) +// .from(FILM) +// .orderBy(FILM.TITLE) +// .fetch(Film) +// +// result.forEach { film: Film => +// println("") +// println("Film %s with revenue: ".formatted(film.title)) +// film.revenue.forEach((d: LocalDate, r: BigDecimal) => println(" %s: %s".formatted(d, r))) +// } } } diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala index 6c2e9ea..8eb8a2d 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala @@ -30,13 +30,14 @@ class Demo11QueryObjectModel extends AbstractDemo { println("FROM : " + select.$from) println("WHERE : " + select.$where) - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") - println(select - .$select(List(ACTOR.ACTOR_ID) ++ select.$select) - .$orderBy(List(ACTOR.ACTOR_ID.asc))) - - title("The old query is untouched:") - println(select) + // Available in jOOQ 3.17 only +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") +// println(select +// .$select(List(ACTOR.ACTOR_ID) ++ select.$select) +// .$orderBy(List(ACTOR.ACTOR_ID.asc))) +// +// title("The old query is untouched:") +// println(select) } @Test @@ -107,9 +108,10 @@ class Demo11QueryObjectModel extends AbstractDemo { - } + } +// diff --git a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala index af2b96a..69d24d0 100644 --- a/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala +++ b/jOOQ-demo-oss/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala @@ -39,46 +39,47 @@ class Demo13Reactive extends AbstractDemo { .forEach(println(_)) } - @Test - def reactiveTransactions(): Unit = { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher(c => Flux - .from(c.dsl - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")))) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList - .doOnError { _.printStackTrace() } - .onErrorReturn(List.of()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx - .select(ACTOR.ACTOR_ID) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .collectList - .block - .forEach(println(_)) - } + // Available in jOOQ 3.17 only +// @Test +// def reactiveTransactions(): Unit = { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher(c => Flux +// .from(c.dsl +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")))) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList +// .doOnError { _.printStackTrace() } +// .onErrorReturn(List.of()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx +// .select(ACTOR.ACTOR_ID) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .collectList +// .block +// .forEach(println(_)) +// } @After override def teardown(): Unit = { diff --git a/jOOQ-demo-oss/jOOQ-demo-utils/pom.xml b/jOOQ-demo-oss/jOOQ-demo-utils/pom.xml index f4e39fb..5e9cbdc 100644 --- a/jOOQ-demo-oss/jOOQ-demo-utils/pom.xml +++ b/jOOQ-demo-oss/jOOQ-demo-utils/pom.xml @@ -6,7 +6,7 @@ org.jooq jooq-demo - 0.9.0 + 3.16.6 jooq-demo-utils diff --git a/jOOQ-demo-oss/pom.xml b/jOOQ-demo-oss/pom.xml index caa1c86..15165c6 100644 --- a/jOOQ-demo-oss/pom.xml +++ b/jOOQ-demo-oss/pom.xml @@ -5,7 +5,7 @@ org.jooq jooq-demo - 0.9.0 + 3.16.6 jOOQ Demo (Open Source Edition) pom @@ -19,8 +19,7 @@ UTF-8 - 3.17.0-SNAPSHOT - 0.9.0 + 3.16.6 8.5.11 42.3.4 2.17.1 @@ -48,7 +47,7 @@ org.jooq jooq-demo-utils - ${jooq.demo.version} + ${jooq.version} diff --git a/jOOQ-demo-pro/jOOQ-demo-java/pom.xml b/jOOQ-demo-pro/jOOQ-demo-java/pom.xml index 83dc078..022a4ef 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/pom.xml +++ b/jOOQ-demo-pro/jOOQ-demo-java/pom.xml @@ -6,7 +6,7 @@ org.jooq.trial jooq-demo - 0.9.0 + 3.16.6 jooq-demo-java diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java index 10feac3..69df488 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/DefaultCatalog.java @@ -45,10 +45,10 @@ public final List getSchemas() { } /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference + * release, namely: 3.16. You can turn off the generation of this reference * by specifying /configuration/generator/generate/jooqVersionReference */ - private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17; + private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16; } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java index 3b988c8..16423a7 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Actor.java @@ -7,32 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.ActorRecord; -import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -132,72 +123,6 @@ public UniqueKey getPrimaryKey() { return Keys.ACTOR_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists() { - return filmActorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists(Function> subquery) { - return oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists() { - return filmExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists(Function> subquery) { - return manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset() { - return filmActorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset() { - return filmMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public Actor as(String alias) { return new Actor(DSL.name(alias), this); @@ -208,11 +133,6 @@ public Actor as(Name alias) { return new Actor(alias, this); } - @Override - public Actor as(Table alias) { - return new Actor(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -229,14 +149,6 @@ public Actor rename(Name name) { return new Actor(name, null); } - /** - * Rename this table - */ - @Override - public Actor rename(Table name) { - return new Actor(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -245,18 +157,4 @@ public Actor rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java index c2727b3..fe05c12 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/ActorInfo.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -71,22 +66,7 @@ private ActorInfo(Name alias, Table aliased) { } private ActorInfo(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;")); } /** @@ -129,11 +109,6 @@ public ActorInfo as(Name alias) { return new ActorInfo(alias, this); } - @Override - public ActorInfo as(Table alias) { - return new ActorInfo(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -150,14 +125,6 @@ public ActorInfo rename(Name name) { return new ActorInfo(name, null); } - /** - * Rename this table - */ - @Override - public ActorInfo rename(Table name) { - return new ActorInfo(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -166,18 +133,4 @@ public ActorInfo rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java index 76872c1..fc7bb14 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Address.java @@ -7,34 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.CityRecord; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -171,118 +160,6 @@ public City city() { return _city; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists() { - return customerExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists(Function> subquery) { - return oneToManyExists(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists() { - return staffExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists(Function> subquery) { - return oneToManyExists(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists() { - return storeExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists(Function> subquery) { - return oneToManyExists(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - public Field cityRow() { - return cityRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - public Field cityRow(Function> subquery) { - return toOneRow(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((City) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset() { - return customerMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset() { - return staffMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset() { - return storeMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Store) t)); - } - @Override public Address as(String alias) { return new Address(DSL.name(alias), this); @@ -293,11 +170,6 @@ public Address as(Name alias) { return new Address(alias, this); } - @Override - public Address as(Table alias) { - return new Address(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -314,14 +186,6 @@ public Address rename(Name name) { return new Address(name, null); } - /** - * Rename this table - */ - @Override - public Address rename(Table name) { - return new Address(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -330,18 +194,4 @@ public Address rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java index d0b25fc..8a2d01b 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Category.java @@ -5,30 +5,21 @@ import java.time.LocalDateTime; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.tables.records.CategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -118,72 +109,6 @@ public UniqueKey getPrimaryKey() { return Keys.CATEGORY_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists() { - return filmCategoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists(Function> subquery) { - return oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists() { - return filmExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - public Condition filmExists(Function> subquery) { - return manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset() { - return filmCategoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset() { - return filmMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - public Field> filmMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public Category as(String alias) { return new Category(DSL.name(alias), this); @@ -194,11 +119,6 @@ public Category as(Name alias) { return new Category(alias, this); } - @Override - public Category as(Table alias) { - return new Category(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -215,14 +135,6 @@ public Category rename(Name name) { return new Category(name, null); } - /** - * Rename this table - */ - @Override - public Category rename(Table name) { - return new Category(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -231,18 +143,4 @@ public Category rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java index 7972aaa..5ae57f9 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/City.java @@ -7,32 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; import org.jooq.demo.java.db.tables.records.CityRecord; -import org.jooq.demo.java.db.tables.records.CountryRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -149,54 +140,6 @@ public Country country() { return _country; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - public Condition addressExists() { - return addressExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - public Condition addressExists(Function> subquery) { - return oneToManyExists(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - public Field countryRow() { - return countryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - public Field countryRow(Function> subquery) { - return toOneRow(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((Country) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - public Field> addressMultiset() { - return addressMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - public Field> addressMultiset(Function> subquery) { - return oneToManyMultiset(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, t -> subquery.apply((Address) t)); - } - @Override public City as(String alias) { return new City(DSL.name(alias), this); @@ -207,11 +150,6 @@ public City as(Name alias) { return new City(alias, this); } - @Override - public City as(Table alias) { - return new City(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -228,14 +166,6 @@ public City rename(Name name) { return new City(name, null); } - /** - * Rename this table - */ - @Override - public City rename(Table name) { - return new City(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -244,18 +174,4 @@ public City rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java index bbbb693..37a1dc5 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Country.java @@ -5,28 +5,20 @@ import java.time.LocalDateTime; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CityRecord; import org.jooq.demo.java.db.tables.records.CountryRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; @@ -117,38 +109,6 @@ public UniqueKey getPrimaryKey() { return Keys.COUNTRY_PKEY; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - public Condition cityExists() { - return cityExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - public Condition cityExists(Function> subquery) { - return oneToManyExists(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((City) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - public Field> cityMultiset() { - return cityMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - public Field> cityMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CITY__CITY_COUNTRY_ID_FKEY, t -> subquery.apply((City) t)); - } - @Override public Country as(String alias) { return new Country(DSL.name(alias), this); @@ -159,11 +119,6 @@ public Country as(Name alias) { return new Country(alias, this); } - @Override - public Country as(Table alias) { - return new Country(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -180,14 +135,6 @@ public Country rename(Name name) { return new Country(name, null); } - /** - * Rename this table - */ - @Override - public Country rename(Table name) { - return new Country(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -196,18 +143,4 @@ public Country rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java index 9a524fc..1c1a181 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Customer.java @@ -8,40 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function10; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row10; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -199,306 +182,6 @@ public Address address() { return _address; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Customer as(String alias) { return new Customer(DSL.name(alias), this); @@ -509,11 +192,6 @@ public Customer as(Name alias) { return new Customer(alias, this); } - @Override - public Customer as(Table alias) { - return new Customer(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -530,14 +208,6 @@ public Customer rename(Name name) { return new Customer(name, null); } - /** - * Rename this table - */ - @Override - public Customer rename(Table name) { - return new Customer(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -546,18 +216,4 @@ public Customer rename(Table name) { public Row10 fieldsRow() { return (Row10) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function10 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function10 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java index 7ded9ed..e78bf0e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/CustomerList.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function9; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row9; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,24 +91,7 @@ private CustomerList(Name alias, Table aliased) { } private CustomerList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));")); } /** @@ -156,11 +134,6 @@ public CustomerList as(Name alias) { return new CustomerList(alias, this); } - @Override - public CustomerList as(Table alias) { - return new CustomerList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -177,14 +150,6 @@ public CustomerList rename(Name name) { return new CustomerList(name, null); } - /** - * Rename this table - */ - @Override - public CustomerList rename(Table name) { - return new CustomerList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- @@ -193,18 +158,4 @@ public CustomerList rename(Table name) { public Row9 fieldsRow() { return (Row9) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function9 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function9 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java index 9c67c30..c5d433f 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Film.java @@ -8,37 +8,24 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function14; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row14; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; import org.jooq.demo.java.db.enums.MpaaRating; -import org.jooq.demo.java.db.tables.records.ActorRecord; -import org.jooq.demo.java.db.tables.records.CategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; import org.jooq.demo.java.db.tables.records.FilmRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.LanguageRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -224,202 +211,6 @@ public Language filmOriginalLanguageIdFkey() { return _filmOriginalLanguageIdFkey; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists() { - return filmActorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - public Condition filmActorExists(Function> subquery) { - return oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists() { - return filmCategoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - public Condition filmCategoryExists(Function> subquery) { - return oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists() { - return inventoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists(Function> subquery) { - return oneToManyExists(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - public Condition actorExists() { - return actorExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - public Condition actorExists(Function> subquery) { - return manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - public Condition categoryExists() { - return categoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - public Condition categoryExists(Function> subquery) { - return manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmLanguageIdFkeyRow() { - return filmLanguageIdFkeyRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmLanguageIdFkeyRow(Function> subquery) { - return toOneRow(Keys.FILM__FILM_LANGUAGE_ID_FKEY, t -> subquery.apply((Language) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmOriginalLanguageIdFkeyRow() { - return filmOriginalLanguageIdFkeyRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - public Field filmOriginalLanguageIdFkeyRow(Function> subquery) { - return toOneRow(Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, t -> subquery.apply((Language) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset() { - return filmActorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - public Field> filmActorMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((FilmActor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset() { - return filmCategoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - public Field> filmCategoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((FilmCategory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset() { - return inventoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - public Field> actorMultiset() { - return actorMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - public Field> actorMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - public Field> categoryMultiset() { - return categoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - public Field> categoryMultiset(Function> subquery) { - return manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - @Override public Film as(String alias) { return new Film(DSL.name(alias), this); @@ -430,11 +221,6 @@ public Film as(Name alias) { return new Film(alias, this); } - @Override - public Film as(Table alias) { - return new Film(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -451,14 +237,6 @@ public Film rename(Name name) { return new Film(name, null); } - /** - * Rename this table - */ - @Override - public Film rename(Table name) { - return new Film(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- @@ -467,18 +245,4 @@ public Film rename(Table name) { public Row14 fieldsRow() { return (Row14) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function14 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function14 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java index 9686a2b..b9e8b79 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmActor.java @@ -7,29 +7,22 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.ActorRecord; import org.jooq.demo.java.db.tables.records.FilmActorRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -147,38 +140,6 @@ public Film film() { return _film; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field actorRow() { - return actorRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field actorRow(Function> subquery) { - return toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, t -> subquery.apply((Actor) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - @Override public FilmActor as(String alias) { return new FilmActor(DSL.name(alias), this); @@ -189,11 +150,6 @@ public FilmActor as(Name alias) { return new FilmActor(alias, this); } - @Override - public FilmActor as(Table alias) { - return new FilmActor(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -210,14 +166,6 @@ public FilmActor rename(Name name) { return new FilmActor(name, null); } - /** - * Rename this table - */ - @Override - public FilmActor rename(Table name) { - return new FilmActor(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -226,18 +174,4 @@ public FilmActor rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java index 97e58ea..268cb45 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmCategory.java @@ -7,27 +7,20 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CategoryRecord; import org.jooq.demo.java.db.tables.records.FilmCategoryRecord; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -140,38 +133,6 @@ public Category category() { return _category; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field categoryRow() { - return categoryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - public Field categoryRow(Function> subquery) { - return toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, t -> subquery.apply((Category) t)); - } - @Override public FilmCategory as(String alias) { return new FilmCategory(DSL.name(alias), this); @@ -182,11 +143,6 @@ public FilmCategory as(Name alias) { return new FilmCategory(alias, this); } - @Override - public FilmCategory as(Table alias) { - return new FilmCategory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -203,14 +159,6 @@ public FilmCategory rename(Name name) { return new FilmCategory(name, null); } - /** - * Rename this table - */ - @Override - public FilmCategory rename(Table name) { - return new FilmCategory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -219,18 +167,4 @@ public FilmCategory rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java index 7fa9654..8c1d6d8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmInStock.java @@ -4,15 +4,10 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row1; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,11 +91,6 @@ public FilmInStock as(Name alias) { return new FilmInStock(alias, this, parameters); } - @Override - public FilmInStock as(Table alias) { - return new FilmInStock(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -117,14 +107,6 @@ public FilmInStock rename(Name name) { return new FilmInStock(name, null, parameters); } - /** - * Rename this table - */ - @Override - public FilmInStock rename(Table name) { - return new FilmInStock(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -163,18 +145,4 @@ public FilmInStock call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function1 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function1 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java index 3ee9fad..0c6a49c 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmList.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -93,22 +89,7 @@ private FilmList(Name alias, Table aliased) { } private FilmList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;")); } /** @@ -151,11 +132,6 @@ public FilmList as(Name alias) { return new FilmList(alias, this); } - @Override - public FilmList as(Table alias) { - return new FilmList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -172,14 +148,6 @@ public FilmList rename(Name name) { return new FilmList(name, null); } - /** - * Rename this table - */ - @Override - public FilmList rename(Table name) { - return new FilmList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -188,18 +156,4 @@ public FilmList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java index e0d2437..5da3ab0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/FilmNotInStock.java @@ -4,15 +4,10 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; -import org.jooq.Function1; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row1; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -96,11 +91,6 @@ public FilmNotInStock as(Name alias) { return new FilmNotInStock(alias, this, parameters); } - @Override - public FilmNotInStock as(Table alias) { - return new FilmNotInStock(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -117,14 +107,6 @@ public FilmNotInStock rename(Name name) { return new FilmNotInStock(name, null, parameters); } - /** - * Rename this table - */ - @Override - public FilmNotInStock rename(Table name) { - return new FilmNotInStock(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -163,18 +145,4 @@ public FilmNotInStock call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function1 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function1 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java index f82eb1c..fa2bd94 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Inventory.java @@ -7,33 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.FilmRecord; import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -161,70 +151,6 @@ public Store store() { return _store; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field filmRow() { - return filmRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field filmRow(Function> subquery) { - return toOneRow(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, t -> subquery.apply((Film) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Inventory as(String alias) { return new Inventory(DSL.name(alias), this); @@ -235,11 +161,6 @@ public Inventory as(Name alias) { return new Inventory(alias, this); } - @Override - public Inventory as(Table alias) { - return new Inventory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -256,14 +177,6 @@ public Inventory rename(Name name) { return new Inventory(name, null); } - /** - * Rename this table - */ - @Override - public Inventory rename(Table name) { - return new Inventory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -272,18 +185,4 @@ public Inventory rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java index 421baec..bb01e45 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Language.java @@ -5,18 +5,14 @@ import java.time.LocalDateTime; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -123,11 +119,6 @@ public Language as(Name alias) { return new Language(alias, this); } - @Override - public Language as(Table alias) { - return new Language(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -144,14 +135,6 @@ public Language rename(Name name) { return new Language(name, null); } - /** - * Rename this table - */ - @Override - public Language rename(Table name) { - return new Language(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -160,18 +143,4 @@ public Language rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java index 8b3dd86..7f7ae0e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/NicerButSlowerFilmList.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -93,22 +89,7 @@ private NicerButSlowerFilmList(Name alias, Table a } private NicerButSlowerFilmList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;")); } /** @@ -153,11 +134,6 @@ public NicerButSlowerFilmList as(Name alias) { return new NicerButSlowerFilmList(alias, this); } - @Override - public NicerButSlowerFilmList as(Table alias) { - return new NicerButSlowerFilmList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -174,14 +150,6 @@ public NicerButSlowerFilmList rename(Name name) { return new NicerButSlowerFilmList(name, null); } - /** - * Rename this table - */ - @Override - public NicerButSlowerFilmList rename(Table name) { - return new NicerButSlowerFilmList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -190,18 +158,4 @@ public NicerButSlowerFilmList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java index de30a5b..ff32b5b 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Payment.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -181,54 +173,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public Payment as(String alias) { return new Payment(DSL.name(alias), this); @@ -239,11 +183,6 @@ public Payment as(Name alias) { return new Payment(alias, this); } - @Override - public Payment as(Table alias) { - return new Payment(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -260,14 +199,6 @@ public Payment rename(Name name) { return new Payment(name, null); } - /** - * Rename this table - */ - @Override - public Payment rename(Table name) { - return new Payment(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -276,18 +207,4 @@ public Payment rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java index 2f70f25..ea1091f 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_01.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_01 as(Name alias) { return new PaymentP2007_01(alias, this); } - @Override - public PaymentP2007_01 as(Table alias) { - return new PaymentP2007_01(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_01 rename(Name name) { return new PaymentP2007_01(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_01 rename(Table name) { - return new PaymentP2007_01(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_01 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java index a7819e2..7eb4846 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_02.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_02 as(Name alias) { return new PaymentP2007_02(alias, this); } - @Override - public PaymentP2007_02 as(Table alias) { - return new PaymentP2007_02(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_02 rename(Name name) { return new PaymentP2007_02(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_02 rename(Table name) { - return new PaymentP2007_02(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_02 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java index 5e7e72f..3ab5cef 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_03.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_03 as(Name alias) { return new PaymentP2007_03(alias, this); } - @Override - public PaymentP2007_03 as(Table alias) { - return new PaymentP2007_03(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_03 rename(Name name) { return new PaymentP2007_03(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_03 rename(Table name) { - return new PaymentP2007_03(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_03 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java index 311ef5b..32d8402 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_04.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_04 as(Name alias) { return new PaymentP2007_04(alias, this); } - @Override - public PaymentP2007_04 as(Table alias) { - return new PaymentP2007_04(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_04 rename(Name name) { return new PaymentP2007_04(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_04 rename(Table name) { - return new PaymentP2007_04(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_04 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java index 8883072..658f780 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_05.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_05 as(Name alias) { return new PaymentP2007_05(alias, this); } - @Override - public PaymentP2007_05 as(Table alias) { - return new PaymentP2007_05(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_05 rename(Name name) { return new PaymentP2007_05(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_05 rename(Table name) { - return new PaymentP2007_05(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_05 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java index 3e66b97..375057a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/PaymentP2007_06.java @@ -8,31 +8,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; import org.jooq.Check; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function6; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row6; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.Internal; import org.jooq.impl.SQLDataType; @@ -177,54 +169,6 @@ public Rental rental() { return _rental; } - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field rentalRow() { - return rentalRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - public Field rentalRow(Function> subquery) { - return toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((Rental) t)); - } - @Override public List> getChecks() { return Arrays.asList( @@ -242,11 +186,6 @@ public PaymentP2007_06 as(Name alias) { return new PaymentP2007_06(alias, this); } - @Override - public PaymentP2007_06 as(Table alias) { - return new PaymentP2007_06(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -263,14 +202,6 @@ public PaymentP2007_06 rename(Name name) { return new PaymentP2007_06(name, null); } - /** - * Rename this table - */ - @Override - public PaymentP2007_06 rename(Table name) { - return new PaymentP2007_06(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- @@ -279,18 +210,4 @@ public PaymentP2007_06 rename(Table name) { public Row6 fieldsRow() { return (Row6) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function6 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function6 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java index f8964dc..1203160 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Rental.java @@ -7,40 +7,23 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function7; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row7; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; import org.jooq.demo.java.db.tables.records.RentalRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -194,290 +177,6 @@ public Staff staff() { return _staff; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field inventoryRow() { - return inventoryRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field inventoryRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field customerRow() { - return customerRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field customerRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - @Override public Rental as(String alias) { return new Rental(DSL.name(alias), this); @@ -488,11 +187,6 @@ public Rental as(Name alias) { return new Rental(alias, this); } - @Override - public Rental as(Table alias) { - return new Rental(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -509,14 +203,6 @@ public Rental rename(Name name) { return new Rental(name, null); } - /** - * Rename this table - */ - @Override - public Rental rename(Table name) { - return new Rental(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- @@ -525,18 +211,4 @@ public Rental rename(Table name) { public Row7 fieldsRow() { return (Row7) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function7 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function7 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java index 6e184f5..21191b4 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/RewardsReport.java @@ -7,16 +7,12 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.function.Function; import org.jooq.Field; -import org.jooq.Function10; import org.jooq.Identity; import org.jooq.Name; -import org.jooq.Records; import org.jooq.Row10; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -150,11 +146,6 @@ public RewardsReport as(Name alias) { return new RewardsReport(alias, this, parameters); } - @Override - public RewardsReport as(Table alias) { - return new RewardsReport(alias.getQualifiedName(), this, parameters); - } - /** * Rename this table */ @@ -171,14 +162,6 @@ public RewardsReport rename(Name name) { return new RewardsReport(name, null, parameters); } - /** - * Rename this table - */ - @Override - public RewardsReport rename(Table name) { - return new RewardsReport(name.getQualifiedName(), null, parameters); - } - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -217,18 +200,4 @@ public RewardsReport call( return aliased() ? result.as(getUnqualifiedName()) : result; } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function10 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function10 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java index f7a73f2..b397cea 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByFilmCategory.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function2; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row2; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -62,18 +58,7 @@ private SalesByFilmCategory(Name alias, Table aliased } private SalesByFilmCategory(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;")); } /** @@ -118,11 +103,6 @@ public SalesByFilmCategory as(Name alias) { return new SalesByFilmCategory(alias, this); } - @Override - public SalesByFilmCategory as(Table alias) { - return new SalesByFilmCategory(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -139,14 +119,6 @@ public SalesByFilmCategory rename(Name name) { return new SalesByFilmCategory(name, null); } - /** - * Rename this table - */ - @Override - public SalesByFilmCategory rename(Table name) { - return new SalesByFilmCategory(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- @@ -155,18 +127,4 @@ public SalesByFilmCategory rename(Table name) { public Row2 fieldsRow() { return (Row2) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function2 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function2 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java index 3593130..9102533 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/SalesByStore.java @@ -5,17 +5,13 @@ import java.math.BigDecimal; -import java.util.function.Function; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function3; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row3; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -67,21 +63,7 @@ private SalesByStore(Name alias, Table aliased) { } private SalesByStore(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;")); } /** @@ -124,11 +106,6 @@ public SalesByStore as(Name alias) { return new SalesByStore(alias, this); } - @Override - public SalesByStore as(Table alias) { - return new SalesByStore(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -145,14 +122,6 @@ public SalesByStore rename(Name name) { return new SalesByStore(name, null); } - /** - * Rename this table - */ - @Override - public SalesByStore rename(Table name) { - return new SalesByStore(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- @@ -161,18 +130,4 @@ public SalesByStore rename(Table name) { public Row3 fieldsRow() { return (Row3) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function3 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function3 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java index 19e363d..34d48da 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Staff.java @@ -7,38 +7,21 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function11; import org.jooq.Identity; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row11; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.PaymentP2007_01Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_02Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_03Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_04Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_05Record; -import org.jooq.demo.java.db.tables.records.PaymentP2007_06Record; -import org.jooq.demo.java.db.tables.records.PaymentRecord; -import org.jooq.demo.java.db.tables.records.RentalRecord; import org.jooq.demo.java.db.tables.records.StaffRecord; -import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; import org.jooq.impl.TableImpl; @@ -196,338 +179,6 @@ public Store store() { return _store; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists() { - return paymentExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - public Condition paymentExists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists() { - return paymentP2007_01Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - public Condition paymentP2007_01Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists() { - return paymentP2007_02Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - public Condition paymentP2007_02Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists() { - return paymentP2007_03Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - public Condition paymentP2007_03Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists() { - return paymentP2007_04Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - public Condition paymentP2007_04Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists() { - return paymentP2007_05Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - public Condition paymentP2007_05Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists() { - return paymentP2007_06Exists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - public Condition paymentP2007_06Exists(Function> subquery) { - return oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists() { - return rentalExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - public Condition rentalExists(Function> subquery) { - return oneToManyExists(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists() { - return storeExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - public Condition storeExists(Function> subquery) { - return oneToManyExists(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field storeRow() { - return storeRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - public Field storeRow(Function> subquery) { - return toOneRow(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Store) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset() { - return paymentMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - public Field> paymentMultiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, t -> subquery.apply((Payment) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset() { - return paymentP2007_01Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - public Field> paymentP2007_01Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_01) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset() { - return paymentP2007_02Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - public Field> paymentP2007_02Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_02) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset() { - return paymentP2007_03Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - public Field> paymentP2007_03Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_03) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset() { - return paymentP2007_04Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - public Field> paymentP2007_04Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_04) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset() { - return paymentP2007_05Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - public Field> paymentP2007_05Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_05) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset() { - return paymentP2007_06Multiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - public Field> paymentP2007_06Multiset(Function> subquery) { - return oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, t -> subquery.apply((PaymentP2007_06) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset() { - return rentalMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - public Field> rentalMultiset(Function> subquery) { - return oneToManyMultiset(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, t -> subquery.apply((Rental) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset() { - return storeMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - public Field> storeMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Store) t)); - } - @Override public Staff as(String alias) { return new Staff(DSL.name(alias), this); @@ -538,11 +189,6 @@ public Staff as(Name alias) { return new Staff(alias, this); } - @Override - public Staff as(Table alias) { - return new Staff(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -559,14 +205,6 @@ public Staff rename(Name name) { return new Staff(name, null); } - /** - * Rename this table - */ - @Override - public Staff rename(Table name) { - return new Staff(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- @@ -575,18 +213,4 @@ public Staff rename(Table name) { public Row11 fieldsRow() { return (Row11) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function11 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function11 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java index 9e10fde..17af429 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/StaffList.java @@ -4,17 +4,12 @@ package org.jooq.demo.java.db.tables; -import java.util.function.Function; - import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function8; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; import org.jooq.Row8; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; import org.jooq.TableOptions; @@ -91,20 +86,7 @@ private StaffList(Name alias, Table aliased) { } private StaffList(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """)); + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));")); } /** @@ -147,11 +129,6 @@ public StaffList as(Name alias) { return new StaffList(alias, this); } - @Override - public StaffList as(Table alias) { - return new StaffList(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -168,14 +145,6 @@ public StaffList rename(Name name) { return new StaffList(name, null); } - /** - * Rename this table - */ - @Override - public StaffList rename(Table name) { - return new StaffList(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- @@ -184,18 +153,4 @@ public StaffList rename(Table name) { public Row8 fieldsRow() { return (Row8) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function8 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function8 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java index 0e776e6..85a37ad 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/Store.java @@ -7,33 +7,22 @@ import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; -import java.util.function.Function; -import org.jooq.Condition; import org.jooq.Field; import org.jooq.ForeignKey; -import org.jooq.Function4; import org.jooq.Identity; import org.jooq.Index; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Records; -import org.jooq.Result; import org.jooq.Row4; import org.jooq.Schema; -import org.jooq.SelectField; import org.jooq.Table; import org.jooq.TableField; -import org.jooq.TableLike; import org.jooq.TableOptions; import org.jooq.UniqueKey; import org.jooq.demo.java.db.Indexes; import org.jooq.demo.java.db.Keys; import org.jooq.demo.java.db.Public; -import org.jooq.demo.java.db.tables.records.AddressRecord; -import org.jooq.demo.java.db.tables.records.CustomerRecord; -import org.jooq.demo.java.db.tables.records.InventoryRecord; -import org.jooq.demo.java.db.tables.records.StaffRecord; import org.jooq.demo.java.db.tables.records.StoreRecord; import org.jooq.impl.DSL; import org.jooq.impl.SQLDataType; @@ -162,134 +151,6 @@ public Address address() { return _address; } - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists() { - return customerExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - public Condition customerExists(Function> subquery) { - return oneToManyExists(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists() { - return inventoryExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - public Condition inventoryExists(Function> subquery) { - return oneToManyExists(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists() { - return staffExists(Function.identity()); - } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - public Condition staffExists(Function> subquery) { - return oneToManyExists(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field staffRow() { - return staffRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field staffRow(Function> subquery) { - return toOneRow(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, t -> subquery.apply((Staff) t)); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field addressRow() { - return addressRow(Function.identity()); - } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - public Field addressRow(Function> subquery) { - return toOneRow(Keys.STORE__STORE_ADDRESS_ID_FKEY, t -> subquery.apply((Address) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset() { - return customerMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - public Field> customerMultiset(Function> subquery) { - return oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, t -> subquery.apply((Customer) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset() { - return inventoryMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - public Field> inventoryMultiset(Function> subquery) { - return oneToManyMultiset(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, t -> subquery.apply((Inventory) t)); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset() { - return staffMultiset(Function.identity()); - } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - public Field> staffMultiset(Function> subquery) { - return oneToManyMultiset(Keys.STAFF__STAFF_STORE_ID_FKEY, t -> subquery.apply((Staff) t)); - } - @Override public Store as(String alias) { return new Store(DSL.name(alias), this); @@ -300,11 +161,6 @@ public Store as(Name alias) { return new Store(alias, this); } - @Override - public Store as(Table alias) { - return new Store(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -321,14 +177,6 @@ public Store rename(Name name) { return new Store(name, null); } - /** - * Rename this table - */ - @Override - public Store rename(Table name) { - return new Store(name.getQualifiedName(), null); - } - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- @@ -337,18 +185,4 @@ public Store rename(Table name) { public Row4 fieldsRow() { return (Row4) super.fieldsRow(); } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - public SelectField mapping(Function4 from) { - return convertFrom(Records.mapping(from)); - } - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - public SelectField mapping(Class toType, Function4 from) { - return convertFrom(toType, Records.mapping(from)); - } } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java index 71f5ab2..b3a3d46 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Actor.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Actor( - Long actorId, - String firstName, - String lastName, + Long actorId, + String firstName, + String lastName, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java index e476bf5..1440762 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/ActorInfo.java @@ -12,7 +12,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record ActorInfo( - Long actorId, + Long actorId, String firstName, String lastName, String filmInfo diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java index 4cd5ee3..5056e3e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Address.java @@ -13,13 +13,13 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Address( - Long addressId, - String address, - String address2, - String district, - Long cityId, - String postalCode, - String phone, + Long addressId, + String address, + String address2, + String district, + Long cityId, + String postalCode, + String phone, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java index 03e9fb7..49ed198 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Category.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Category( - Long categoryId, - String name, + Long categoryId, + String name, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java index afe3f14..091c476 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/City.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record City( - Long cityId, - String city, - Long countryId, + Long cityId, + String city, + Long countryId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java index 2cb1df2..7d3cc52 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Country.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Country( - Long countryId, - String country, + Long countryId, + String country, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java index 567642e..2b23d00 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Customer.java @@ -14,16 +14,16 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Customer( - Long customerId, - Long storeId, - String firstName, - String lastName, - String email, - Long addressId, - Boolean activebool, - LocalDate createDate, + Long customerId, + Long storeId, + String firstName, + String lastName, + String email, + Long addressId, + Boolean activebool, + LocalDate createDate, LocalDateTime lastUpdate, - Integer active + Integer active ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java index 69cea41..58eea63 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/CustomerList.java @@ -12,7 +12,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record CustomerList( - Long id, + Long id, String name, String address, String zipCode, @@ -20,7 +20,7 @@ public record CustomerList( String city, String country, String notes, - Long sid + Long sid ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java index 227e651..2ff44c6 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Film.java @@ -16,20 +16,20 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Film( - Long filmId, - String title, - String description, - Integer releaseYear, - Long languageId, - Long originalLanguageId, - Short rentalDuration, - BigDecimal rentalRate, - Short length, - BigDecimal replacementCost, - MpaaRating rating, + Long filmId, + String title, + String description, + Integer releaseYear, + Long languageId, + Long originalLanguageId, + Short rentalDuration, + BigDecimal rentalRate, + Short length, + BigDecimal replacementCost, + MpaaRating rating, LocalDateTime lastUpdate, - String[] specialFeatures, - Object fulltext + String[] specialFeatures, + Object fulltext ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java index 27d5d80..858eabf 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmActor.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmActor( - Long actorId, - Long filmId, + Long actorId, + Long filmId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java index 71eb7eb..0825708 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmCategory.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmCategory( - Long filmId, - Long categoryId, + Long filmId, + Long categoryId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java index 11ba5c5..7addd51 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/FilmList.java @@ -15,14 +15,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record FilmList( - Long fid, - String title, - String description, - String category, + Long fid, + String title, + String description, + String category, BigDecimal price, - Short length, + Short length, MpaaRating rating, - String actors + String actors ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java index 80c696d..25da4e1 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Inventory.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Inventory( - Long inventoryId, - Long filmId, - Long storeId, + Long inventoryId, + Long filmId, + Long storeId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java index ebe7ac6..e2daebf 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Language.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Language( - Long languageId, - String name, + Long languageId, + String name, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java index 73ef9f1..f51e5bd 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/NicerButSlowerFilmList.java @@ -15,14 +15,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record NicerButSlowerFilmList( - Long fid, - String title, - String description, - String category, + Long fid, + String title, + String description, + String category, BigDecimal price, - Short length, + Short length, MpaaRating rating, - String actors + String actors ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java index 2f58a2e..2bb623c 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Payment.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Payment( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java index 6a45a8f..3d38f78 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_01.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_01( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java index af8de52..285392d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_02.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_02( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java index 65538ac..4bbae01 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_03.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_03( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java index 93d510d..181ac77 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_04.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_04( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java index 10c6e40..dd2d085 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_05.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_05( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java index 4879ce8..75fa7d3 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/PaymentP2007_06.java @@ -14,11 +14,11 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record PaymentP2007_06( - Long paymentId, - Long customerId, - Long staffId, - Long rentalId, - BigDecimal amount, + Long paymentId, + Long customerId, + Long staffId, + Long rentalId, + BigDecimal amount, LocalDateTime paymentDate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java index 22c51fc..5baea9e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Rental.java @@ -13,12 +13,12 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Rental( - Long rentalId, + Long rentalId, LocalDateTime rentalDate, - Long inventoryId, - Long customerId, + Long inventoryId, + Long customerId, LocalDateTime returnDate, - Long staffId, + Long staffId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java index bb6956f..4839750 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/RewardsReport.java @@ -14,16 +14,16 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record RewardsReport( - Long customerId, - Long storeId, - String firstName, - String lastName, - String email, - Long addressId, - Boolean activebool, - LocalDate createDate, + Long customerId, + Long storeId, + String firstName, + String lastName, + String email, + Long addressId, + Boolean activebool, + LocalDate createDate, LocalDateTime lastUpdate, - Integer active + Integer active ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java index a34b6a0..01a2b94 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByFilmCategory.java @@ -13,7 +13,7 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record SalesByFilmCategory( - String category, + String category, BigDecimal totalSales ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java index 925b29b..187b4a7 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/SalesByStore.java @@ -13,8 +13,8 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record SalesByStore( - String store, - String manager, + String store, + String manager, BigDecimal totalSales ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java index be1ded6..b944d97 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Staff.java @@ -13,17 +13,17 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Staff( - Long staffId, - String firstName, - String lastName, - Long addressId, - String email, - Long storeId, - Boolean active, - String username, - String password, + Long staffId, + String firstName, + String lastName, + Long addressId, + String email, + Long storeId, + Boolean active, + String username, + String password, LocalDateTime lastUpdate, - byte[] picture + byte[] picture ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java index 6c32e23..54accf3 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/StaffList.java @@ -12,14 +12,14 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record StaffList( - Long id, + Long id, String name, String address, String zipCode, String phone, String city, String country, - Long sid + Long sid ) implements Serializable { private static final long serialVersionUID = 1L; diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java index e364c57..37143f7 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/main/java/org/jooq/demo/java/db/tables/pojos/Store.java @@ -13,9 +13,9 @@ */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public record Store( - Long storeId, - Long managerStaffId, - Long addressId, + Long storeId, + Long managerStaffId, + Long addressId, LocalDateTime lastUpdate ) implements Serializable { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java index edc4b91..3045c92 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo01Querying.java @@ -197,21 +197,22 @@ public void implicitJoins() { .fetch(); } - @Test - public void nestedRecords() { - title("Need all columns of those active records?"); - - var r = - ctx.select(CUSTOMER, CUSTOMER.address().city().country()) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle(); - - println("Customer %s %s from %s".formatted(r.value1().getFirstName(), r.value1().getLastName(), r.value2().getCountry())); - - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// public void nestedRecords() { +// title("Need all columns of those active records?"); +// +// var r = +// ctx.select(CUSTOMER, CUSTOMER.address().city().country()) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle(); +// +// println("Customer %s %s from %s".formatted(r.value1().getFirstName(), r.value1().getLastName(), r.value2().getCountry())); +// +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test public void nestedRowValuesWithAdHocConverters() { diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java index a5fe143..58b4cb1 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo02DynamicSQL.java @@ -29,7 +29,7 @@ public void testDynamicSQL() { Table from = ACTOR; Condition where = ACTOR.ACTOR_ID.in(1L, 2L, 3L); List> orderBy = List.of(ACTOR.FIRST_NAME); - Field limit = val(5); + Param limit = val(5); ctx.select(select) .from(from) diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java index 60f72b0..e067380 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo11QueryObjectModel.java @@ -35,14 +35,15 @@ public void qom() { println("FROM : " + select.$from()); println("WHERE : " + select.$where()); - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):"); - println( - select.$select(Stream.concat(Stream.of(ACTOR.ACTOR_ID), select.$select().stream()).toList()) - .$orderBy(List.of(ACTOR.ACTOR_ID.asc())) - ); - - title("The old query is untouched:"); - println(select); + /* Available in jOOQ 3.17 only */ +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):"); +// println( +// select.$select(Stream.concat(Stream.of(ACTOR.ACTOR_ID), select.$select().stream()).toList()) +// .$orderBy(List.of(ACTOR.ACTOR_ID.asc())) +// ); +// +// title("The old query is untouched:"); +// println(select); } @Test @@ -92,44 +93,46 @@ public void replacement() { title("Replacing bind values"); println(select1.$replace(p -> p instanceof Param ? val(5) : p)); - title("Inverting the < predicate"); - println(select1.$replace(p -> p instanceof QOM.Lt lt ? lt.$converse() : p)); - - title("Appending a predicate"); - println(select1.$replace(appendSecurityCheck())); - - title("Appending a predicate even to subqueries"); - var select2 = ctx - .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.lt( - select(max(ACTOR.ACTOR_ID)).from(ACTOR)) - ); - println(select2.$replace(appendSecurityCheck())); + // Available in jOOQ 3.17 only +// title("Inverting the < predicate"); +// println(select1.$replace(p -> p instanceof QOM.Lt lt ? lt.$converse() : p)); +// +// title("Appending a predicate"); +// println(select1.$replace(appendSecurityCheck())); +// +// title("Appending a predicate even to subqueries"); +// var select2 = ctx +// .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.lt( +// select(max(ACTOR.ACTOR_ID)).from(ACTOR)) +// ); +// println(select2.$replace(appendSecurityCheck())); /* [/pro] */ } /* [pro] */ - private Function appendSecurityCheck() { - return p -> { - Condition c = condition("security_check()"); - - // Beware of performance and infinite recursions, though! - if (p instanceof Select s) - - // Append the predicate if there is no predicate - if (s.$where() == null) - return s.$where(c); - - // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) - else if (!s.$where().$traverse(Traversers.recursing(q -> !(q instanceof Select), Traversers.containing(c)))) - return s.$where(and(s.$where(), c)); - - return p; - }; - } + // Available in jOOQ 3.17 only +// private Function appendSecurityCheck() { +// return p -> { +// Condition c = condition("security_check()"); +// +// // Beware of performance and infinite recursions, though! +// if (p instanceof Select s) +// +// // Append the predicate if there is no predicate +// if (s.$where() == null) +// return s.$where(c); +// +// // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) +// else if (!s.$where().$traverse(Traversers.recursing(q -> !(q instanceof Select), Traversers.containing(c)))) +// return s.$where(and(s.$where(), c)); +// +// return p; +// }; +// } /* [/pro] */ } diff --git a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java index 1bfbe27..a7ab54d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java +++ b/jOOQ-demo-pro/jOOQ-demo-java/src/test/java/org/jooq/demo/java/Demo13Reactive.java @@ -28,43 +28,44 @@ record Actor(String firstName, String lastName) {} .forEach(System.out::println); } - @Test - public void reactiveTransactions() { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher(c -> Flux - .from(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl() - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log() - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")))) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList() - .doOnError(Throwable::printStackTrace) - .onErrorReturn(List.of()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx.select(ACTOR.ACTOR_ID).from(ACTOR).where(ACTOR.ACTOR_ID.eq(201L))) - .collectList() - .block() - .forEach(System.out::println); - } + // Available in jOOQ 3.17 only +// @Test +// public void reactiveTransactions() { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher(c -> Flux +// .from(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl() +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log() +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")))) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList() +// .doOnError(Throwable::printStackTrace) +// .onErrorReturn(List.of()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx.select(ACTOR.ACTOR_ID).from(ACTOR).where(ACTOR.ACTOR_ID.eq(201L))) +// .collectList() +// .block() +// .forEach(System.out::println); +// } @After public void teardown() throws SQLException { diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/pom.xml b/jOOQ-demo-pro/jOOQ-demo-kotlin/pom.xml index 0b4e9d5..9c225f7 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/pom.xml +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/pom.xml @@ -6,7 +6,7 @@ org.jooq.trial jooq-demo - 0.9.0 + 3.16.6 jooq-demo-kotlin @@ -33,10 +33,12 @@ org.jooq.trial jooq-kotlin + org.jetbrains.kotlin kotlin-stdlib-jdk8 diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt index 67b01cd..d0abddd 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/DefaultCatalog.kt @@ -34,10 +34,10 @@ open class DefaultCatalog : CatalogImpl("") { ) /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference + * release, namely: 3.16. You can turn off the generation of this reference * by specifying /configuration/generator/generate/jooqVersionReference */ - private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17 + private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16 } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt index c1b652e..8b0263b 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Actor.kt @@ -5,35 +5,25 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_ACTOR_LAST_NAME import org.jooq.demo.kotlin.db.keys.ACTOR_PKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.ActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -116,59 +106,8 @@ open class Actor( override fun getIndexes(): List = listOf(IDX_ACTOR_LAST_NAME) override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = ACTOR_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(): Condition = filmActorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(subquery: (FilmActor) -> TableLike): Condition = oneToManyExists(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(): Condition = filmExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(subquery: (Film) -> TableLike): Condition = manyToManyExists(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(): Field> = filmActorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(subquery: (FilmActor) -> TableLike): Field> = oneToManyMultiset(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(): Field> = filmMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(subquery: (Film) -> TableLike): Field> = manyToManyMultiset(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): Actor = Actor(DSL.name(alias), this) override fun `as`(alias: Name): Actor = Actor(alias, this) - override fun `as`(alias: Table<*>): Actor = Actor(alias.getQualifiedName(), this) /** * Rename this table @@ -180,23 +119,8 @@ open class Actor( */ override fun rename(name: Name): Actor = Actor(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Actor = Actor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt index c8d4116..83d368d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/ActorInfo.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,22 +39,7 @@ open class ActorInfo( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """) + TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;") ) { companion object { @@ -115,7 +96,6 @@ open class ActorInfo( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): ActorInfo = ActorInfo(DSL.name(alias), this) override fun `as`(alias: Name): ActorInfo = ActorInfo(alias, this) - override fun `as`(alias: Table<*>): ActorInfo = ActorInfo(alias.getQualifiedName(), this) /** * Rename this table @@ -127,23 +107,8 @@ open class ActorInfo( */ override fun rename(name: Name): ActorInfo = ActorInfo(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): ActorInfo = ActorInfo(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt index 122a7b2..b9867fa 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Address.kt @@ -5,39 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_CITY_ID import org.jooq.demo.kotlin.db.keys.ADDRESS_PKEY import org.jooq.demo.kotlin.db.keys.ADDRESS__ADDRESS_CITY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_ADDRESS_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STORE__STORE_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.CityRecord -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -153,96 +140,8 @@ open class Address( return _city; } - - val city: City - get(): City = city() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(): Condition = customerExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(subquery: (Customer) -> TableLike): Condition = oneToManyExists(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(): Condition = staffExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(subquery: (Staff) -> TableLike): Condition = oneToManyExists(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(): Condition = storeExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(subquery: (Store) -> TableLike): Condition = oneToManyExists(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - fun cityRow(): Field = cityRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - fun cityRow(subquery: (City) -> TableLike): Field = toOneRow(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as City) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(): Field> = customerMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(subquery: (Customer) -> TableLike): Field> = oneToManyMultiset(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(): Field> = staffMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(subquery: (Staff) -> TableLike): Field> = oneToManyMultiset(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(): Field> = storeMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(subquery: (Store) -> TableLike): Field> = oneToManyMultiset(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Store) }) override fun `as`(alias: String): Address = Address(DSL.name(alias), this) override fun `as`(alias: Name): Address = Address(alias, this) - override fun `as`(alias: Table<*>): Address = Address(alias.getQualifiedName(), this) /** * Rename this table @@ -254,23 +153,8 @@ open class Address( */ override fun rename(name: Name): Address = Address(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Address = Address(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, Long?, String?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt index dfeda4d..11949a0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Category.kt @@ -5,31 +5,21 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.keys.CATEGORY_PKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.tables.records.CategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -106,59 +96,8 @@ open class Category( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = CATEGORY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(): Condition = filmCategoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(subquery: (FilmCategory) -> TableLike): Condition = oneToManyExists(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(): Condition = filmExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - fun filmExists(subquery: (Film) -> TableLike): Condition = manyToManyExists(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(): Field> = filmCategoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(subquery: (FilmCategory) -> TableLike): Field> = oneToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(): Field> = filmMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film many-to-many child table. - */ - fun filmMultiset(subquery: (Film) -> TableLike): Field> = manyToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): Category = Category(DSL.name(alias), this) override fun `as`(alias: Name): Category = Category(alias, this) - override fun `as`(alias: Table<*>): Category = Category(alias.getQualifiedName(), this) /** * Rename this table @@ -170,23 +109,8 @@ open class Category( */ override fun rename(name: Name): Category = Category(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Category = Category(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt index e625610..4713241 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/City.kt @@ -5,35 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_COUNTRY_ID -import org.jooq.demo.kotlin.db.keys.ADDRESS__ADDRESS_CITY_ID_FKEY import org.jooq.demo.kotlin.db.keys.CITY_PKEY import org.jooq.demo.kotlin.db.keys.CITY__CITY_COUNTRY_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord import org.jooq.demo.kotlin.db.tables.records.CityRecord -import org.jooq.demo.kotlin.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -129,48 +120,8 @@ open class City( return _country; } - - val country: Country - get(): Country = country() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - fun addressExists(): Condition = addressExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - fun addressExists(subquery: (Address) -> TableLike): Condition = oneToManyExists(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - fun countryRow(): Field = countryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - fun countryRow(subquery: (Country) -> TableLike): Field = toOneRow(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as Country) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - fun addressMultiset(): Field> = addressMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.address one-to-many child table. - */ - fun addressMultiset(subquery: (Address) -> TableLike): Field> = oneToManyMultiset(ADDRESS__ADDRESS_CITY_ID_FKEY, { subquery(it as Address) }) override fun `as`(alias: String): City = City(DSL.name(alias), this) override fun `as`(alias: Name): City = City(alias, this) - override fun `as`(alias: Table<*>): City = City(alias.getQualifiedName(), this) /** * Rename this table @@ -182,23 +133,8 @@ open class City( */ override fun rename(name: Name): City = City(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): City = City(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt index 53c2e04..7b6d1e8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Country.kt @@ -5,28 +5,20 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public -import org.jooq.demo.kotlin.db.keys.CITY__CITY_COUNTRY_ID_FKEY import org.jooq.demo.kotlin.db.keys.COUNTRY_PKEY -import org.jooq.demo.kotlin.db.tables.records.CityRecord import org.jooq.demo.kotlin.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -104,33 +96,8 @@ open class Country( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun getIdentity(): Identity = super.getIdentity() as Identity override fun getPrimaryKey(): UniqueKey = COUNTRY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - fun cityExists(): Condition = cityExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - fun cityExists(subquery: (City) -> TableLike): Condition = oneToManyExists(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as City) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - fun cityMultiset(): Field> = cityMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.city one-to-many child table. - */ - fun cityMultiset(subquery: (City) -> TableLike): Field> = oneToManyMultiset(CITY__CITY_COUNTRY_ID_FKEY, { subquery(it as City) }) override fun `as`(alias: String): Country = Country(DSL.name(alias), this) override fun `as`(alias: Name): Country = Country(alias, this) - override fun `as`(alias: Table<*>): Country = Country(alias.getQualifiedName(), this) /** * Rename this table @@ -142,23 +109,8 @@ open class Country( */ override fun rename(name: Name): Country = Country(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Country = Country(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt index 3722297..9ddb4aa 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Customer.kt @@ -6,25 +6,19 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -34,25 +28,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_LAST_NAME import org.jooq.demo.kotlin.db.keys.CUSTOMER_PKEY import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -180,9 +156,6 @@ open class Customer( return _store; } - val store: Store - get(): Store = store() - /** * Get the implicit join path to the public.address table. */ @@ -192,240 +165,8 @@ open class Customer( return _address; } - - val address: Address - get(): Address = address() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Customer = Customer(DSL.name(alias), this) override fun `as`(alias: Name): Customer = Customer(alias, this) - override fun `as`(alias: Table<*>): Customer = Customer(alias.getQualifiedName(), this) /** * Rename this table @@ -437,23 +178,8 @@ open class Customer( */ override fun rename(name: Name): Customer = Customer(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Customer = Customer(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row10 = super.fieldsRow() as Row10 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt index 9c45053..0300342 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/CustomerList.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row9 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,24 +39,7 @@ open class CustomerList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { companion object { @@ -142,7 +121,6 @@ open class CustomerList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): CustomerList = CustomerList(DSL.name(alias), this) override fun `as`(alias: Name): CustomerList = CustomerList(alias, this) - override fun `as`(alias: Table<*>): CustomerList = CustomerList(alias.getQualifiedName(), this) /** * Rename this table @@ -154,23 +132,8 @@ open class CustomerList( */ override fun rename(name: Name): CustomerList = CustomerList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): CustomerList = CustomerList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row9 = super.fieldsRow() as Row9 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt index 19832f2..f64f351 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Film.kt @@ -6,25 +6,19 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row14 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -33,21 +27,10 @@ import org.jooq.demo.kotlin.db.indexes.FILM_FULLTEXT_IDX import org.jooq.demo.kotlin.db.indexes.IDX_FK_LANGUAGE_ID import org.jooq.demo.kotlin.db.indexes.IDX_FK_ORIGINAL_LANGUAGE_ID import org.jooq.demo.kotlin.db.indexes.IDX_TITLE -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY -import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_PKEY import org.jooq.demo.kotlin.db.keys.FILM__FILM_LANGUAGE_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.ActorRecord -import org.jooq.demo.kotlin.db.tables.records.CategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord import org.jooq.demo.kotlin.db.tables.records.FilmRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.LanguageRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -193,9 +176,6 @@ open class Film( return _filmLanguageIdFkey; } - val filmLanguageIdFkey: Language - get(): Language = filmLanguageIdFkey() - /** * Get the implicit join path to the public.language table, via * the film_original_language_id_fkey key. @@ -206,160 +186,8 @@ open class Film( return _filmOriginalLanguageIdFkey; } - - val filmOriginalLanguageIdFkey: Language - get(): Language = filmOriginalLanguageIdFkey() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(): Condition = filmActorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - fun filmActorExists(subquery: (FilmActor) -> TableLike): Condition = oneToManyExists(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(): Condition = filmCategoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - fun filmCategoryExists(subquery: (FilmCategory) -> TableLike): Condition = oneToManyExists(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(): Condition = inventoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(subquery: (Inventory) -> TableLike): Condition = oneToManyExists(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - fun actorExists(): Condition = actorExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - fun actorExists(subquery: (Actor) -> TableLike): Condition = manyToManyExists(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - fun categoryExists(): Condition = categoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - fun categoryExists(subquery: (Category) -> TableLike): Condition = manyToManyExists(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmLanguageIdFkeyRow(): Field = filmLanguageIdFkeyRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmLanguageIdFkeyRow(subquery: (Language) -> TableLike): Field = toOneRow(FILM__FILM_LANGUAGE_ID_FKEY, { subquery(it as Language) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmOriginalLanguageIdFkeyRow(): Field = filmOriginalLanguageIdFkeyRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - fun filmOriginalLanguageIdFkeyRow(subquery: (Language) -> TableLike): Field = toOneRow(FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, { subquery(it as Language) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(): Field> = filmActorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_actor one-to-many child - * table. - */ - fun filmActorMultiset(subquery: (FilmActor) -> TableLike): Field> = oneToManyMultiset(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as FilmActor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(): Field> = filmCategoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.film_category one-to-many child - * table. - */ - fun filmCategoryMultiset(subquery: (FilmCategory) -> TableLike): Field> = oneToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as FilmCategory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(): Field> = inventoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(subquery: (Inventory) -> TableLike): Field> = oneToManyMultiset(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - fun actorMultiset(): Field> = actorMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.actor many-to-many child table. - */ - fun actorMultiset(subquery: (Actor) -> TableLike): Field> = manyToManyMultiset(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - fun categoryMultiset(): Field> = categoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.category many-to-many child table. - */ - fun categoryMultiset(subquery: (Category) -> TableLike): Field> = manyToManyMultiset(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) override fun `as`(alias: String): Film = Film(DSL.name(alias), this) override fun `as`(alias: Name): Film = Film(alias, this) - override fun `as`(alias: Table<*>): Film = Film(alias.getQualifiedName(), this) /** * Rename this table @@ -371,23 +199,8 @@ open class Film( */ override fun rename(name: Name): Film = Film(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Film = Film(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row14?, Any?> = super.fieldsRow() as Row14?, Any?> - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, Int?, Long?, Long?, Short?, BigDecimal?, Short?, BigDecimal?, MpaaRating?, LocalDateTime?, Array?, Any?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, Int?, Long?, Long?, Short?, BigDecimal?, Short?, BigDecimal?, MpaaRating?, LocalDateTime?, Array?, Any?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt index 52c2832..ea14d01 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmActor.kt @@ -5,7 +5,6 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -14,13 +13,10 @@ import org.jooq.ForeignKey import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -28,9 +24,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_FILM_ID import org.jooq.demo.kotlin.db.keys.FILM_ACTOR_PKEY import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.ActorRecord import org.jooq.demo.kotlin.db.tables.records.FilmActorRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -122,9 +116,6 @@ open class FilmActor( return _actor; } - val actor: Actor - get(): Actor = actor() - /** * Get the implicit join path to the public.film table. */ @@ -134,36 +125,8 @@ open class FilmActor( return _film; } - - val film: Film - get(): Film = film() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun actorRow(): Field = actorRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun actorRow(subquery: (Actor) -> TableLike): Field = toOneRow(FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, { subquery(it as Actor) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, { subquery(it as Film) }) override fun `as`(alias: String): FilmActor = FilmActor(DSL.name(alias), this) override fun `as`(alias: Name): FilmActor = FilmActor(alias, this) - override fun `as`(alias: Table<*>): FilmActor = FilmActor(alias.getQualifiedName(), this) /** * Rename this table @@ -175,23 +138,8 @@ open class FilmActor( */ override fun rename(name: Name): FilmActor = FilmActor(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmActor = FilmActor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt index 5e4b496..4ec823d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmCategory.kt @@ -5,7 +5,6 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -13,22 +12,17 @@ import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY_PKEY import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY import org.jooq.demo.kotlin.db.keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CategoryRecord import org.jooq.demo.kotlin.db.tables.records.FilmCategoryRecord -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -119,9 +113,6 @@ open class FilmCategory( return _film; } - val film: Film - get(): Film = film() - /** * Get the implicit join path to the public.category table. */ @@ -131,36 +122,8 @@ open class FilmCategory( return _category; } - - val category: Category - get(): Category = category() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun categoryRow(): Field = categoryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - fun categoryRow(subquery: (Category) -> TableLike): Field = toOneRow(FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, { subquery(it as Category) }) override fun `as`(alias: String): FilmCategory = FilmCategory(DSL.name(alias), this) override fun `as`(alias: Name): FilmCategory = FilmCategory(alias, this) - override fun `as`(alias: Table<*>): FilmCategory = FilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -172,23 +135,8 @@ open class FilmCategory( */ override fun rename(name: Name): FilmCategory = FilmCategory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmCategory = FilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt index b7d1923..74a7f4e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmInStock.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -85,7 +81,6 @@ open class FilmInStock( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmInStock = FilmInStock(DSL.name(alias), this, parameters) override fun `as`(alias: Name): FilmInStock = FilmInStock(alias, this, parameters) - override fun `as`(alias: Table<*>): FilmInStock = FilmInStock(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -97,11 +92,6 @@ open class FilmInStock( */ override fun rename(name: Name): FilmInStock = FilmInStock(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmInStock = FilmInStock(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -128,14 +118,4 @@ open class FilmInStock( pFilmId, pStoreId )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt index c5e230a..a31bf45 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmList.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -45,22 +42,7 @@ open class FilmList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { companion object { @@ -137,7 +119,6 @@ open class FilmList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmList = FilmList(DSL.name(alias), this) override fun `as`(alias: Name): FilmList = FilmList(alias, this) - override fun `as`(alias: Table<*>): FilmList = FilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -149,23 +130,8 @@ open class FilmList( */ override fun rename(name: Name): FilmList = FilmList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmList = FilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt index 3ac9915..9114e7c 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/FilmNotInStock.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -85,7 +81,6 @@ open class FilmNotInStock( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): FilmNotInStock = FilmNotInStock(DSL.name(alias), this, parameters) override fun `as`(alias: Name): FilmNotInStock = FilmNotInStock(alias, this, parameters) - override fun `as`(alias: Table<*>): FilmNotInStock = FilmNotInStock(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -97,11 +92,6 @@ open class FilmNotInStock( */ override fun rename(name: Name): FilmNotInStock = FilmNotInStock(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): FilmNotInStock = FilmNotInStock(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -128,14 +118,4 @@ open class FilmNotInStock( pFilmId, pStoreId )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt index 849e992..e955100 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Inventory.kt @@ -5,25 +5,19 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -31,11 +25,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_STORE_ID_FILM_ID import org.jooq.demo.kotlin.db.keys.INVENTORY_PKEY import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_FILM_ID_FKEY import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_INVENTORY_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.FilmRecord import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -133,9 +123,6 @@ open class Inventory( return _film; } - val film: Film - get(): Film = film() - /** * Get the implicit join path to the public.store table. */ @@ -145,60 +132,8 @@ open class Inventory( return _store; } - - val store: Store - get(): Store = store() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun filmRow(): Field = filmRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun filmRow(subquery: (Film) -> TableLike): Field = toOneRow(INVENTORY__INVENTORY_FILM_ID_FKEY, { subquery(it as Film) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Inventory = Inventory(DSL.name(alias), this) override fun `as`(alias: Name): Inventory = Inventory(alias, this) - override fun `as`(alias: Table<*>): Inventory = Inventory(alias.getQualifiedName(), this) /** * Rename this table @@ -210,23 +145,8 @@ open class Inventory( */ override fun rename(name: Name): Inventory = Inventory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Inventory = Inventory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt index 3a107ae..f109116 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Language.kt @@ -5,17 +5,14 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -101,7 +98,6 @@ open class Language( override fun getPrimaryKey(): UniqueKey = LANGUAGE_PKEY override fun `as`(alias: String): Language = Language(DSL.name(alias), this) override fun `as`(alias: Name): Language = Language(alias, this) - override fun `as`(alias: Table<*>): Language = Language(alias.getQualifiedName(), this) /** * Rename this table @@ -113,23 +109,8 @@ open class Language( */ override fun rename(name: Name): Language = Language(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Language = Language(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt index adc6724..03ea367 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/NicerButSlowerFilmList.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -45,22 +42,7 @@ open class NicerButSlowerFilmList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { companion object { @@ -140,7 +122,6 @@ open class NicerButSlowerFilmList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): NicerButSlowerFilmList = NicerButSlowerFilmList(DSL.name(alias), this) override fun `as`(alias: Name): NicerButSlowerFilmList = NicerButSlowerFilmList(alias, this) - override fun `as`(alias: Table<*>): NicerButSlowerFilmList = NicerButSlowerFilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -152,23 +133,8 @@ open class NicerButSlowerFilmList( */ override fun rename(name: Name): NicerButSlowerFilmList = NicerButSlowerFilmList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): NicerButSlowerFilmList = NicerButSlowerFilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, BigDecimal?, Short?, MpaaRating?, String?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt index 1321354..6e741dc 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Payment.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -16,13 +15,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public @@ -32,10 +28,7 @@ import org.jooq.demo.kotlin.db.keys.PAYMENT_PKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -144,9 +137,6 @@ open class Payment( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -157,9 +147,6 @@ open class Payment( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -169,48 +156,8 @@ open class Payment( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun `as`(alias: String): Payment = Payment(DSL.name(alias), this) override fun `as`(alias: Name): Payment = Payment(alias, this) - override fun `as`(alias: Table<*>): Payment = Payment(alias.getQualifiedName(), this) /** * Rename this table @@ -222,23 +169,8 @@ open class Payment( */ override fun rename(name: Name): Payment = Payment(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Payment = Payment(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt index 902fdb1..ae73133 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_01.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_01_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_01_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_01( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_01( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_01( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_01_payment_date_check"), "(((payment_date >= '2007-01-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-02-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_01 = PaymentP2007_01(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_01 = PaymentP2007_01(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_01 = PaymentP2007_01(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_01( */ override fun rename(name: Name): PaymentP2007_01 = PaymentP2007_01(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_01 = PaymentP2007_01(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt index 30b2e39..9cebe18 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_02.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_02_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_02_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_02( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_02( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_02( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_02_payment_date_check"), "(((payment_date >= '2007-02-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-03-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_02 = PaymentP2007_02(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_02 = PaymentP2007_02(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_02 = PaymentP2007_02(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_02( */ override fun rename(name: Name): PaymentP2007_02 = PaymentP2007_02(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_02 = PaymentP2007_02(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt index ab859df..c4626bc 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_03.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_03_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_03_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_03( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_03( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_03( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_03_payment_date_check"), "(((payment_date >= '2007-03-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-04-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_03 = PaymentP2007_03(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_03 = PaymentP2007_03(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_03 = PaymentP2007_03(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_03( */ override fun rename(name: Name): PaymentP2007_03 = PaymentP2007_03(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_03 = PaymentP2007_03(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt index 40fc140..ac5d27e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_04.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_04_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_04_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_04( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_04( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_04( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_04_payment_date_check"), "(((payment_date >= '2007-04-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-05-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_04 = PaymentP2007_04(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_04 = PaymentP2007_04(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_04 = PaymentP2007_04(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_04( */ override fun rename(name: Name): PaymentP2007_04 = PaymentP2007_04(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_04 = PaymentP2007_04(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt index 55ef276..8a8bfb5 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_05.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_05_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_05_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_05( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_05( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_05( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_05_payment_date_check"), "(((payment_date >= '2007-05-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-06-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_05 = PaymentP2007_05(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_05 = PaymentP2007_05(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_05 = PaymentP2007_05(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_05( */ override fun rename(name: Name): PaymentP2007_05 = PaymentP2007_05(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_05 = PaymentP2007_05(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt index 3f4ad11..2ca08c9 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/PaymentP2007_06.kt @@ -6,7 +6,6 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List @@ -17,13 +16,10 @@ import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_06_CUSTOMER_ID @@ -31,10 +27,7 @@ import org.jooq.demo.kotlin.db.indexes.IDX_FK_PAYMENT_P2007_06_STAFF_ID import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -142,9 +135,6 @@ open class PaymentP2007_06( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -155,9 +145,6 @@ open class PaymentP2007_06( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.rental table. */ @@ -167,51 +154,11 @@ open class PaymentP2007_06( return _rental; } - - val rental: Rental - get(): Rental = rental() - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun rentalRow(): Field = rentalRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - fun rentalRow(subquery: (Rental) -> TableLike): Field = toOneRow(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as Rental) }) override fun getChecks(): List> = listOf( Internal.createCheck(this, DSL.name("payment_p2007_06_payment_date_check"), "(((payment_date >= '2007-06-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-07-01 00:00:00'::timestamp without time zone)))", true) ) override fun `as`(alias: String): PaymentP2007_06 = PaymentP2007_06(DSL.name(alias), this) override fun `as`(alias: Name): PaymentP2007_06 = PaymentP2007_06(alias, this) - override fun `as`(alias: Table<*>): PaymentP2007_06 = PaymentP2007_06(alias.getQualifiedName(), this) /** * Rename this table @@ -223,23 +170,8 @@ open class PaymentP2007_06( */ override fun rename(name: Name): PaymentP2007_06 = PaymentP2007_06(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): PaymentP2007_06 = PaymentP2007_06(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row6 = super.fieldsRow() as Row6 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, Long?, BigDecimal?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt index 5d71fdb..dee3c62 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Rental.kt @@ -5,52 +5,29 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row7 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_FK_INVENTORY_ID import org.jooq.demo.kotlin.db.indexes.IDX_UNQ_RENTAL_RENTAL_DATE_INVENTORY_ID_CUSTOMER_ID -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL_PKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_INVENTORY_ID_FKEY import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord import org.jooq.demo.kotlin.db.tables.records.RentalRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -164,9 +141,6 @@ open class Rental( return _inventory; } - val inventory: Inventory - get(): Inventory = inventory() - /** * Get the implicit join path to the public.customer table. */ @@ -177,9 +151,6 @@ open class Rental( return _customer; } - val customer: Customer - get(): Customer = customer() - /** * Get the implicit join path to the public.staff table. */ @@ -189,228 +160,8 @@ open class Rental( return _staff; } - - val staff: Staff - get(): Staff = staff() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun inventoryRow(): Field = inventoryRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun inventoryRow(subquery: (Inventory) -> TableLike): Field = toOneRow(RENTAL__RENTAL_INVENTORY_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun customerRow(): Field = customerRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun customerRow(subquery: (Customer) -> TableLike): Field = toOneRow(RENTAL__RENTAL_CUSTOMER_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_RENTAL_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, { subquery(it as PaymentP2007_06) }) override fun `as`(alias: String): Rental = Rental(DSL.name(alias), this) override fun `as`(alias: Name): Rental = Rental(alias, this) - override fun `as`(alias: Table<*>): Rental = Rental(alias.getQualifiedName(), this) /** * Rename this table @@ -422,23 +173,8 @@ open class Rental( */ override fun rename(name: Name): Rental = Rental(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Rental = Rental(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row7 = super.fieldsRow() as Row7 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, LocalDateTime?, Long?, Long?, LocalDateTime?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, LocalDateTime?, Long?, Long?, LocalDateTime?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt index f61bb6a..e651ff2 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/RewardsReport.kt @@ -7,17 +7,14 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -135,7 +132,6 @@ open class RewardsReport( override fun getIdentity(): Identity = super.getIdentity() as Identity override fun `as`(alias: String): RewardsReport = RewardsReport(DSL.name(alias), this, parameters) override fun `as`(alias: Name): RewardsReport = RewardsReport(alias, this, parameters) - override fun `as`(alias: Table<*>): RewardsReport = RewardsReport(alias.getQualifiedName(), this, parameters) /** * Rename this table @@ -147,11 +143,6 @@ open class RewardsReport( */ override fun rename(name: Name): RewardsReport = RewardsReport(name, null, parameters) - /** - * Rename this table - */ - override fun rename(name: Table<*>): RewardsReport = RewardsReport(name.getQualifiedName(), null, parameters) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -178,14 +169,4 @@ open class RewardsReport( minMonthlyPurchases, minDollarAmountPurchased )).let { if (aliased()) it.`as`(unqualifiedName) else it } - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, String?, String?, String?, Long?, Boolean?, LocalDate?, LocalDateTime?, Int?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt index c1ccf46..74bc8b9 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByFilmCategory.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row2 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -44,18 +41,7 @@ open class SalesByFilmCategory( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """) + TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;") ) { companion object { @@ -104,7 +90,6 @@ open class SalesByFilmCategory( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): SalesByFilmCategory = SalesByFilmCategory(DSL.name(alias), this) override fun `as`(alias: Name): SalesByFilmCategory = SalesByFilmCategory(alias, this) - override fun `as`(alias: Table<*>): SalesByFilmCategory = SalesByFilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -116,23 +101,8 @@ open class SalesByFilmCategory( */ override fun rename(name: Name): SalesByFilmCategory = SalesByFilmCategory(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): SalesByFilmCategory = SalesByFilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row2 = super.fieldsRow() as Row2 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (String?, BigDecimal?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (String?, BigDecimal?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt index 83c2ed5..2299e61 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/SalesByStore.kt @@ -5,16 +5,13 @@ package org.jooq.demo.kotlin.db.tables import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -44,21 +41,7 @@ open class SalesByStore( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """) + TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;") ) { companion object { @@ -110,7 +93,6 @@ open class SalesByStore( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): SalesByStore = SalesByStore(DSL.name(alias), this) override fun `as`(alias: Name): SalesByStore = SalesByStore(alias, this) - override fun `as`(alias: Table<*>): SalesByStore = SalesByStore(alias.getQualifiedName(), this) /** * Rename this table @@ -122,23 +104,8 @@ open class SalesByStore( */ override fun rename(name: Name): SalesByStore = SalesByStore(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): SalesByStore = SalesByStore(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row3 = super.fieldsRow() as Row3 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (String?, String?, BigDecimal?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (String?, String?, BigDecimal?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt index 4d058c0..0f049aa 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Staff.kt @@ -5,50 +5,25 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row11 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.PAYMENT__PAYMENT_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.keys.RENTAL__RENTAL_STAFF_ID_FKEY import org.jooq.demo.kotlin.db.keys.STAFF_PKEY import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STORE__STORE_MANAGER_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.kotlin.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.kotlin.db.tables.records.PaymentRecord -import org.jooq.demo.kotlin.db.tables.records.RentalRecord import org.jooq.demo.kotlin.db.tables.records.StaffRecord -import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -180,9 +155,6 @@ open class Staff( return _address; } - val address: Address - get(): Address = address() - /** * Get the implicit join path to the public.store table. */ @@ -192,264 +164,8 @@ open class Staff( return _store; } - - val store: Store - get(): Store = store() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(): Condition = paymentExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - fun paymentExists(subquery: (Payment) -> TableLike): Condition = oneToManyExists(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(): Condition = paymentP2007_01Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - fun paymentP2007_01Exists(subquery: (PaymentP2007_01) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(): Condition = paymentP2007_02Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - fun paymentP2007_02Exists(subquery: (PaymentP2007_02) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(): Condition = paymentP2007_03Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - fun paymentP2007_03Exists(subquery: (PaymentP2007_03) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(): Condition = paymentP2007_04Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - fun paymentP2007_04Exists(subquery: (PaymentP2007_04) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(): Condition = paymentP2007_05Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - fun paymentP2007_05Exists(subquery: (PaymentP2007_05) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(): Condition = paymentP2007_06Exists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - fun paymentP2007_06Exists(subquery: (PaymentP2007_06) -> TableLike): Condition = oneToManyExists(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(): Condition = rentalExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - fun rentalExists(subquery: (Rental) -> TableLike): Condition = oneToManyExists(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(): Condition = storeExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - fun storeExists(subquery: (Store) -> TableLike): Condition = oneToManyExists(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(STAFF__STAFF_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun storeRow(): Field = storeRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - fun storeRow(subquery: (Store) -> TableLike): Field = toOneRow(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Store) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(): Field> = paymentMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment one-to-many child table. - */ - fun paymentMultiset(subquery: (Payment) -> TableLike): Field> = oneToManyMultiset(PAYMENT__PAYMENT_STAFF_ID_FKEY, { subquery(it as Payment) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(): Field> = paymentP2007_01Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_01 one-to-many child - * table. - */ - fun paymentP2007_01Multiset(subquery: (PaymentP2007_01) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, { subquery(it as PaymentP2007_01) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(): Field> = paymentP2007_02Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_02 one-to-many child - * table. - */ - fun paymentP2007_02Multiset(subquery: (PaymentP2007_02) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, { subquery(it as PaymentP2007_02) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(): Field> = paymentP2007_03Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_03 one-to-many child - * table. - */ - fun paymentP2007_03Multiset(subquery: (PaymentP2007_03) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, { subquery(it as PaymentP2007_03) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(): Field> = paymentP2007_04Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_04 one-to-many child - * table. - */ - fun paymentP2007_04Multiset(subquery: (PaymentP2007_04) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, { subquery(it as PaymentP2007_04) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(): Field> = paymentP2007_05Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_05 one-to-many child - * table. - */ - fun paymentP2007_05Multiset(subquery: (PaymentP2007_05) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, { subquery(it as PaymentP2007_05) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(): Field> = paymentP2007_06Multiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.payment_p2007_06 one-to-many child - * table. - */ - fun paymentP2007_06Multiset(subquery: (PaymentP2007_06) -> TableLike): Field> = oneToManyMultiset(PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, { subquery(it as PaymentP2007_06) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(): Field> = rentalMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.rental one-to-many child table. - */ - fun rentalMultiset(subquery: (Rental) -> TableLike): Field> = oneToManyMultiset(RENTAL__RENTAL_STAFF_ID_FKEY, { subquery(it as Rental) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(): Field> = storeMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.store one-to-many child table. - */ - fun storeMultiset(subquery: (Store) -> TableLike): Field> = oneToManyMultiset(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Store) }) override fun `as`(alias: String): Staff = Staff(DSL.name(alias), this) override fun `as`(alias: Name): Staff = Staff(alias, this) - override fun `as`(alias: Table<*>): Staff = Staff(alias.getQualifiedName(), this) /** * Rename this table @@ -461,23 +177,8 @@ open class Staff( */ override fun rename(name: Name): Staff = Staff(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Staff = Staff(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row11 = super.fieldsRow() as Row11 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, Long?, String?, Long?, Boolean?, String?, String?, LocalDateTime?, ByteArray?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, Long?, String?, Long?, Boolean?, String?, String?, LocalDateTime?, ByteArray?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt index ec7b508..2ed6bed 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/StaffList.kt @@ -4,16 +4,12 @@ package org.jooq.demo.kotlin.db.tables -import java.util.function.Function - import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Name import org.jooq.Record -import org.jooq.Records import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -43,20 +39,7 @@ open class StaffList( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { companion object { @@ -133,7 +116,6 @@ open class StaffList( override fun getSchema(): Schema? = if (aliased()) null else Public.PUBLIC override fun `as`(alias: String): StaffList = StaffList(DSL.name(alias), this) override fun `as`(alias: Name): StaffList = StaffList(alias, this) - override fun `as`(alias: Table<*>): StaffList = StaffList(alias.getQualifiedName(), this) /** * Rename this table @@ -145,23 +127,8 @@ open class StaffList( */ override fun rename(name: Name): StaffList = StaffList(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): StaffList = StaffList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row8 = super.fieldsRow() as Row8 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, String?, String?, String?, String?, String?, String?, Long?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt index a3e49d0..a3e687a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/Store.kt @@ -5,39 +5,26 @@ package org.jooq.demo.kotlin.db.tables import java.time.LocalDateTime -import java.util.function.Function import kotlin.collections.List -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Records -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.kotlin.db.Public import org.jooq.demo.kotlin.db.indexes.IDX_UNQ_MANAGER_STAFF_ID -import org.jooq.demo.kotlin.db.keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.INVENTORY__INVENTORY_STORE_ID_FKEY -import org.jooq.demo.kotlin.db.keys.STAFF__STAFF_STORE_ID_FKEY import org.jooq.demo.kotlin.db.keys.STORE_PKEY import org.jooq.demo.kotlin.db.keys.STORE__STORE_ADDRESS_ID_FKEY import org.jooq.demo.kotlin.db.keys.STORE__STORE_MANAGER_STAFF_ID_FKEY -import org.jooq.demo.kotlin.db.tables.records.AddressRecord -import org.jooq.demo.kotlin.db.tables.records.CustomerRecord -import org.jooq.demo.kotlin.db.tables.records.InventoryRecord -import org.jooq.demo.kotlin.db.tables.records.StaffRecord import org.jooq.demo.kotlin.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -136,9 +123,6 @@ open class Store( return _staff; } - val staff: Staff - get(): Staff = staff() - /** * Get the implicit join path to the public.address table. */ @@ -148,108 +132,8 @@ open class Store( return _address; } - - val address: Address - get(): Address = address() - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(): Condition = customerExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - fun customerExists(subquery: (Customer) -> TableLike): Condition = oneToManyExists(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(): Condition = inventoryExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - fun inventoryExists(subquery: (Inventory) -> TableLike): Condition = oneToManyExists(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(): Condition = staffExists { it } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - fun staffExists(subquery: (Staff) -> TableLike): Condition = oneToManyExists(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun staffRow(): Field = staffRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun staffRow(subquery: (Staff) -> TableLike): Field = toOneRow(STORE__STORE_MANAGER_STAFF_ID_FKEY, { subquery(it as Staff) }) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun addressRow(): Field = addressRow { it } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - fun addressRow(subquery: (Address) -> TableLike): Field = toOneRow(STORE__STORE_ADDRESS_ID_FKEY, { subquery(it as Address) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(): Field> = customerMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.customer one-to-many child table. - */ - fun customerMultiset(subquery: (Customer) -> TableLike): Field> = oneToManyMultiset(CUSTOMER__CUSTOMER_STORE_ID_FKEY, { subquery(it as Customer) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(): Field> = inventoryMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.inventory one-to-many child table. - */ - fun inventoryMultiset(subquery: (Inventory) -> TableLike): Field> = oneToManyMultiset(INVENTORY__INVENTORY_STORE_ID_FKEY, { subquery(it as Inventory) }) - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(): Field> = staffMultiset { it } - - /** - * A convenience constructor for correlated MULTISETs - * expressions to the public.staff one-to-many child table. - */ - fun staffMultiset(subquery: (Staff) -> TableLike): Field> = oneToManyMultiset(STAFF__STAFF_STORE_ID_FKEY, { subquery(it as Staff) }) override fun `as`(alias: String): Store = Store(DSL.name(alias), this) override fun `as`(alias: Name): Store = Store(alias, this) - override fun `as`(alias: Table<*>): Store = Store(alias.getQualifiedName(), this) /** * Rename this table @@ -261,23 +145,8 @@ open class Store( */ override fun rename(name: Name): Store = Store(name, null) - /** - * Rename this table - */ - override fun rename(name: Table<*>): Store = Store(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override fun fieldsRow(): Row4 = super.fieldsRow() as Row4 - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - fun mapping(from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(Records.mapping(from)) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - fun mapping(toType: Class, from: (Long?, Long?, Long?, LocalDateTime?) -> U): SelectField = convertFrom(toType, Records.mapping(from)) } diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt index 575bd27..87def4f 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorInfoRecord.kt @@ -17,19 +17,19 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class ActorInfoRecord() : TableRecordImpl(ActorInfo.ACTOR_INFO), Record4 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var filmInfo: String? + var filmInfo: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt index 90cd004..ff01ae5 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/ActorRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class ActorRecord() : UpdatableRecordImpl(Actor.ACTOR), Record4 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt index 6638b0b..7a2a7d0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/AddressRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class AddressRecord() : UpdatableRecordImpl(Address.ADDRESS), Record8 { - open var addressId: Long? + var addressId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var address: String? + var address: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address2: String? + var address2: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var district: String? + var district: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var cityId: Long? + var cityId: Long? set(value): Unit = set(4, value) get(): Long? = get(4) as Long? - open var postalCode: String? + var postalCode: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var phone: String? + var phone: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(7, value) get(): LocalDateTime? = get(7) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt index 612bec3..4b22093 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CategoryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CategoryRecord() : UpdatableRecordImpl(Category.CATEGORY), Record3 { - open var categoryId: Long? + var categoryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt index 5429034..e71fb60 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CityRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CityRecord() : UpdatableRecordImpl(City.CITY), Record4 { - open var cityId: Long? + var cityId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var city: String? + var city: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var countryId: Long? + var countryId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt index 2a1b4e6..89cfc11 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CountryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CountryRecord() : UpdatableRecordImpl(Country.COUNTRY), Record3 { - open var countryId: Long? + var countryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var country: String? + var country: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt index 9b8fc19..491413e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerListRecord.kt @@ -17,39 +17,39 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class CustomerListRecord() : TableRecordImpl(CustomerList.CUSTOMER_LIST), Record9 { - open var id: Long? + var id: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address: String? + var address: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var zipCode: String? + var zipCode: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var phone: String? + var phone: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var city: String? + var city: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var country: String? + var country: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var notes: String? + var notes: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? - open var sid: Long? + var sid: Long? set(value): Unit = set(8, value) get(): Long? = get(8) as Long? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt index 4220739..5b7f28e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/CustomerRecord.kt @@ -21,43 +21,43 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class CustomerRecord() : UpdatableRecordImpl(Customer.CUSTOMER), Record10 { - open var customerId: Long? + var customerId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var activebool: Boolean? + var activebool: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var createDate: LocalDate? + var createDate: LocalDate? set(value): Unit = set(7, value) get(): LocalDate? = get(7) as LocalDate? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(8, value) get(): LocalDateTime? = get(8) as LocalDateTime? - open var active: Int? + var active: Int? set(value): Unit = set(9, value) get(): Int? = get(9) as Int? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt index 02b7be5..c18f7a8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmActorRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmActorRecord() : UpdatableRecordImpl(FilmActor.FILM_ACTOR), Record3 { - open var actorId: Long? + var actorId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var filmId: Long? + var filmId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt index b263251..74c2d26 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmCategoryRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmCategoryRecord() : UpdatableRecordImpl(FilmCategory.FILM_CATEGORY), Record3 { - open var filmId: Long? + var filmId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var categoryId: Long? + var categoryId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt index c8f9b2e..b2fe0c3 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmInStockRecord.kt @@ -17,7 +17,7 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmInStockRecord() : TableRecordImpl(FilmInStock.FILM_IN_STOCK), Record1 { - open var pFilmCount: Int? + var pFilmCount: Int? set(value): Unit = set(0, value) get(): Int? = get(0) as Int? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt index cdd605e..144427f 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmListRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmListRecord() : TableRecordImpl(FilmList.FILM_LIST), Record8 { - open var fid: Long? + var fid: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var category: String? + var category: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var price: BigDecimal? + var price: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(5, value) get(): Short? = get(5) as Short? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(6, value) get(): MpaaRating? = get(6) as MpaaRating? - open var actors: String? + var actors: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt index fd078d2..d61baa0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmNotInStockRecord.kt @@ -17,7 +17,7 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmNotInStockRecord() : TableRecordImpl(FilmNotInStock.FILM_NOT_IN_STOCK), Record1 { - open var pFilmCount: Int? + var pFilmCount: Int? set(value): Unit = set(0, value) get(): Int? = get(0) as Int? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt index 91ac7b7..aad060e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/FilmRecord.kt @@ -22,59 +22,59 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class FilmRecord() : UpdatableRecordImpl(Film.FILM), Record14?, Any?> { - open var filmId: Long? + var filmId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var releaseYear: Int? + var releaseYear: Int? set(value): Unit = set(3, value) get(): Int? = get(3) as Int? - open var languageId: Long? + var languageId: Long? set(value): Unit = set(4, value) get(): Long? = get(4) as Long? - open var originalLanguageId: Long? + var originalLanguageId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var rentalDuration: Short? + var rentalDuration: Short? set(value): Unit = set(6, value) get(): Short? = get(6) as Short? - open var rentalRate: BigDecimal? + var rentalRate: BigDecimal? set(value): Unit = set(7, value) get(): BigDecimal? = get(7) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(8, value) get(): Short? = get(8) as Short? - open var replacementCost: BigDecimal? + var replacementCost: BigDecimal? set(value): Unit = set(9, value) get(): BigDecimal? = get(9) as BigDecimal? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(10, value) get(): MpaaRating? = get(10) as MpaaRating? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(11, value) get(): LocalDateTime? = get(11) as LocalDateTime? - open var specialFeatures: Array? + var specialFeatures: Array? set(value): Unit = set(12, value) get(): Array? = get(12) as Array? - open var fulltext: Any? + var fulltext: Any? set(value): Unit = set(13, value) get(): Any? = get(13) as Any? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt index ca4af2b..0e38cdc 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/InventoryRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class InventoryRecord() : UpdatableRecordImpl(Inventory.INVENTORY), Record4 { - open var inventoryId: Long? + var inventoryId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var filmId: Long? + var filmId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt index c3870c1..d4d471a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/LanguageRecord.kt @@ -20,15 +20,15 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class LanguageRecord() : UpdatableRecordImpl(Language.LANGUAGE), Record3 { - open var languageId: Long? + var languageId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(2, value) get(): LocalDateTime? = get(2) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt index 5dba4ac..ace93f6 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/NicerButSlowerFilmListRecord.kt @@ -20,35 +20,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class NicerButSlowerFilmListRecord() : TableRecordImpl(NicerButSlowerFilmList.NICER_BUT_SLOWER_FILM_LIST), Record8 { - open var fid: Long? + var fid: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var title: String? + var title: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var description: String? + var description: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var category: String? + var category: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var price: BigDecimal? + var price: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var length: Short? + var length: Short? set(value): Unit = set(5, value) get(): Short? = get(5) as Short? - open var rating: MpaaRating? + var rating: MpaaRating? set(value): Unit = set(6, value) get(): MpaaRating? = get(6) as MpaaRating? - open var actors: String? + var actors: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt index 21d6955..8337be1 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_01Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_01Record() : TableRecordImpl(PaymentP2007_01.PAYMENT_P2007_01), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt index 0e44060..7d35972 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_02Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_02Record() : TableRecordImpl(PaymentP2007_02.PAYMENT_P2007_02), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt index 382105a..2fef129 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_03Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_03Record() : TableRecordImpl(PaymentP2007_03.PAYMENT_P2007_03), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt index b49e0e7..0068439 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_04Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_04Record() : TableRecordImpl(PaymentP2007_04.PAYMENT_P2007_04), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt index 0430fea..9f926c6 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_05Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_05Record() : TableRecordImpl(PaymentP2007_05.PAYMENT_P2007_05), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt index 20b054c..338e799 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentP2007_06Record.kt @@ -20,27 +20,27 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentP2007_06Record() : TableRecordImpl(PaymentP2007_06.PAYMENT_P2007_06), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt index 3137a3d..2348a6e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/PaymentRecord.kt @@ -21,27 +21,27 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class PaymentRecord() : UpdatableRecordImpl(Payment.PAYMENT), Record6 { - open var paymentId: Long? + var paymentId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var amount: BigDecimal? + var amount: BigDecimal? set(value): Unit = set(4, value) get(): BigDecimal? = get(4) as BigDecimal? - open var paymentDate: LocalDateTime? + var paymentDate: LocalDateTime? set(value): Unit = set(5, value) get(): LocalDateTime? = get(5) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt index b73274c..c772ed4 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RentalRecord.kt @@ -20,31 +20,31 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class RentalRecord() : UpdatableRecordImpl(Rental.RENTAL), Record7 { - open var rentalId: Long? + var rentalId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var rentalDate: LocalDateTime? + var rentalDate: LocalDateTime? set(value): Unit = set(1, value) get(): LocalDateTime? = get(1) as LocalDateTime? - open var inventoryId: Long? + var inventoryId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var customerId: Long? + var customerId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var returnDate: LocalDateTime? + var returnDate: LocalDateTime? set(value): Unit = set(4, value) get(): LocalDateTime? = get(4) as LocalDateTime? - open var staffId: Long? + var staffId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(6, value) get(): LocalDateTime? = get(6) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt index 999ec10..1d0d72d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/RewardsReportRecord.kt @@ -20,43 +20,43 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class RewardsReportRecord() : TableRecordImpl(RewardsReport.REWARDS_REPORT), Record10 { - open var customerId: Long? + var customerId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var activebool: Boolean? + var activebool: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var createDate: LocalDate? + var createDate: LocalDate? set(value): Unit = set(7, value) get(): LocalDate? = get(7) as LocalDate? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(8, value) get(): LocalDateTime? = get(8) as LocalDateTime? - open var active: Int? + var active: Int? set(value): Unit = set(9, value) get(): Int? = get(9) as Int? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt index 44c6555..183a9d2 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByFilmCategoryRecord.kt @@ -19,11 +19,11 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class SalesByFilmCategoryRecord() : TableRecordImpl(SalesByFilmCategory.SALES_BY_FILM_CATEGORY), Record2 { - open var category: String? + var category: String? set(value): Unit = set(0, value) get(): String? = get(0) as String? - open var totalSales: BigDecimal? + var totalSales: BigDecimal? set(value): Unit = set(1, value) get(): BigDecimal? = get(1) as BigDecimal? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt index 2da5b25..369b638 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/SalesByStoreRecord.kt @@ -19,15 +19,15 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class SalesByStoreRecord() : TableRecordImpl(SalesByStore.SALES_BY_STORE), Record3 { - open var store: String? + var store: String? set(value): Unit = set(0, value) get(): String? = get(0) as String? - open var manager: String? + var manager: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var totalSales: BigDecimal? + var totalSales: BigDecimal? set(value): Unit = set(2, value) get(): BigDecimal? = get(2) as BigDecimal? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt index fc5a45b..27198b8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffListRecord.kt @@ -17,35 +17,35 @@ import org.jooq.impl.TableRecordImpl @Suppress("UNCHECKED_CAST") open class StaffListRecord() : TableRecordImpl(StaffList.STAFF_LIST), Record8 { - open var id: Long? + var id: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var name: String? + var name: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var address: String? + var address: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var zipCode: String? + var zipCode: String? set(value): Unit = set(3, value) get(): String? = get(3) as String? - open var phone: String? + var phone: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var city: String? + var city: String? set(value): Unit = set(5, value) get(): String? = get(5) as String? - open var country: String? + var country: String? set(value): Unit = set(6, value) get(): String? = get(6) as String? - open var sid: Long? + var sid: Long? set(value): Unit = set(7, value) get(): Long? = get(7) as Long? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt index ceb3fdf..5603649 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StaffRecord.kt @@ -20,47 +20,47 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class StaffRecord() : UpdatableRecordImpl(Staff.STAFF), Record11 { - open var staffId: Long? + var staffId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var firstName: String? + var firstName: String? set(value): Unit = set(1, value) get(): String? = get(1) as String? - open var lastName: String? + var lastName: String? set(value): Unit = set(2, value) get(): String? = get(2) as String? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(3, value) get(): Long? = get(3) as Long? - open var email: String? + var email: String? set(value): Unit = set(4, value) get(): String? = get(4) as String? - open var storeId: Long? + var storeId: Long? set(value): Unit = set(5, value) get(): Long? = get(5) as Long? - open var active: Boolean? + var active: Boolean? set(value): Unit = set(6, value) get(): Boolean? = get(6) as Boolean? - open var username: String? + var username: String? set(value): Unit = set(7, value) get(): String? = get(7) as String? - open var password: String? + var password: String? set(value): Unit = set(8, value) get(): String? = get(8) as String? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(9, value) get(): LocalDateTime? = get(9) as LocalDateTime? - open var picture: ByteArray? + var picture: ByteArray? set(value): Unit = set(10, value) get(): ByteArray? = get(10) as ByteArray? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt index fd4af1a..845f64d 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/main/kotlin/org/jooq/demo/kotlin/db/tables/records/StoreRecord.kt @@ -20,19 +20,19 @@ import org.jooq.impl.UpdatableRecordImpl @Suppress("UNCHECKED_CAST") open class StoreRecord() : UpdatableRecordImpl(Store.STORE), Record4 { - open var storeId: Long? + var storeId: Long? set(value): Unit = set(0, value) get(): Long? = get(0) as Long? - open var managerStaffId: Long? + var managerStaffId: Long? set(value): Unit = set(1, value) get(): Long? = get(1) as Long? - open var addressId: Long? + var addressId: Long? set(value): Unit = set(2, value) get(): Long? = get(2) as Long? - open var lastUpdate: LocalDateTime? + var lastUpdate: LocalDateTime? set(value): Unit = set(3, value) get(): LocalDateTime? = get(3) as LocalDateTime? diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt index 8e03855..3a0df03 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo01Querying.kt @@ -195,18 +195,19 @@ class Demo01Querying : AbstractDemo() { .fetch() } - @Test - fun nestedRecords() { - title("Need all columns of those active records?") - val (customer, country) = ctx.select(CUSTOMER, CUSTOMER.address.city.country) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle() - println("Customer ${customer.firstName} ${customer.lastName} from ${country.formatJSON()}") - - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// fun nestedRecords() { +// title("Need all columns of those active records?") +// val (customer, country) = ctx.select(CUSTOMER, CUSTOMER.address.city.country) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle() +// println("Customer ${customer.firstName} ${customer.lastName} from ${country.formatJSON()}") +// +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test fun nestedRowValuesWithAdHocConverters() { diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt index 82aaa27..66fd10a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo11QueryObjectModel.kt @@ -24,14 +24,15 @@ class Demo11QueryObjectModel : AbstractDemo() { println("FROM : " + select.`$from`()) println("WHERE : " + select.`$where`()) - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") - println( - select.`$select`(listOf(ACTOR.ACTOR_ID) + select.`$select`()) - .`$orderBy`(listOf(ACTOR.ACTOR_ID.asc())) - ) - - title("The old query is untouched:") - println(select) + // Available in jOOQ 3.17 only +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") +// println( +// select.`$select`(listOf(ACTOR.ACTOR_ID) + select.`$select`()) +// .`$orderBy`(listOf(ACTOR.ACTOR_ID.asc())) +// ) +// +// title("The old query is untouched:") +// println(select) } @@ -69,42 +70,20 @@ class Demo11QueryObjectModel : AbstractDemo() { title("Replacing bind values") println(select1.`$replace` { p -> if (p is Param<*>) value(5) else p }) - title("Inverting the < predicate") - println(select1.`$replace`{ p -> if (p is QOM.Lt<*>) p.`$converse`() else p }) - - title("Appending a predicate"); - println(select1.`$replace`(appendSecurityCheck())) - - title("Appending a predicate even to subqueries") - var select2 = ctx - .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.lt( - select(max(ACTOR.ACTOR_ID)).from(ACTOR)) - ) - println(select2.`$replace`(appendSecurityCheck())) + // Available in jOOQ 3.17 only +// title("Inverting the < predicate") +// println(select1.`$replace`{ p -> if (p is QOM.Lt<*>) p.`$converse`() else p }) +// +// title("Appending a predicate"); +// println(select1.`$replace`(appendSecurityCheck())) +// +// title("Appending a predicate even to subqueries") +// var select2 = ctx +// .select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.lt( +// select(max(ACTOR.ACTOR_ID)).from(ACTOR)) +// ) +// println(select2.`$replace`(appendSecurityCheck())) } - - private fun appendSecurityCheck(): (p: QueryPart) -> QueryPart { - return { p -> - val c = condition("security_check()") - - // Beware of performance and infinite recursions, though! - if (p is Select<*>) - - // Append the predicate if there is no predicate - if (p.`$where`() == null) - p.`$where`(c) - - // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) - else if (!p.`$where`()!!.`$traverse`(Traversers.recursing({ q -> !(q is Select<*>)}, Traversers.containing(c)) )) - p.`$where`(and(p.`$where`(), c)) - - else - p - else - p - } - } - } \ No newline at end of file diff --git a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt index 8462fd0..e3d3ed5 100644 --- a/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt +++ b/jOOQ-demo-pro/jOOQ-demo-kotlin/src/test/kotlin/org/jooq/demo/kotlin/Demo13Reactive.kt @@ -30,85 +30,86 @@ class Demo13Reactive : AbstractDemo() { .forEach { println(it) } } - @Test - fun reactiveTransactions() { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher { c -> Flux - .from(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl() - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log() - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - }) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList() - .doOnError(Throwable::printStackTrace) - .onErrorReturn(listOf()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx - .select(ACTOR.ACTOR_ID) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .toIterable() - .forEach { println(it) } - } - - @Test - fun coroutines() { - val actor: ActorRecord? = runBlocking { - findActor(1) - } - - println(actor) - } - - suspend fun findActor(id: Long): ActorRecord? { - return ctx - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(id)) - - // Turn any reactive streams Publisher into a suspension result using the - // kotlinx-coroutines-reactive extensions - .awaitFirstOrNull() - } - - @Test - fun coroutinesWithTransactions() { - val actor: ActorRecord = runBlocking { - insertActorTransaction() - } - - println(actor) - } - - suspend fun insertActorTransaction(): ActorRecord { - return ctx.transactionCoroutine(::insertActor) - } - - suspend fun insertActor(c: Configuration): ActorRecord = c.dsl() - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A") - .returning() - .awaitFirst() + // Available in jOOQ 3.17 only +// @Test +// fun reactiveTransactions() { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher { c -> Flux +// .from(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl() +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log() +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// }) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList() +// .doOnError(Throwable::printStackTrace) +// .onErrorReturn(listOf()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx +// .select(ACTOR.ACTOR_ID) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .toIterable() +// .forEach { println(it) } +// } +// +// @Test +// fun coroutines() { +// val actor: ActorRecord? = runBlocking { +// findActor(1) +// } +// +// println(actor) +// } +// +// suspend fun findActor(id: Long): ActorRecord? { +// return ctx +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(id)) +// +// // Turn any reactive streams Publisher into a suspension result using the +// // kotlinx-coroutines-reactive extensions +// .awaitFirstOrNull() +// } +// +// @Test +// fun coroutinesWithTransactions() { +// val actor: ActorRecord = runBlocking { +// insertActorTransaction() +// } +// +// println(actor) +// } +// +// suspend fun insertActorTransaction(): ActorRecord { +// return ctx.transactionCoroutine(::insertActor) +// } +// +// suspend fun insertActor(c: Configuration): ActorRecord = c.dsl() +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A") +// .returning() +// .awaitFirst() @After override fun teardown() { diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/pom.xml b/jOOQ-demo-pro/jOOQ-demo-scala/pom.xml index 6f96c65..930f721 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/pom.xml +++ b/jOOQ-demo-pro/jOOQ-demo-scala/pom.xml @@ -6,7 +6,7 @@ org.jooq.trial jooq-demo - 0.9.0 + 3.16.6 jooq-demo-scala diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala index c75710a..817a130 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/DefaultCatalog.scala @@ -35,10 +35,10 @@ class DefaultCatalog extends CatalogImpl("") { ) /** - * A reference to the 3.17 minor release of the code generator. If this + * A reference to the 3.16 minor release of the code generator. If this * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.17. You can turn off the generation of this reference by + * release, namely: 3.16. You can turn off the generation of this reference by * specifying /configuration/generator/generate/jooqVersionReference */ - private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_17 + private val REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_16 } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala index 5b08c87..5bf2c79 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Actor.scala @@ -10,30 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.ActorRecord -import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -122,57 +115,8 @@ extends TableImpl[ActorRecord]( override def getIdentity: Identity[ActorRecord, Long] = super.getIdentity.asInstanceOf[ Identity[ActorRecord, Long] ] override def getPrimaryKey: UniqueKey[ActorRecord] = Keys.ACTOR_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists(): Condition = filmActorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists[O <: Record](subquery: (FilmActor) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists(): Condition = filmExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists[O <: Record](subquery: (Film) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset(): Field[Result[FilmActorRecord]] = filmActorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset[O <: Record](subquery: (FilmActor) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset(): Field[Result[FilmRecord]] = filmMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset[O <: Record](subquery: (Film) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): Actor = new Actor(DSL.name(alias), this) override def as(alias: Name): Actor = new Actor(alias, this) - override def as(alias: Table[_]): Actor = new Actor(alias.getQualifiedName(), this) /** * Rename this table @@ -184,23 +128,8 @@ extends TableImpl[ActorRecord]( */ override def rename(name: Name): Actor = new Actor(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Actor = new Actor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, String, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala index f5d41d7..7326ea8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/ActorInfo.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,22 +53,7 @@ extends TableImpl[ActorInfoRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "actor_info" as SELECT a.actor_id, - a.first_name, - a.last_name, - group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat - FROM ((film f - JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id))) - JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id))) - WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id)) - GROUP BY fa_1.actor_id))) AS film_info - FROM (((actor a - LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id))) - LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id))) - LEFT JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY a.actor_id, a.first_name, a.last_name; - """) + TableOptions.view("create view \"actor_info\" as SELECT a.actor_id,\n a.first_name,\n a.last_name,\n group_concat(DISTINCT (((c.name)::text || ': '::text) || ( SELECT group_concat((f.title)::text) AS group_concat\n FROM ((film f\n JOIN film_category fc_1 ON ((f.film_id = fc_1.film_id)))\n JOIN film_actor fa_1 ON ((f.film_id = fa_1.film_id)))\n WHERE ((fc_1.category_id = c.category_id) AND (fa_1.actor_id = a.actor_id))\n GROUP BY fa_1.actor_id))) AS film_info\n FROM (((actor a\n LEFT JOIN film_actor fa ON ((a.actor_id = fa.actor_id)))\n LEFT JOIN film_category fc ON ((fa.film_id = fc.film_id)))\n LEFT JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY a.actor_id, a.first_name, a.last_name;") ) { /** @@ -120,7 +103,6 @@ extends TableImpl[ActorInfoRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): ActorInfo = new ActorInfo(DSL.name(alias), this) override def as(alias: Name): ActorInfo = new ActorInfo(alias, this) - override def as(alias: Table[_]): ActorInfo = new ActorInfo(alias.getQualifiedName(), this) /** * Rename this table @@ -132,23 +114,8 @@ extends TableImpl[ActorInfoRecord]( */ override def rename(name: Name): ActorInfo = new ActorInfo(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): ActorInfo = new ActorInfo(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, String, String] = super.fieldsRow.asInstanceOf[ Row4[Long, String, String, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala index 5ea8c80..fb393e8 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Address.scala @@ -10,32 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.CityRecord -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -151,93 +142,8 @@ extends TableImpl[AddressRecord]( * Get the implicit join path to the public.city table. */ lazy val city: City = { new City(this, Keys.ADDRESS__ADDRESS_CITY_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists(): Condition = customerExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists[O <: Record](subquery: (Customer) => TableLike[O]): Condition = oneToManyExists(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists(): Condition = staffExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists[O <: Record](subquery: (Staff) => TableLike[O]): Condition = oneToManyExists(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists(): Condition = storeExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists[O <: Record](subquery: (Store) => TableLike[O]): Condition = oneToManyExists(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - def cityRow(): Field[CityRecord] = cityRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.address to-one parent table. - */ - def cityRow[O <: Record](subquery: (City) => TableLike[O]): Field[O] = toOneRow(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset(): Field[Result[CustomerRecord]] = customerMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset[O <: Record](subquery: (Customer) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset(): Field[Result[StaffRecord]] = staffMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset[O <: Record](subquery: (Staff) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset(): Field[Result[StoreRecord]] = storeMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset[O <: Record](subquery: (Store) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) override def as(alias: String): Address = new Address(DSL.name(alias), this) override def as(alias: Name): Address = new Address(alias, this) - override def as(alias: Table[_]): Address = new Address(alias.getQualifiedName(), this) /** * Rename this table @@ -249,23 +155,8 @@ extends TableImpl[AddressRecord]( */ override def rename(name: Name): Address = new Address(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Address = new Address(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, Long, String, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, Long, String, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, Long, String, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala index 081b48c..21542d7 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Category.scala @@ -8,28 +8,21 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.tables.records.CategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -111,57 +104,8 @@ extends TableImpl[CategoryRecord]( override def getIdentity: Identity[CategoryRecord, Long] = super.getIdentity.asInstanceOf[ Identity[CategoryRecord, Long] ] override def getPrimaryKey: UniqueKey[CategoryRecord] = Keys.CATEGORY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists(): Condition = filmCategoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists[O <: Record](subquery: (FilmCategory) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists(): Condition = filmExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film many-to-many child table. - */ - def filmExists[O <: Record](subquery: (Film) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset(): Field[Result[FilmCategoryRecord]] = filmCategoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset[O <: Record](subquery: (FilmCategory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset(): Field[Result[FilmRecord]] = filmMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film many-to-many child table. - */ - def filmMultiset[O <: Record](subquery: (Film) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): Category = new Category(DSL.name(alias), this) override def as(alias: Name): Category = new Category(alias, this) - override def as(alias: Table[_]): Category = new Category(alias.getQualifiedName(), this) /** * Rename this table @@ -173,23 +117,8 @@ extends TableImpl[CategoryRecord]( */ override def rename(name: Name): Category = new Category(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Category = new Category(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala index 0e622f3..cf98f2e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/City.scala @@ -10,30 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord import org.jooq.demo.skala.db.tables.records.CityRecord -import org.jooq.demo.skala.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -129,45 +122,8 @@ extends TableImpl[CityRecord]( * Get the implicit join path to the public.country table. */ lazy val country: Country = { new Country(this, Keys.CITY__CITY_COUNTRY_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - def addressExists(): Condition = addressExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.address one-to-many child table. - */ - def addressExists[O <: Record](subquery: (Address) => TableLike[O]): Condition = oneToManyExists(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - def countryRow(): Field[CountryRecord] = countryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.city to-one parent table. - */ - def countryRow[O <: Record](subquery: (Country) => TableLike[O]): Field[O] = toOneRow(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CountryRecord]) => subquery(t.asInstanceOf[Country])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.address one-to-many child table. - */ - def addressMultiset(): Field[Result[AddressRecord]] = addressMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.address one-to-many child table. - */ - def addressMultiset[O <: Record](subquery: (Address) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.ADDRESS__ADDRESS_CITY_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) override def as(alias: String): City = new City(DSL.name(alias), this) override def as(alias: Name): City = new City(alias, this) - override def as(alias: Table[_]): City = new City(alias.getQualifiedName(), this) /** * Rename this table @@ -179,23 +135,8 @@ extends TableImpl[CityRecord]( */ override def rename(name: Name): City = new City(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): City = new City(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, String, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, String, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala index 8075f6b..def5556 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Country.scala @@ -8,26 +8,20 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CityRecord import org.jooq.demo.skala.db.tables.records.CountryRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -110,33 +104,8 @@ extends TableImpl[CountryRecord]( override def getIdentity: Identity[CountryRecord, Long] = super.getIdentity.asInstanceOf[ Identity[CountryRecord, Long] ] override def getPrimaryKey: UniqueKey[CountryRecord] = Keys.COUNTRY_PKEY - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - def cityExists(): Condition = cityExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.city one-to-many child table. - */ - def cityExists[O <: Record](subquery: (City) => TableLike[O]): Condition = oneToManyExists(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.city one-to-many child table. - */ - def cityMultiset(): Field[Result[CityRecord]] = cityMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.city one-to-many child table. - */ - def cityMultiset[O <: Record](subquery: (City) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CITY__CITY_COUNTRY_ID_FKEY, (t: Table[CityRecord]) => subquery(t.asInstanceOf[City])) override def as(alias: String): Country = new Country(DSL.name(alias), this) override def as(alias: Name): Country = new Country(alias, this) - override def as(alias: Table[_]): Country = new Country(alias.getQualifiedName(), this) /** * Rename this table @@ -148,23 +117,8 @@ extends TableImpl[CountryRecord]( */ override def rename(name: Name): Country = new Country(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Country = new Country(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala index 3761317..ffdd175 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Customer.scala @@ -13,38 +13,23 @@ import java.time.LocalDate import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -175,225 +160,8 @@ extends TableImpl[CustomerRecord]( * Get the implicit join path to the public.address table. */ lazy val address: Address = { new Address(this, Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.customer to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.CUSTOMER__CUSTOMER_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Customer = new Customer(DSL.name(alias), this) override def as(alias: Name): Customer = new Customer(alias, this) - override def as(alias: Table[_]): Customer = new Customer(alias.getQualifiedName(), this) /** * Rename this table @@ -405,23 +173,8 @@ extends TableImpl[CustomerRecord]( */ override def rename(name: Name): Customer = new Customer(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Customer = new Customer(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row10[Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer] = super.fieldsRow.asInstanceOf[ Row10[Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala index 450bbaa..cb012a1 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/CustomerList.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row9 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,24 +53,7 @@ extends TableImpl[CustomerListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "customer_list" as SELECT cu.customer_id AS id, - (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - CASE - WHEN cu.activebool THEN 'active'::text - ELSE ''::text - END AS notes, - cu.store_id AS sid - FROM (((customer cu - JOIN address a ON ((cu.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"customer_list\" as SELECT cu.customer_id AS id,\n (((cu.first_name)::text || ' '::text) || (cu.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n CASE\n WHEN cu.activebool THEN 'active'::text\n ELSE ''::text\n END AS notes,\n cu.store_id AS sid\n FROM (((customer cu\n JOIN address a ON ((cu.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { /** @@ -147,7 +128,6 @@ extends TableImpl[CustomerListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): CustomerList = new CustomerList(DSL.name(alias), this) override def as(alias: Name): CustomerList = new CustomerList(alias, this) - override def as(alias: Table[_]): CustomerList = new CustomerList(alias.getQualifiedName(), this) /** * Rename this table @@ -159,23 +139,8 @@ extends TableImpl[CustomerListRecord]( */ override def rename(name: Name): CustomerList = new CustomerList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): CustomerList = new CustomerList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row9 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row9[Long, String, String, String, String, String, String, String, Long] = super.fieldsRow.asInstanceOf[ Row9[Long, String, String, String, String, String, String, String, Long] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala index 1a3f184..61d3296 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Film.scala @@ -15,35 +15,24 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row14 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public import org.jooq.demo.skala.db.enums.MpaaRating -import org.jooq.demo.skala.db.tables.records.ActorRecord -import org.jooq.demo.skala.db.tables.records.CategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord import org.jooq.demo.skala.db.tables.records.FilmRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.LanguageRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -201,153 +190,8 @@ extends TableImpl[FilmRecord]( * the film_original_language_id_fkey key. */ lazy val filmOriginalLanguageIdFkey: Language = { new Language(this, Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists(): Condition = filmActorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorExists[O <: Record](subquery: (FilmActor) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists(): Condition = filmCategoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryExists[O <: Record](subquery: (FilmCategory) => TableLike[O]): Condition = oneToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists(): Condition = inventoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists[O <: Record](subquery: (Inventory) => TableLike[O]): Condition = oneToManyExists(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - def actorExists(): Condition = actorExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.actor many-to-many child table. - */ - def actorExists[O <: Record](subquery: (Actor) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - def categoryExists(): Condition = categoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.category many-to-many child table. - */ - def categoryExists[O <: Record](subquery: (Category) => TableLike[O]): Condition = manyToManyExists(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmLanguageIdFkeyRow(): Field[LanguageRecord] = filmLanguageIdFkeyRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmLanguageIdFkeyRow[O <: Record](subquery: (Language) => TableLike[O]): Field[O] = toOneRow(Keys.FILM__FILM_LANGUAGE_ID_FKEY, (t: Table[LanguageRecord]) => subquery(t.asInstanceOf[Language])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmOriginalLanguageIdFkeyRow(): Field[LanguageRecord] = filmOriginalLanguageIdFkeyRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film to-one parent table. - */ - def filmOriginalLanguageIdFkeyRow[O <: Record](subquery: (Language) => TableLike[O]): Field[O] = toOneRow(Keys.FILM__FILM_ORIGINAL_LANGUAGE_ID_FKEY, (t: Table[LanguageRecord]) => subquery(t.asInstanceOf[Language])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset(): Field[Result[FilmActorRecord]] = filmActorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_actor one-to-many child table. - */ - def filmActorMultiset[O <: Record](subquery: (FilmActor) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmActorRecord]) => subquery(t.asInstanceOf[FilmActor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset(): Field[Result[FilmCategoryRecord]] = filmCategoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.film_category one-to-many child table. - */ - def filmCategoryMultiset[O <: Record](subquery: (FilmCategory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmCategoryRecord]) => subquery(t.asInstanceOf[FilmCategory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset(): Field[Result[InventoryRecord]] = inventoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset[O <: Record](subquery: (Inventory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.actor many-to-many child table. - */ - def actorMultiset(): Field[Result[ActorRecord]] = actorMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.actor many-to-many child table. - */ - def actorMultiset[O <: Record](subquery: (Actor) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.category many-to-many child table. - */ - def categoryMultiset(): Field[Result[CategoryRecord]] = categoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.category many-to-many child table. - */ - def categoryMultiset[O <: Record](subquery: (Category) => TableLike[O]): Field[Result[O]] = manyToManyMultiset(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) override def as(alias: String): Film = new Film(DSL.name(alias), this) override def as(alias: Name): Film = new Film(alias, this) - override def as(alias: Table[_]): Film = new Film(alias.getQualifiedName(), this) /** * Rename this table @@ -359,23 +203,8 @@ extends TableImpl[FilmRecord]( */ override def rename(name: Name): Film = new Film(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Film = new Film(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row14 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row14[Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object] = super.fieldsRow.asInstanceOf[ Row14[Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11(), r.value12(), r.value13(), r.value14())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, Integer, Long, Long, Short, BigDecimal, Short, BigDecimal, MpaaRating, LocalDateTime, Array[String], Object) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11(), r.value12(), r.value13(), r.value14())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala index 2782c1c..486dd5b 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmActor.scala @@ -10,7 +10,6 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -19,18 +18,14 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.ActorRecord import org.jooq.demo.skala.db.tables.records.FilmActorRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -124,33 +119,8 @@ extends TableImpl[FilmActorRecord]( * Get the implicit join path to the public.film table. */ lazy val film: Film = { new Film(this, Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def actorRow(): Field[ActorRecord] = actorRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def actorRow[O <: Record](subquery: (Actor) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_ACTOR_ID_FKEY, (t: Table[ActorRecord]) => subquery(t.asInstanceOf[Actor])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_actor to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_ACTOR__FILM_ACTOR_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) override def as(alias: String): FilmActor = new FilmActor(DSL.name(alias), this) override def as(alias: Name): FilmActor = new FilmActor(alias, this) - override def as(alias: Table[_]): FilmActor = new FilmActor(alias.getQualifiedName(), this) /** * Rename this table @@ -162,23 +132,8 @@ extends TableImpl[FilmActorRecord]( */ override def rename(name: Name): FilmActor = new FilmActor(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmActor = new FilmActor(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala index bb0dcf1..0ada8d0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmCategory.scala @@ -10,7 +10,6 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -18,17 +17,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CategoryRecord import org.jooq.demo.skala.db.tables.records.FilmCategoryRecord -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -120,33 +115,8 @@ extends TableImpl[FilmCategoryRecord]( * Get the implicit join path to the public.category table. */ lazy val category: Category = { new Category(this, Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def categoryRow(): Field[CategoryRecord] = categoryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.film_category to-one parent table. - */ - def categoryRow[O <: Record](subquery: (Category) => TableLike[O]): Field[O] = toOneRow(Keys.FILM_CATEGORY__FILM_CATEGORY_CATEGORY_ID_FKEY, (t: Table[CategoryRecord]) => subquery(t.asInstanceOf[Category])) override def as(alias: String): FilmCategory = new FilmCategory(DSL.name(alias), this) override def as(alias: Name): FilmCategory = new FilmCategory(alias, this) - override def as(alias: Table[_]): FilmCategory = new FilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -158,23 +128,8 @@ extends TableImpl[FilmCategoryRecord]( */ override def rename(name: Name): FilmCategory = new FilmCategory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmCategory = new FilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala index e89b5f7..d5a7934 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmInStock.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Integer import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -16,7 +15,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -91,7 +89,6 @@ extends TableImpl[FilmInStockRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmInStock = new FilmInStock(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): FilmInStock = new FilmInStock(alias, null, null, this, parameters) - override def as(alias: Table[_]): FilmInStock = new FilmInStock(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -103,11 +100,6 @@ extends TableImpl[FilmInStockRecord]( */ override def rename(name: Name): FilmInStock = new FilmInStock(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmInStock = new FilmInStock(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -134,14 +126,4 @@ extends TableImpl[FilmInStockRecord]( pFilmId, pStoreId ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala index e2e8994..4c7052a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmList.scala @@ -9,7 +9,6 @@ import java.lang.Long import java.lang.Short import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -58,22 +56,7 @@ extends TableImpl[FilmListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((actor.first_name)::text || ' '::text) || (actor.last_name)::text)) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { /** @@ -143,7 +126,6 @@ extends TableImpl[FilmListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmList = new FilmList(DSL.name(alias), this) override def as(alias: Name): FilmList = new FilmList(alias, this) - override def as(alias: Table[_]): FilmList = new FilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -155,23 +137,8 @@ extends TableImpl[FilmListRecord]( */ override def rename(name: Name): FilmList = new FilmList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmList = new FilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala index 9d12bec..8062932 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/FilmNotInStock.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Integer import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -16,7 +15,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row1 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -91,7 +89,6 @@ extends TableImpl[FilmNotInStockRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): FilmNotInStock = new FilmNotInStock(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): FilmNotInStock = new FilmNotInStock(alias, null, null, this, parameters) - override def as(alias: Table[_]): FilmNotInStock = new FilmNotInStock(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -103,11 +100,6 @@ extends TableImpl[FilmNotInStockRecord]( */ override def rename(name: Name): FilmNotInStock = new FilmNotInStock(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): FilmNotInStock = new FilmNotInStock(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row1 type methods // ------------------------------------------------------------------------- @@ -134,14 +126,4 @@ extends TableImpl[FilmNotInStockRecord]( pFilmId, pStoreId ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala index 7b19cdc..6a79553 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Inventory.scala @@ -10,31 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.FilmRecord import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -135,57 +127,8 @@ extends TableImpl[InventoryRecord]( * Get the implicit join path to the public.store table. */ lazy val store: Store = { new Store(this, Keys.INVENTORY__INVENTORY_STORE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def filmRow(): Field[FilmRecord] = filmRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def filmRow[O <: Record](subquery: (Film) => TableLike[O]): Field[O] = toOneRow(Keys.INVENTORY__INVENTORY_FILM_ID_FKEY, (t: Table[FilmRecord]) => subquery(t.asInstanceOf[Film])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.inventory to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Inventory = new Inventory(DSL.name(alias), this) override def as(alias: Name): Inventory = new Inventory(alias, this) - override def as(alias: Table[_]): Inventory = new Inventory(alias.getQualifiedName(), this) /** * Rename this table @@ -197,23 +140,8 @@ extends TableImpl[InventoryRecord]( */ override def rename(name: Name): Inventory = new Inventory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Inventory = new Inventory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala index efe8b85..4fb7bfb 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Language.scala @@ -8,7 +8,6 @@ import java.lang.Class import java.lang.Long import java.lang.String import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -108,7 +106,6 @@ extends TableImpl[LanguageRecord]( override def getPrimaryKey: UniqueKey[LanguageRecord] = Keys.LANGUAGE_PKEY override def as(alias: String): Language = new Language(DSL.name(alias), this) override def as(alias: Name): Language = new Language(alias, this) - override def as(alias: Table[_]): Language = new Language(alias.getQualifiedName(), this) /** * Rename this table @@ -120,23 +117,8 @@ extends TableImpl[LanguageRecord]( */ override def rename(name: Name): Language = new Language(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Language = new Language(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[Long, String, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row3[Long, String, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala index 12e07e2..e0bd774 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/NicerButSlowerFilmList.scala @@ -9,7 +9,6 @@ import java.lang.Long import java.lang.Short import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -17,7 +16,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -58,22 +56,7 @@ extends TableImpl[NicerButSlowerFilmListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "nicer_but_slower_film_list" as SELECT film.film_id AS fid, - film.title, - film.description, - category.name AS category, - film.rental_rate AS price, - film.length, - film.rating, - group_concat((((upper("substring"((actor.first_name)::text, 1, 1)) || lower("substring"((actor.first_name)::text, 2))) || upper("substring"((actor.last_name)::text, 1, 1))) || lower("substring"((actor.last_name)::text, 2)))) AS actors - FROM ((((category - LEFT JOIN film_category ON ((category.category_id = film_category.category_id))) - LEFT JOIN film ON ((film_category.film_id = film.film_id))) - JOIN film_actor ON ((film.film_id = film_actor.film_id))) - JOIN actor ON ((film_actor.actor_id = actor.actor_id))) - GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating; - """) + TableOptions.view("create view \"nicer_but_slower_film_list\" as SELECT film.film_id AS fid,\n film.title,\n film.description,\n category.name AS category,\n film.rental_rate AS price,\n film.length,\n film.rating,\n group_concat((((upper(\"substring\"((actor.first_name)::text, 1, 1)) || lower(\"substring\"((actor.first_name)::text, 2))) || upper(\"substring\"((actor.last_name)::text, 1, 1))) || lower(\"substring\"((actor.last_name)::text, 2)))) AS actors\n FROM ((((category\n LEFT JOIN film_category ON ((category.category_id = film_category.category_id)))\n LEFT JOIN film ON ((film_category.film_id = film.film_id)))\n JOIN film_actor ON ((film.film_id = film_actor.film_id)))\n JOIN actor ON ((film_actor.actor_id = actor.actor_id)))\n GROUP BY film.film_id, film.title, film.description, category.name, film.rental_rate, film.length, film.rating;") ) { /** @@ -145,7 +128,6 @@ extends TableImpl[NicerButSlowerFilmListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): NicerButSlowerFilmList = new NicerButSlowerFilmList(DSL.name(alias), this) override def as(alias: Name): NicerButSlowerFilmList = new NicerButSlowerFilmList(alias, this) - override def as(alias: Table[_]): NicerButSlowerFilmList = new NicerButSlowerFilmList(alias.getQualifiedName(), this) /** * Rename this table @@ -157,23 +139,8 @@ extends TableImpl[NicerButSlowerFilmListRecord]( */ override def rename(name: Name): NicerButSlowerFilmList = new NicerButSlowerFilmList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): NicerButSlowerFilmList = new NicerButSlowerFilmList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, BigDecimal, Short, MpaaRating, String] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, BigDecimal, Short, MpaaRating, String) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala index 330bac1..1114eda 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Payment.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -21,19 +20,14 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -149,45 +143,8 @@ extends TableImpl[PaymentRecord]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def as(alias: String): Payment = new Payment(DSL.name(alias), this) override def as(alias: Name): Payment = new Payment(alias, this) - override def as(alias: Table[_]): Payment = new Payment(alias.getQualifiedName(), this) /** * Rename this table @@ -199,23 +156,8 @@ extends TableImpl[PaymentRecord]( */ override def rename(name: Name): Payment = new Payment(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Payment = new Payment(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala index 4021403..c7975e1 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_01.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_01Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_01 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_01Record] ] = Arrays.asList[ Check[PaymentP2007_01Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_01_payment_date_check"), "(((payment_date >= '2007-01-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-02-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_01 = new PaymentP2007_01(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_01 = new PaymentP2007_01(alias, this) - override def as(alias: Table[_]): PaymentP2007_01 = new PaymentP2007_01(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_01Record]( */ override def rename(name: Name): PaymentP2007_01 = new PaymentP2007_01(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_01 = new PaymentP2007_01(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala index 51145b1..079e218 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_02.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_02Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_02 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_02Record] ] = Arrays.asList[ Check[PaymentP2007_02Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_02_payment_date_check"), "(((payment_date >= '2007-02-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-03-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_02 = new PaymentP2007_02(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_02 = new PaymentP2007_02(alias, this) - override def as(alias: Table[_]): PaymentP2007_02 = new PaymentP2007_02(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_02Record]( */ override def rename(name: Name): PaymentP2007_02 = new PaymentP2007_02(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_02 = new PaymentP2007_02(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala index 819978b..f41149f 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_03.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_03Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_03 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_03Record] ] = Arrays.asList[ Check[PaymentP2007_03Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_03_payment_date_check"), "(((payment_date >= '2007-03-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-04-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_03 = new PaymentP2007_03(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_03 = new PaymentP2007_03(alias, this) - override def as(alias: Table[_]): PaymentP2007_03 = new PaymentP2007_03(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_03Record]( */ override def rename(name: Name): PaymentP2007_03 = new PaymentP2007_03(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_03 = new PaymentP2007_03(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala index d515730..4d82046 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_04.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_04Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_04 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_04Record] ] = Arrays.asList[ Check[PaymentP2007_04Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_04_payment_date_check"), "(((payment_date >= '2007-04-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-05-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_04 = new PaymentP2007_04(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_04 = new PaymentP2007_04(alias, this) - override def as(alias: Table[_]): PaymentP2007_04 = new PaymentP2007_04(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_04Record]( */ override def rename(name: Name): PaymentP2007_04 = new PaymentP2007_04(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_04 = new PaymentP2007_04(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala index 90854aa..db44265 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_05.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_05Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_05 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_05Record] ] = Arrays.asList[ Check[PaymentP2007_05Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_05_payment_date_check"), "(((payment_date >= '2007-05-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-06-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_05 = new PaymentP2007_05(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_05 = new PaymentP2007_05(alias, this) - override def as(alias: Table[_]): PaymentP2007_05 = new PaymentP2007_05(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_05Record]( */ override def rename(name: Name): PaymentP2007_05 = new PaymentP2007_05(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_05 = new PaymentP2007_05(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala index 741c7a3..618d1fd 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/PaymentP2007_06.scala @@ -11,7 +11,6 @@ import java.math.BigDecimal import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function import org.jooq.Check import org.jooq.Field @@ -22,18 +21,13 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row6 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -147,48 +141,11 @@ extends TableImpl[PaymentP2007_06Record]( * Get the implicit join path to the public.rental table. */ lazy val rental: Rental = { new Rental(this, Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY) } - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def rentalRow(): Field[RentalRecord] = rentalRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.payment_p2007_06 to-one parent table. - */ - def rentalRow[O <: Record](subquery: (Rental) => TableLike[O]): Field[O] = toOneRow(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) override def getChecks: List[ Check[PaymentP2007_06Record] ] = Arrays.asList[ Check[PaymentP2007_06Record] ]( Internal.createCheck(this, DSL.name("payment_p2007_06_payment_date_check"), "(((payment_date >= '2007-06-01 00:00:00'::timestamp without time zone) AND (payment_date < '2007-07-01 00:00:00'::timestamp without time zone)))", true) ) override def as(alias: String): PaymentP2007_06 = new PaymentP2007_06(DSL.name(alias), this) override def as(alias: Name): PaymentP2007_06 = new PaymentP2007_06(alias, this) - override def as(alias: Table[_]): PaymentP2007_06 = new PaymentP2007_06(alias.getQualifiedName(), this) /** * Rename this table @@ -200,23 +157,8 @@ extends TableImpl[PaymentP2007_06Record]( */ override def rename(name: Name): PaymentP2007_06 = new PaymentP2007_06(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): PaymentP2007_06 = new PaymentP2007_06(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row6 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row6[Long, Long, Long, Long, BigDecimal, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, Long, BigDecimal, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala index 5b90d05..57f1e5e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Rental.scala @@ -10,38 +10,23 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row7 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord import org.jooq.demo.skala.db.tables.records.RentalRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -162,213 +147,8 @@ extends TableImpl[RentalRecord]( * Get the implicit join path to the public.staff table. */ lazy val staff: Staff = { new Staff(this, Keys.RENTAL__RENTAL_STAFF_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def inventoryRow(): Field[InventoryRecord] = inventoryRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def inventoryRow[O <: Record](subquery: (Inventory) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_INVENTORY_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def customerRow(): Field[CustomerRecord] = customerRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def customerRow[O <: Record](subquery: (Customer) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_CUSTOMER_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.rental to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_RENTAL_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_RENTAL_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_RENTAL_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_RENTAL_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_RENTAL_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_RENTAL_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_RENTAL_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) override def as(alias: String): Rental = new Rental(DSL.name(alias), this) override def as(alias: Name): Rental = new Rental(alias, this) - override def as(alias: Table[_]): Rental = new Rental(alias.getQualifiedName(), this) /** * Rename this table @@ -380,23 +160,8 @@ extends TableImpl[RentalRecord]( */ override def rename(name: Name): Rental = new Rental(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Rental = new Rental(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row7 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row7[Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row7[Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, LocalDateTime, Long, Long, LocalDateTime, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala index a7afcc8..5d500c5 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/RewardsReport.scala @@ -12,7 +12,6 @@ import java.lang.String import java.math.BigDecimal import java.time.LocalDate import java.time.LocalDateTime -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -21,7 +20,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row10 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -143,7 +141,6 @@ extends TableImpl[RewardsReportRecord]( override def getIdentity: Identity[RewardsReportRecord, Long] = super.getIdentity.asInstanceOf[ Identity[RewardsReportRecord, Long] ] override def as(alias: String): RewardsReport = new RewardsReport(DSL.name(alias), null, null, this, parameters) override def as(alias: Name): RewardsReport = new RewardsReport(alias, null, null, this, parameters) - override def as(alias: Table[_]): RewardsReport = new RewardsReport(alias.getQualifiedName(), null, null, this, parameters) /** * Rename this table @@ -155,11 +152,6 @@ extends TableImpl[RewardsReportRecord]( */ override def rename(name: Name): RewardsReport = new RewardsReport(name, null, null, null, parameters) - /** - * Rename this table - */ - override def rename(name: Table[_]): RewardsReport = new RewardsReport(name.getQualifiedName(), null, null, null, parameters) - // ------------------------------------------------------------------------- // Row10 type methods // ------------------------------------------------------------------------- @@ -186,14 +178,4 @@ extends TableImpl[RewardsReportRecord]( minMonthlyPurchases, minDollarAmountPurchased ))).map(r => if (aliased()) r.as(getUnqualifiedName) else r).get - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, String, String, String, Long, Boolean, LocalDate, LocalDateTime, Integer) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala index 2f53e4d..7672a5a 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByFilmCategory.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row2 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,18 +53,7 @@ extends TableImpl[SalesByFilmCategoryRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_film_category" as SELECT c.name AS category, - sum(p.amount) AS total_sales - FROM (((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN film f ON ((i.film_id = f.film_id))) - JOIN film_category fc ON ((f.film_id = fc.film_id))) - JOIN category c ON ((fc.category_id = c.category_id))) - GROUP BY c.name - ORDER BY (sum(p.amount)) DESC; - """) + TableOptions.view("create view \"sales_by_film_category\" as SELECT c.name AS category,\n sum(p.amount) AS total_sales\n FROM (((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN film f ON ((i.film_id = f.film_id)))\n JOIN film_category fc ON ((f.film_id = fc.film_id)))\n JOIN category c ON ((fc.category_id = c.category_id)))\n GROUP BY c.name\n ORDER BY (sum(p.amount)) DESC;") ) { /** @@ -108,7 +95,6 @@ extends TableImpl[SalesByFilmCategoryRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): SalesByFilmCategory = new SalesByFilmCategory(DSL.name(alias), this) override def as(alias: Name): SalesByFilmCategory = new SalesByFilmCategory(alias, this) - override def as(alias: Table[_]): SalesByFilmCategory = new SalesByFilmCategory(alias.getQualifiedName(), this) /** * Rename this table @@ -120,23 +106,8 @@ extends TableImpl[SalesByFilmCategoryRecord]( */ override def rename(name: Name): SalesByFilmCategory = new SalesByFilmCategory(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): SalesByFilmCategory = new SalesByFilmCategory(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row2 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row2[String, BigDecimal] = super.fieldsRow.asInstanceOf[ Row2[String, BigDecimal] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (String, BigDecimal) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (String, BigDecimal) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala index 833d5df..b98d34e 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/SalesByStore.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.String import java.math.BigDecimal -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row3 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,21 +53,7 @@ extends TableImpl[SalesByStoreRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "sales_by_store" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store, - (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager, - sum(p.amount) AS total_sales - FROM (((((((payment p - JOIN rental r ON ((p.rental_id = r.rental_id))) - JOIN inventory i ON ((r.inventory_id = i.inventory_id))) - JOIN store s ON ((i.store_id = s.store_id))) - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city c ON ((a.city_id = c.city_id))) - JOIN country cy ON ((c.country_id = cy.country_id))) - JOIN staff m ON ((s.manager_staff_id = m.staff_id))) - GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name - ORDER BY cy.country, c.city; - """) + TableOptions.view("create view \"sales_by_store\" as SELECT (((c.city)::text || ','::text) || (cy.country)::text) AS store,\n (((m.first_name)::text || ' '::text) || (m.last_name)::text) AS manager,\n sum(p.amount) AS total_sales\n FROM (((((((payment p\n JOIN rental r ON ((p.rental_id = r.rental_id)))\n JOIN inventory i ON ((r.inventory_id = i.inventory_id)))\n JOIN store s ON ((i.store_id = s.store_id)))\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city c ON ((a.city_id = c.city_id)))\n JOIN country cy ON ((c.country_id = cy.country_id)))\n JOIN staff m ON ((s.manager_staff_id = m.staff_id)))\n GROUP BY cy.country, c.city, s.store_id, m.first_name, m.last_name\n ORDER BY cy.country, c.city;") ) { /** @@ -114,7 +98,6 @@ extends TableImpl[SalesByStoreRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): SalesByStore = new SalesByStore(DSL.name(alias), this) override def as(alias: Name): SalesByStore = new SalesByStore(alias, this) - override def as(alias: Table[_]): SalesByStore = new SalesByStore(alias.getQualifiedName(), this) /** * Rename this table @@ -126,23 +109,8 @@ extends TableImpl[SalesByStoreRecord]( */ override def rename(name: Name): SalesByStore = new SalesByStore(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): SalesByStore = new SalesByStore(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row3 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row3[String, String, BigDecimal] = super.fieldsRow.asInstanceOf[ Row3[String, String, BigDecimal] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (String, String, BigDecimal) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (String, String, BigDecimal) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala index f9e3304..c9f0bb6 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Staff.scala @@ -11,36 +11,21 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row11 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.PaymentP2007_01Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_02Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_03Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_04Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_05Record -import org.jooq.demo.skala.db.tables.records.PaymentP2007_06Record -import org.jooq.demo.skala.db.tables.records.PaymentRecord -import org.jooq.demo.skala.db.tables.records.RentalRecord import org.jooq.demo.skala.db.tables.records.StaffRecord -import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal import org.jooq.impl.SQLDataType @@ -175,249 +160,8 @@ extends TableImpl[StaffRecord]( * Get the implicit join path to the public.store table. */ lazy val store: Store = { new Store(this, Keys.STAFF__STAFF_STORE_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists(): Condition = paymentExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment one-to-many child table. - */ - def paymentExists[O <: Record](subquery: (Payment) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists(): Condition = paymentP2007_01Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Exists[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists(): Condition = paymentP2007_02Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Exists[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists(): Condition = paymentP2007_03Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Exists[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists(): Condition = paymentP2007_04Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Exists[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists(): Condition = paymentP2007_05Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Exists[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists(): Condition = paymentP2007_06Exists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Exists[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Condition = oneToManyExists(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists(): Condition = rentalExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.rental one-to-many child table. - */ - def rentalExists[O <: Record](subquery: (Rental) => TableLike[O]): Condition = oneToManyExists(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists(): Condition = storeExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.store one-to-many child table. - */ - def storeExists[O <: Record](subquery: (Store) => TableLike[O]): Condition = oneToManyExists(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.STAFF__STAFF_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def storeRow(): Field[StoreRecord] = storeRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.staff to-one parent table. - */ - def storeRow[O <: Record](subquery: (Store) => TableLike[O]): Field[O] = toOneRow(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset(): Field[Result[PaymentRecord]] = paymentMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment one-to-many child table. - */ - def paymentMultiset[O <: Record](subquery: (Payment) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT__PAYMENT_STAFF_ID_FKEY, (t: Table[PaymentRecord]) => subquery(t.asInstanceOf[Payment])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset(): Field[Result[PaymentP2007_01Record]] = paymentP2007_01Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_01 one-to-many child table. - */ - def paymentP2007_01Multiset[O <: Record](subquery: (PaymentP2007_01) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_01__PAYMENT_P2007_01_STAFF_ID_FKEY, (t: Table[PaymentP2007_01Record]) => subquery(t.asInstanceOf[PaymentP2007_01])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset(): Field[Result[PaymentP2007_02Record]] = paymentP2007_02Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_02 one-to-many child table. - */ - def paymentP2007_02Multiset[O <: Record](subquery: (PaymentP2007_02) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_02__PAYMENT_P2007_02_STAFF_ID_FKEY, (t: Table[PaymentP2007_02Record]) => subquery(t.asInstanceOf[PaymentP2007_02])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset(): Field[Result[PaymentP2007_03Record]] = paymentP2007_03Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_03 one-to-many child table. - */ - def paymentP2007_03Multiset[O <: Record](subquery: (PaymentP2007_03) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_03__PAYMENT_P2007_03_STAFF_ID_FKEY, (t: Table[PaymentP2007_03Record]) => subquery(t.asInstanceOf[PaymentP2007_03])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset(): Field[Result[PaymentP2007_04Record]] = paymentP2007_04Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_04 one-to-many child table. - */ - def paymentP2007_04Multiset[O <: Record](subquery: (PaymentP2007_04) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_04__PAYMENT_P2007_04_STAFF_ID_FKEY, (t: Table[PaymentP2007_04Record]) => subquery(t.asInstanceOf[PaymentP2007_04])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset(): Field[Result[PaymentP2007_05Record]] = paymentP2007_05Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_05 one-to-many child table. - */ - def paymentP2007_05Multiset[O <: Record](subquery: (PaymentP2007_05) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_05__PAYMENT_P2007_05_STAFF_ID_FKEY, (t: Table[PaymentP2007_05Record]) => subquery(t.asInstanceOf[PaymentP2007_05])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset(): Field[Result[PaymentP2007_06Record]] = paymentP2007_06Multiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.payment_p2007_06 one-to-many child table. - */ - def paymentP2007_06Multiset[O <: Record](subquery: (PaymentP2007_06) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.PAYMENT_P2007_06__PAYMENT_P2007_06_STAFF_ID_FKEY, (t: Table[PaymentP2007_06Record]) => subquery(t.asInstanceOf[PaymentP2007_06])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset(): Field[Result[RentalRecord]] = rentalMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.rental one-to-many child table. - */ - def rentalMultiset[O <: Record](subquery: (Rental) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.RENTAL__RENTAL_STAFF_ID_FKEY, (t: Table[RentalRecord]) => subquery(t.asInstanceOf[Rental])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset(): Field[Result[StoreRecord]] = storeMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.store one-to-many child table. - */ - def storeMultiset[O <: Record](subquery: (Store) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StoreRecord]) => subquery(t.asInstanceOf[Store])) override def as(alias: String): Staff = new Staff(DSL.name(alias), this) override def as(alias: Name): Staff = new Staff(alias, this) - override def as(alias: Table[_]): Staff = new Staff(alias.getQualifiedName(), this) /** * Rename this table @@ -429,23 +173,8 @@ extends TableImpl[StaffRecord]( */ override def rename(name: Name): Staff = new Staff(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Staff = new Staff(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row11 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row11[Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]] = super.fieldsRow.asInstanceOf[ Row11[Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, Long, String, Long, Boolean, String, String, LocalDateTime, Array[Byte]) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8(), r.value9(), r.value10(), r.value11())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala index 6109447..dd7e446 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/StaffList.scala @@ -7,7 +7,6 @@ package org.jooq.demo.skala.db.tables import java.lang.Class import java.lang.Long import java.lang.String -import java.util.function.Function import org.jooq.Field import org.jooq.ForeignKey @@ -15,7 +14,6 @@ import org.jooq.Name import org.jooq.Record import org.jooq.Row8 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField import org.jooq.TableOptions @@ -55,20 +53,7 @@ extends TableImpl[StaffListRecord]( aliased, parameters, DSL.comment(""), - TableOptions.view(""" - create view "staff_list" as SELECT s.staff_id AS id, - (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name, - a.address, - a.postal_code AS "zip code", - a.phone, - city.city, - country.country, - s.store_id AS sid - FROM (((staff s - JOIN address a ON ((s.address_id = a.address_id))) - JOIN city ON ((a.city_id = city.city_id))) - JOIN country ON ((city.country_id = country.country_id))); - """) + TableOptions.view("create view \"staff_list\" as SELECT s.staff_id AS id,\n (((s.first_name)::text || ' '::text) || (s.last_name)::text) AS name,\n a.address,\n a.postal_code AS \"zip code\",\n a.phone,\n city.city,\n country.country,\n s.store_id AS sid\n FROM (((staff s\n JOIN address a ON ((s.address_id = a.address_id)))\n JOIN city ON ((a.city_id = city.city_id)))\n JOIN country ON ((city.country_id = country.country_id)));") ) { /** @@ -138,7 +123,6 @@ extends TableImpl[StaffListRecord]( override def getSchema: Schema = if (aliased()) null else Public.PUBLIC override def as(alias: String): StaffList = new StaffList(DSL.name(alias), this) override def as(alias: Name): StaffList = new StaffList(alias, this) - override def as(alias: Table[_]): StaffList = new StaffList(alias.getQualifiedName(), this) /** * Rename this table @@ -150,23 +134,8 @@ extends TableImpl[StaffListRecord]( */ override def rename(name: Name): StaffList = new StaffList(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): StaffList = new StaffList(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row8 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row8[Long, String, String, String, String, String, String, Long] = super.fieldsRow.asInstanceOf[ Row8[Long, String, String, String, String, String, String, Long] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, String, String, String, String, String, String, Long) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4(), r.value5(), r.value6(), r.value7(), r.value8())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala index 57a1c60..99e6fbb 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/main/scala/org/jooq/demo/skala/db/tables/Store.scala @@ -10,31 +10,22 @@ import java.lang.String import java.time.LocalDateTime import java.util.Arrays import java.util.List -import java.util.function.Function -import org.jooq.Condition import org.jooq.Field import org.jooq.ForeignKey import org.jooq.Identity import org.jooq.Index import org.jooq.Name import org.jooq.Record -import org.jooq.Result import org.jooq.Row4 import org.jooq.Schema -import org.jooq.SelectField import org.jooq.Table import org.jooq.TableField -import org.jooq.TableLike import org.jooq.TableOptions import org.jooq.UniqueKey import org.jooq.demo.skala.db.Indexes import org.jooq.demo.skala.db.Keys import org.jooq.demo.skala.db.Public -import org.jooq.demo.skala.db.tables.records.AddressRecord -import org.jooq.demo.skala.db.tables.records.CustomerRecord -import org.jooq.demo.skala.db.tables.records.InventoryRecord -import org.jooq.demo.skala.db.tables.records.StaffRecord import org.jooq.demo.skala.db.tables.records.StoreRecord import org.jooq.impl.DSL import org.jooq.impl.Internal @@ -136,105 +127,8 @@ extends TableImpl[StoreRecord]( * Get the implicit join path to the public.address table. */ lazy val address: Address = { new Address(this, Keys.STORE__STORE_ADDRESS_ID_FKEY) } - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists(): Condition = customerExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.customer one-to-many child table. - */ - def customerExists[O <: Record](subquery: (Customer) => TableLike[O]): Condition = oneToManyExists(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists(): Condition = inventoryExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryExists[O <: Record](subquery: (Inventory) => TableLike[O]): Condition = oneToManyExists(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists(): Condition = staffExists(t => t) - - /** - * A convenience constructor for correlated EXISTSs expressions - * to the public.staff one-to-many child table. - */ - def staffExists[O <: Record](subquery: (Staff) => TableLike[O]): Condition = oneToManyExists(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def staffRow(): Field[StaffRecord] = staffRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def staffRow[O <: Record](subquery: (Staff) => TableLike[O]): Field[O] = toOneRow(Keys.STORE__STORE_MANAGER_STAFF_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def addressRow(): Field[AddressRecord] = addressRow(t => t) - - /** - * A convenience constructor for correlated ROWs expressions to - * the public.store to-one parent table. - */ - def addressRow[O <: Record](subquery: (Address) => TableLike[O]): Field[O] = toOneRow(Keys.STORE__STORE_ADDRESS_ID_FKEY, (t: Table[AddressRecord]) => subquery(t.asInstanceOf[Address])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset(): Field[Result[CustomerRecord]] = customerMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.customer one-to-many child table. - */ - def customerMultiset[O <: Record](subquery: (Customer) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.CUSTOMER__CUSTOMER_STORE_ID_FKEY, (t: Table[CustomerRecord]) => subquery(t.asInstanceOf[Customer])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset(): Field[Result[InventoryRecord]] = inventoryMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.inventory one-to-many child table. - */ - def inventoryMultiset[O <: Record](subquery: (Inventory) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.INVENTORY__INVENTORY_STORE_ID_FKEY, (t: Table[InventoryRecord]) => subquery(t.asInstanceOf[Inventory])) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset(): Field[Result[StaffRecord]] = staffMultiset(t => t) - - /** - * A convenience constructor for correlated MULTISETs expressions - * to the public.staff one-to-many child table. - */ - def staffMultiset[O <: Record](subquery: (Staff) => TableLike[O]): Field[Result[O]] = oneToManyMultiset(Keys.STAFF__STAFF_STORE_ID_FKEY, (t: Table[StaffRecord]) => subquery(t.asInstanceOf[Staff])) override def as(alias: String): Store = new Store(DSL.name(alias), this) override def as(alias: Name): Store = new Store(alias, this) - override def as(alias: Table[_]): Store = new Store(alias.getQualifiedName(), this) /** * Rename this table @@ -246,23 +140,8 @@ extends TableImpl[StoreRecord]( */ override def rename(name: Name): Store = new Store(name, null) - /** - * Rename this table - */ - override def rename(name: Table[_]): Store = new Store(name.getQualifiedName(), null) - // ------------------------------------------------------------------------- // Row4 type methods // ------------------------------------------------------------------------- override def fieldsRow: Row4[Long, Long, Long, LocalDateTime] = super.fieldsRow.asInstanceOf[ Row4[Long, Long, Long, LocalDateTime] ] - - /** - * Convenience mapping calling {@link #convertFrom(Function)}. - */ - def mapping[U](from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) - - /** - * Convenience mapping calling {@link #convertFrom(Class, Function)}. - */ - def mapping[U](toType: Class[U], from: (Long, Long, Long, LocalDateTime) => U): SelectField[U] = convertFrom(toType,r => from.apply(r.value1(), r.value2(), r.value3(), r.value4())) } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala index 4bbea05..49091ce 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo01Querying.scala @@ -171,18 +171,19 @@ class Demo01Querying extends AbstractDemo { .fetch } - @Test - def nestedRecords(): Unit = { - title("Need all columns of those active records?") - val r = ctx - .select(CUSTOMER, CUSTOMER.address.city.country) - .from(CUSTOMER) - .orderBy(1, 2) - .limit(1) - .fetchSingle - println("Customer %s %s from %s".formatted(r.value1.getFirstName, r.value1.getLastName, r.value2.getCountry)) - // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns - } + // Available in jOOQ 3.17 only +// @Test +// def nestedRecords(): Unit = { +// title("Need all columns of those active records?") +// val r = ctx +// .select(CUSTOMER, CUSTOMER.address.city.country) +// .from(CUSTOMER) +// .orderBy(1, 2) +// .limit(1) +// .fetchSingle +// println("Customer %s %s from %s".formatted(r.value1.getFirstName, r.value1.getLastName, r.value2.getCountry)) +// // Though beware. While this is convenient, it's also likely inefficient as you're projecting too many columns +// } @Test def nestedRowValuesWithAdHocConverters(): Unit = { @@ -257,28 +258,26 @@ class Demo01Querying extends AbstractDemo { case class Category(name: String) case class Film(title: String, actors: util.List[Actor], categories: util.List[Category]) - // TODO: The amount of type witnesses required in the Scala version of this method are unwieldy - // I currently do not know if this is a limitation of the Scala / Java interop or me misunderstanding which - // implicit conversions should be used here... Please feel free to suggest improvements! - val result: util.List[Film] = ctx - .select( - FILM.TITLE, - multiset( - select(row(FILM_ACTOR.actor.FIRST_NAME, FILM_ACTOR.actor.LAST_NAME).mapping(Name(_, _))) - .from(FILM_ACTOR) - .where(FILM_ACTOR.FILM_ID.eq(FILM.FILM_ID))).mapping(Actor), - multiset( - select(FILM_CATEGORY.category.NAME) - .from(FILM_CATEGORY) - .where(FILM_CATEGORY.FILM_ID.eq(FILM.FILM_ID))).mapping(Category)) - .from(FILM) - .orderBy(FILM.TITLE) - .limit(5) - .fetch(Film) - - result.forEach { film => - println("Film %s with categories %s and actors %s ".formatted(film.title, film.categories, film.actors)) - } + // Some implicit classes used in this example are available in jOOQ 3.17, only +// val result: util.List[Film] = ctx +// .select( +// FILM.TITLE, +// multiset( +// select(row(FILM_ACTOR.actor.FIRST_NAME, FILM_ACTOR.actor.LAST_NAME).mapping(Name(_, _))) +// .from(FILM_ACTOR) +// .where(FILM_ACTOR.FILM_ID.eq(FILM.FILM_ID))).mapping(Actor), +// multiset( +// select(FILM_CATEGORY.category.NAME) +// .from(FILM_CATEGORY) +// .where(FILM_CATEGORY.FILM_ID.eq(FILM.FILM_ID))).mapping(Category)) +// .from(FILM) +// .orderBy(FILM.TITLE) +// .limit(5) +// .fetch(Film) +// +// result.forEach { film => +// println("Film %s with categories %s and actors %s ".formatted(film.title, film.categories, film.actors)) +// } // Try modifying the records and see what needs to be done to get the query to compile again } @@ -287,22 +286,23 @@ class Demo01Querying extends AbstractDemo { title("Arbitrary nested data structures are possible") case class Film(title: String, revenue: util.Map[LocalDate, BigDecimal]) - val result = ctx - .select( - FILM.TITLE, - multiset( - select(PAYMENT.PAYMENT_DATE.cast(LOCALDATE), sum(PAYMENT.AMOUNT)) - .from(PAYMENT) - .groupBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE)) - .orderBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE))).intoMap()) - .from(FILM) - .orderBy(FILM.TITLE) - .fetch(Film) - - result.forEach { film: Film => - println("") - println("Film %s with revenue: ".formatted(film.title)) - film.revenue.forEach((d: LocalDate, r: BigDecimal) => println(" %s: %s".formatted(d, r))) - } + // Some implicit classes used in this example are available in jOOQ 3.17, only +// val result = ctx +// .select( +// FILM.TITLE, +// multiset( +// select(PAYMENT.PAYMENT_DATE.cast(LOCALDATE), sum(PAYMENT.AMOUNT)) +// .from(PAYMENT) +// .groupBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE)) +// .orderBy(PAYMENT.PAYMENT_DATE.cast(LOCALDATE))).intoMap()) +// .from(FILM) +// .orderBy(FILM.TITLE) +// .fetch(Film) +// +// result.forEach { film: Film => +// println("") +// println("Film %s with revenue: ".formatted(film.title)) +// film.revenue.forEach((d: LocalDate, r: BigDecimal) => println(" %s: %s".formatted(d, r))) +// } } } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala index c46047a..814b8a6 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo11QueryObjectModel.scala @@ -30,13 +30,14 @@ class Demo11QueryObjectModel extends AbstractDemo { println("FROM : " + select.$from) println("WHERE : " + select.$where) - title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") - println(select - .$select(List(ACTOR.ACTOR_ID) ++ select.$select) - .$orderBy(List(ACTOR.ACTOR_ID.asc))) - - title("The old query is untouched:") - println(select) + // Available in jOOQ 3.17 only +// title("You can also alter a property of a query, to create a new query (QOM operations are immutable):") +// println(select +// .$select(List(ACTOR.ACTOR_ID) ++ select.$select) +// .$orderBy(List(ACTOR.ACTOR_ID.asc))) +// +// title("The old query is untouched:") +// println(select) } @Test @@ -89,44 +90,45 @@ class Demo11QueryObjectModel extends AbstractDemo { p )) - title("Inverting the < predicate") - println(select1.$replace((p: QueryPart) => p match { - case lt: QOM.Lt[_] => lt.$converse - case _ => p - })) - - title("Appending a predicate") - println(select1.$replace(appendSecurityCheck)) - - title("Appending a predicate even to subqueries") - val select2 = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.lt( - select(max(ACTOR.ACTOR_ID)) - .from(ACTOR) - )) - println(select2.$replace(appendSecurityCheck)) + // Available in jOOQ 3.17 only +// title("Inverting the < predicate") +// println(select1.$replace((p: QueryPart) => p match { +// case lt: QOM.Lt[_] => lt.$converse +// case _ => p +// })) +// +// title("Appending a predicate") +// println(select1.$replace(appendSecurityCheck)) +// +// title("Appending a predicate even to subqueries") +// val select2 = ctx.select(ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.lt( +// select(max(ACTOR.ACTOR_ID)) +// .from(ACTOR) +// )) +// println(select2.$replace(appendSecurityCheck)) /* [/pro] */ } - /* [pro] */ - private def appendSecurityCheck: Function[QueryPart, QueryPart] = p => { - val c = condition("security_check()") - - // Beware of performance and infinite recursions, though! - p match { - case s: Select[_] => - // Append the predicate if there is no predicate - if (s.$where == null) - s.$where(c) - - // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) - else if (!s.$where.$traverse(Traversers.recursing(!_.isInstanceOf[Select[_]], Traversers.containing(c)))) - s.$where(and(s.$where, c)) - else - p - case _ => p - } - } - /* [/pro] */ +// /* [pro] */ +// private def appendSecurityCheck: Function[QueryPart, QueryPart] = p => { +// val c = condition("security_check()") +// +// // Beware of performance and infinite recursions, though! +// p match { +// case s: Select[_] => +// // Append the predicate if there is no predicate +// if (s.$where == null) +// s.$where(c) +// +// // If there's already a predicate, check if the predicate contains the predicate already (don't recurse into subqueries) +// else if (!s.$where.$traverse(Traversers.recursing(!_.isInstanceOf[Select[_]], Traversers.containing(c)))) +// s.$where(and(s.$where, c)) +// else +// p +// case _ => p +// } +// } +// /* [/pro] */ } diff --git a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala index af2b96a..69d24d0 100644 --- a/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala +++ b/jOOQ-demo-pro/jOOQ-demo-scala/src/test/scala/org/jooq/demo/skala/Demo13Reactive.scala @@ -39,46 +39,47 @@ class Demo13Reactive extends AbstractDemo { .forEach(println(_)) } - @Test - def reactiveTransactions(): Unit = { - Flux.from(ctx - - // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback - // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: - // https://blog.jooq.org/nested-transactions-in-jooq/ - .transactionPublisher(c => Flux - .from(c.dsl - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")) - - // Within the transactional scope, the above record is visible, and we can log it - .thenMany(c.dsl - .selectFrom(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .log - - // This should produces a constraint violation exception, rolling back the transaction - .thenMany(c.dsl - .insertInto(ACTOR) - .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) - .values(201L, "A", "A")))) - - // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the - // Rollback reason: - .collectList - .doOnError { _.printStackTrace() } - .onErrorReturn(List.of()) - - // This record is visible only if the transaction has been committed: - .thenMany(ctx - .select(ACTOR.ACTOR_ID) - .from(ACTOR) - .where(ACTOR.ACTOR_ID.eq(201L))) - .collectList - .block - .forEach(println(_)) - } + // Available in jOOQ 3.17 only +// @Test +// def reactiveTransactions(): Unit = { +// Flux.from(ctx +// +// // Just like synchronous, JDBC based transactions, reactive transactions commit by default, and rollback +// // on error. Nested transactions using SAVEPOINT are supported by default. See this blog for details: +// // https://blog.jooq.org/nested-transactions-in-jooq/ +// .transactionPublisher(c => Flux +// .from(c.dsl +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")) +// +// // Within the transactional scope, the above record is visible, and we can log it +// .thenMany(c.dsl +// .selectFrom(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .log +// +// // This should produces a constraint violation exception, rolling back the transaction +// .thenMany(c.dsl +// .insertInto(ACTOR) +// .columns(ACTOR.ACTOR_ID, ACTOR.FIRST_NAME, ACTOR.LAST_NAME) +// .values(201L, "A", "A")))) +// +// // Outside of the scope, we have committed or rollbacked the transaction, so on error, we can see the +// // Rollback reason: +// .collectList +// .doOnError { _.printStackTrace() } +// .onErrorReturn(List.of()) +// +// // This record is visible only if the transaction has been committed: +// .thenMany(ctx +// .select(ACTOR.ACTOR_ID) +// .from(ACTOR) +// .where(ACTOR.ACTOR_ID.eq(201L))) +// .collectList +// .block +// .forEach(println(_)) +// } @After override def teardown(): Unit = { diff --git a/jOOQ-demo-pro/jOOQ-demo-utils/pom.xml b/jOOQ-demo-pro/jOOQ-demo-utils/pom.xml index d84caa5..d9a6acd 100644 --- a/jOOQ-demo-pro/jOOQ-demo-utils/pom.xml +++ b/jOOQ-demo-pro/jOOQ-demo-utils/pom.xml @@ -6,7 +6,7 @@ org.jooq.trial jooq-demo - 0.9.0 + 3.16.6 jooq-demo-utils diff --git a/jOOQ-demo-pro/pom.xml b/jOOQ-demo-pro/pom.xml index fae566d..6144c1e 100644 --- a/jOOQ-demo-pro/pom.xml +++ b/jOOQ-demo-pro/pom.xml @@ -5,7 +5,7 @@ org.jooq.trial jooq-demo - 0.9.0 + 3.16.6 jOOQ Demo (Trial Edition) pom @@ -19,8 +19,7 @@ UTF-8 - 3.17.0-SNAPSHOT - 0.9.0 + 3.16.6 8.5.11 42.3.4 2.17.1 @@ -48,7 +47,7 @@ org.jooq.trial jooq-demo-utils - ${jooq.demo.version} + ${jooq.version}