From 7c765b836d3b67d1e4faa6f660f55333c30189b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Raddum=20Berg?= <elacin@gmail.com>
Date: Wed, 10 Jul 2024 13:19:01 +0200
Subject: [PATCH] Add `upsertStreaming` (fix #115)

---
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 12 ++++++
 .../compositepk/person/PersonRepoMock.scala   |  6 +++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 12 ++++++
 .../football_club/FootballClubRepoMock.scala  |  6 +++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 12 ++++++
 .../MaritalStatusRepoMock.scala               |  6 +++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 22 +++++++++++
 .../myschema/person/PersonRepoMock.scala      |  6 +++
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 12 ++++++
 .../compositepk/person/PersonRepoMock.scala   |  6 +++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 12 ++++++
 .../football_club/FootballClubRepoMock.scala  |  6 +++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 12 ++++++
 .../MaritalStatusRepoMock.scala               |  6 +++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 22 +++++++++++
 .../myschema/person/PersonRepoMock.scala      |  6 +++
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 13 +++++++
 .../compositepk/person/PersonRepoMock.scala   | 10 +++++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 13 +++++++
 .../football_club/FootballClubRepoMock.scala  | 10 +++++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 13 +++++++
 .../MaritalStatusRepoMock.scala               | 10 +++++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 23 +++++++++++
 .../myschema/person/PersonRepoMock.scala      | 10 +++++
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 13 +++++++
 .../compositepk/person/PersonRepoMock.scala   | 10 +++++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 13 +++++++
 .../football_club/FootballClubRepoMock.scala  | 10 +++++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 13 +++++++
 .../MaritalStatusRepoMock.scala               | 10 +++++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 23 +++++++++++
 .../myschema/person/PersonRepoMock.scala      | 10 +++++
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 12 ++++++
 .../compositepk/person/PersonRepoMock.scala   |  8 ++++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 12 ++++++
 .../football_club/FootballClubRepoMock.scala  |  8 ++++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 12 ++++++
 .../MaritalStatusRepoMock.scala               |  8 ++++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 22 +++++++++++
 .../myschema/person/PersonRepoMock.scala      |  8 ++++
 .../compositepk/person/PersonRepo.scala       |  1 +
 .../compositepk/person/PersonRepoImpl.scala   | 12 ++++++
 .../compositepk/person/PersonRepoMock.scala   |  8 ++++
 .../football_club/FootballClubRepo.scala      |  1 +
 .../football_club/FootballClubRepoImpl.scala  | 12 ++++++
 .../football_club/FootballClubRepoMock.scala  |  8 ++++
 .../marital_status/MaritalStatusRepo.scala    |  1 +
 .../MaritalStatusRepoImpl.scala               | 12 ++++++
 .../MaritalStatusRepoMock.scala               |  8 ++++
 .../myschema/person/PersonRepo.scala          |  1 +
 .../myschema/person/PersonRepoImpl.scala      | 22 +++++++++++
 .../myschema/person/PersonRepoMock.scala      |  8 ++++
 site-in/other-features/testing-with-stubs.md  |  6 +++
 .../department/DepartmentRepo.scala           |  1 +
 .../department/DepartmentRepoImpl.scala       | 14 +++++++
 .../department/DepartmentRepoMock.scala       |  6 +++
 .../employee/EmployeeRepo.scala               |  1 +
 .../employee/EmployeeRepoImpl.scala           | 25 ++++++++++++
 .../employee/EmployeeRepoMock.scala           |  6 +++
 .../EmployeedepartmenthistoryRepo.scala       |  1 +
 .../EmployeedepartmenthistoryRepoImpl.scala   | 13 +++++++
 .../EmployeedepartmenthistoryRepoMock.scala   |  6 +++
 .../EmployeepayhistoryRepo.scala              |  1 +
 .../EmployeepayhistoryRepoImpl.scala          | 14 +++++++
 .../EmployeepayhistoryRepoMock.scala          |  6 +++
 .../jobcandidate/JobcandidateRepo.scala       |  1 +
 .../jobcandidate/JobcandidateRepoImpl.scala   | 14 +++++++
 .../jobcandidate/JobcandidateRepoMock.scala   |  6 +++
 .../humanresources/shift/ShiftRepo.scala      |  1 +
 .../humanresources/shift/ShiftRepoImpl.scala  | 15 +++++++
 .../humanresources/shift/ShiftRepoMock.scala  |  6 +++
 .../information_schema/CardinalNumber.scala   | 38 ++++++++++++++++++
 .../information_schema/CharacterData.scala    | 38 ++++++++++++++++++
 .../information_schema/SqlIdentifier.scala    | 38 ++++++++++++++++++
 .../information_schema/TimeStamp.scala        | 39 +++++++++++++++++++
 .../information_schema/YesOrNo.scala          | 38 ++++++++++++++++++
 .../person/address/AddressRepo.scala          |  1 +
 .../person/address/AddressRepoImpl.scala      | 19 +++++++++
 .../person/address/AddressRepoMock.scala      |  6 +++
 .../person/addresstype/AddresstypeRepo.scala  |  1 +
 .../addresstype/AddresstypeRepoImpl.scala     | 14 +++++++
 .../addresstype/AddresstypeRepoMock.scala     |  6 +++
 .../businessentity/BusinessentityRepo.scala   |  1 +
 .../BusinessentityRepoImpl.scala              | 13 +++++++
 .../BusinessentityRepoMock.scala              |  6 +++
 .../BusinessentityaddressRepo.scala           |  1 +
 .../BusinessentityaddressRepoImpl.scala       | 13 +++++++
 .../BusinessentityaddressRepoMock.scala       |  6 +++
 .../BusinessentitycontactRepo.scala           |  1 +
 .../BusinessentitycontactRepoImpl.scala       | 13 +++++++
 .../BusinessentitycontactRepoMock.scala       |  6 +++
 .../person/contacttype/ContacttypeRepo.scala  |  1 +
 .../contacttype/ContacttypeRepoImpl.scala     | 13 +++++++
 .../contacttype/ContacttypeRepoMock.scala     |  6 +++
 .../countryregion/CountryregionRepo.scala     |  1 +
 .../countryregion/CountryregionRepoImpl.scala | 13 +++++++
 .../countryregion/CountryregionRepoMock.scala |  6 +++
 .../emailaddress/EmailaddressRepo.scala       |  1 +
 .../emailaddress/EmailaddressRepoImpl.scala   | 14 +++++++
 .../emailaddress/EmailaddressRepoMock.scala   |  6 +++
 .../person/password/PasswordRepo.scala        |  1 +
 .../person/password/PasswordRepoImpl.scala    | 15 +++++++
 .../person/password/PasswordRepoMock.scala    |  6 +++
 .../person/person/PersonRepo.scala            |  1 +
 .../person/person/PersonRepoImpl.scala        | 23 +++++++++++
 .../person/person/PersonRepoMock.scala        |  6 +++
 .../person/personphone/PersonphoneRepo.scala  |  1 +
 .../personphone/PersonphoneRepoImpl.scala     | 12 ++++++
 .../personphone/PersonphoneRepoMock.scala     |  6 +++
 .../phonenumbertype/PhonenumbertypeRepo.scala |  1 +
 .../PhonenumbertypeRepoImpl.scala             | 13 +++++++
 .../PhonenumbertypeRepoMock.scala             |  6 +++
 .../stateprovince/StateprovinceRepo.scala     |  1 +
 .../stateprovince/StateprovinceRepoImpl.scala | 18 +++++++++
 .../stateprovince/StateprovinceRepoMock.scala |  6 +++
 .../billofmaterials/BillofmaterialsRepo.scala |  1 +
 .../BillofmaterialsRepoImpl.scala             | 19 +++++++++
 .../BillofmaterialsRepoMock.scala             |  6 +++
 .../production/culture/CultureRepo.scala      |  1 +
 .../production/culture/CultureRepoImpl.scala  | 13 +++++++
 .../production/culture/CultureRepoMock.scala  |  6 +++
 .../production/document/DocumentRepo.scala    |  1 +
 .../document/DocumentRepoImpl.scala           | 23 +++++++++++
 .../document/DocumentRepoMock.scala           |  6 +++
 .../illustration/IllustrationRepo.scala       |  1 +
 .../illustration/IllustrationRepoImpl.scala   | 13 +++++++
 .../illustration/IllustrationRepoMock.scala   |  6 +++
 .../production/location/LocationRepo.scala    |  1 +
 .../location/LocationRepoImpl.scala           | 15 +++++++
 .../location/LocationRepoMock.scala           |  6 +++
 .../production/product/ProductRepo.scala      |  1 +
 .../production/product/ProductRepoImpl.scala  | 35 +++++++++++++++++
 .../production/product/ProductRepoMock.scala  |  6 +++
 .../productcategory/ProductcategoryRepo.scala |  1 +
 .../ProductcategoryRepoImpl.scala             | 14 +++++++
 .../ProductcategoryRepoMock.scala             |  6 +++
 .../ProductcosthistoryRepo.scala              |  1 +
 .../ProductcosthistoryRepoImpl.scala          | 14 +++++++
 .../ProductcosthistoryRepoMock.scala          |  6 +++
 .../ProductdescriptionRepo.scala              |  1 +
 .../ProductdescriptionRepoImpl.scala          | 14 +++++++
 .../ProductdescriptionRepoMock.scala          |  6 +++
 .../productdocument/ProductdocumentRepo.scala |  1 +
 .../ProductdocumentRepoImpl.scala             | 12 ++++++
 .../ProductdocumentRepoMock.scala             |  6 +++
 .../ProductinventoryRepo.scala                |  1 +
 .../ProductinventoryRepoImpl.scala            | 16 ++++++++
 .../ProductinventoryRepoMock.scala            |  6 +++
 .../ProductlistpricehistoryRepo.scala         |  1 +
 .../ProductlistpricehistoryRepoImpl.scala     | 14 +++++++
 .../ProductlistpricehistoryRepoMock.scala     |  6 +++
 .../productmodel/ProductmodelRepo.scala       |  1 +
 .../productmodel/ProductmodelRepoImpl.scala   | 16 ++++++++
 .../productmodel/ProductmodelRepoMock.scala   |  6 +++
 .../ProductmodelillustrationRepo.scala        |  1 +
 .../ProductmodelillustrationRepoImpl.scala    | 12 ++++++
 .../ProductmodelillustrationRepoMock.scala    |  6 +++
 ...ctmodelproductdescriptioncultureRepo.scala |  1 +
 ...delproductdescriptioncultureRepoImpl.scala | 12 ++++++
 ...delproductdescriptioncultureRepoMock.scala |  6 +++
 .../productphoto/ProductphotoRepo.scala       |  1 +
 .../productphoto/ProductphotoRepoImpl.scala   | 16 ++++++++
 .../productphoto/ProductphotoRepoMock.scala   |  6 +++
 .../ProductproductphotoRepo.scala             |  1 +
 .../ProductproductphotoRepoImpl.scala         | 13 +++++++
 .../ProductproductphotoRepoMock.scala         |  6 +++
 .../productreview/ProductreviewRepo.scala     |  1 +
 .../productreview/ProductreviewRepoImpl.scala | 18 +++++++++
 .../productreview/ProductreviewRepoMock.scala |  6 +++
 .../ProductsubcategoryRepo.scala              |  1 +
 .../ProductsubcategoryRepoImpl.scala          | 15 +++++++
 .../ProductsubcategoryRepoMock.scala          |  6 +++
 .../scrapreason/ScrapreasonRepo.scala         |  1 +
 .../scrapreason/ScrapreasonRepoImpl.scala     | 13 +++++++
 .../scrapreason/ScrapreasonRepoMock.scala     |  6 +++
 .../TransactionhistoryRepo.scala              |  1 +
 .../TransactionhistoryRepoImpl.scala          | 19 +++++++++
 .../TransactionhistoryRepoMock.scala          |  6 +++
 .../TransactionhistoryarchiveRepo.scala       |  1 +
 .../TransactionhistoryarchiveRepoImpl.scala   | 19 +++++++++
 .../TransactionhistoryarchiveRepoMock.scala   |  6 +++
 .../unitmeasure/UnitmeasureRepo.scala         |  1 +
 .../unitmeasure/UnitmeasureRepoImpl.scala     | 13 +++++++
 .../unitmeasure/UnitmeasureRepoMock.scala     |  6 +++
 .../production/workorder/WorkorderRepo.scala  |  1 +
 .../workorder/WorkorderRepoImpl.scala         | 19 +++++++++
 .../workorder/WorkorderRepoMock.scala         |  6 +++
 .../WorkorderroutingRepo.scala                |  1 +
 .../WorkorderroutingRepoImpl.scala            | 20 ++++++++++
 .../WorkorderroutingRepoMock.scala            |  6 +++
 .../public/flaff/FlaffRepo.scala              |  1 +
 .../public/flaff/FlaffRepoImpl.scala          | 12 ++++++
 .../public/flaff/FlaffRepoMock.scala          |  6 +++
 .../identity_test/IdentityTestRepo.scala      |  1 +
 .../identity_test/IdentityTestRepoImpl.scala  | 13 +++++++
 .../identity_test/IdentityTestRepoMock.scala  |  6 +++
 .../public/users/UsersRepo.scala              |  1 +
 .../public/users/UsersRepoImpl.scala          | 17 ++++++++
 .../public/users/UsersRepoMock.scala          |  6 +++
 .../productvendor/ProductvendorRepo.scala     |  1 +
 .../productvendor/ProductvendorRepoImpl.scala | 20 ++++++++++
 .../productvendor/ProductvendorRepoMock.scala |  6 +++
 .../PurchaseorderheaderRepo.scala             |  1 +
 .../PurchaseorderheaderRepoImpl.scala         | 22 +++++++++++
 .../PurchaseorderheaderRepoMock.scala         |  6 +++
 .../shipmethod/ShipmethodRepo.scala           |  1 +
 .../shipmethod/ShipmethodRepoImpl.scala       | 16 ++++++++
 .../shipmethod/ShipmethodRepoMock.scala       |  6 +++
 .../purchasing/vendor/VendorRepo.scala        |  1 +
 .../purchasing/vendor/VendorRepoImpl.scala    | 18 +++++++++
 .../purchasing/vendor/VendorRepoMock.scala    |  6 +++
 .../CountryregioncurrencyRepo.scala           |  1 +
 .../CountryregioncurrencyRepoImpl.scala       | 12 ++++++
 .../CountryregioncurrencyRepoMock.scala       |  6 +++
 .../sales/creditcard/CreditcardRepo.scala     |  1 +
 .../sales/creditcard/CreditcardRepoImpl.scala | 16 ++++++++
 .../sales/creditcard/CreditcardRepoMock.scala |  6 +++
 .../sales/currency/CurrencyRepo.scala         |  1 +
 .../sales/currency/CurrencyRepoImpl.scala     | 13 +++++++
 .../sales/currency/CurrencyRepoMock.scala     |  6 +++
 .../sales/currencyrate/CurrencyrateRepo.scala |  1 +
 .../currencyrate/CurrencyrateRepoImpl.scala   | 17 ++++++++
 .../currencyrate/CurrencyrateRepoMock.scala   |  6 +++
 .../sales/customer/CustomerRepo.scala         |  1 +
 .../sales/customer/CustomerRepoImpl.scala     | 16 ++++++++
 .../sales/customer/CustomerRepoMock.scala     |  6 +++
 .../PersoncreditcardRepo.scala                |  1 +
 .../PersoncreditcardRepoImpl.scala            | 12 ++++++
 .../PersoncreditcardRepoMock.scala            |  6 +++
 .../SalesorderdetailRepo.scala                |  1 +
 .../SalesorderdetailRepoImpl.scala            | 19 +++++++++
 .../SalesorderdetailRepoMock.scala            |  6 +++
 .../SalesorderheaderRepo.scala                |  1 +
 .../SalesorderheaderRepoImpl.scala            | 35 +++++++++++++++++
 .../SalesorderheaderRepoMock.scala            |  6 +++
 .../SalesorderheadersalesreasonRepo.scala     |  1 +
 .../SalesorderheadersalesreasonRepoImpl.scala | 12 ++++++
 .../SalesorderheadersalesreasonRepoMock.scala |  6 +++
 .../sales/salesperson/SalespersonRepo.scala   |  1 +
 .../salesperson/SalespersonRepoImpl.scala     | 19 +++++++++
 .../salesperson/SalespersonRepoMock.scala     |  6 +++
 .../SalespersonquotahistoryRepo.scala         |  1 +
 .../SalespersonquotahistoryRepoImpl.scala     | 14 +++++++
 .../SalespersonquotahistoryRepoMock.scala     |  6 +++
 .../sales/salesreason/SalesreasonRepo.scala   |  1 +
 .../salesreason/SalesreasonRepoImpl.scala     | 14 +++++++
 .../salesreason/SalesreasonRepoMock.scala     |  6 +++
 .../sales/salestaxrate/SalestaxrateRepo.scala |  1 +
 .../salestaxrate/SalestaxrateRepoImpl.scala   | 17 ++++++++
 .../salestaxrate/SalestaxrateRepoMock.scala   |  6 +++
 .../salesterritory/SalesterritoryRepo.scala   |  1 +
 .../SalesterritoryRepoImpl.scala              | 20 ++++++++++
 .../SalesterritoryRepoMock.scala              |  6 +++
 .../SalesterritoryhistoryRepo.scala           |  1 +
 .../SalesterritoryhistoryRepoImpl.scala       | 14 +++++++
 .../SalesterritoryhistoryRepoMock.scala       |  6 +++
 .../ShoppingcartitemRepo.scala                |  1 +
 .../ShoppingcartitemRepoImpl.scala            | 16 ++++++++
 .../ShoppingcartitemRepoMock.scala            |  6 +++
 .../sales/specialoffer/SpecialofferRepo.scala |  1 +
 .../specialoffer/SpecialofferRepoImpl.scala   | 21 ++++++++++
 .../specialoffer/SpecialofferRepoMock.scala   |  6 +++
 .../SpecialofferproductRepo.scala             |  1 +
 .../SpecialofferproductRepoImpl.scala         | 13 +++++++
 .../SpecialofferproductRepoMock.scala         |  6 +++
 .../sales/store/StoreRepo.scala               |  1 +
 .../sales/store/StoreRepoImpl.scala           | 16 ++++++++
 .../sales/store/StoreRepoMock.scala           |  6 +++
 .../production/product/RepoTest.scala         | 30 ++++++++++++++
 .../department/DepartmentRepo.scala           |  1 +
 .../department/DepartmentRepoImpl.scala       | 15 +++++++
 .../department/DepartmentRepoMock.scala       | 10 +++++
 .../employee/EmployeeRepo.scala               |  1 +
 .../employee/EmployeeRepoImpl.scala           | 26 +++++++++++++
 .../employee/EmployeeRepoMock.scala           | 10 +++++
 .../EmployeedepartmenthistoryRepo.scala       |  1 +
 .../EmployeedepartmenthistoryRepoImpl.scala   | 14 +++++++
 .../EmployeedepartmenthistoryRepoMock.scala   | 10 +++++
 .../EmployeepayhistoryRepo.scala              |  1 +
 .../EmployeepayhistoryRepoImpl.scala          | 15 +++++++
 .../EmployeepayhistoryRepoMock.scala          | 10 +++++
 .../jobcandidate/JobcandidateRepo.scala       |  1 +
 .../jobcandidate/JobcandidateRepoImpl.scala   | 15 +++++++
 .../jobcandidate/JobcandidateRepoMock.scala   | 10 +++++
 .../humanresources/shift/ShiftRepo.scala      |  1 +
 .../humanresources/shift/ShiftRepoImpl.scala  | 16 ++++++++
 .../humanresources/shift/ShiftRepoMock.scala  | 10 +++++
 .../information_schema/CardinalNumber.scala   | 34 ++++++++++++++++
 .../information_schema/CharacterData.scala    | 34 ++++++++++++++++
 .../information_schema/SqlIdentifier.scala    | 34 ++++++++++++++++
 .../information_schema/TimeStamp.scala        | 34 ++++++++++++++++
 .../information_schema/YesOrNo.scala          | 34 ++++++++++++++++
 .../person/address/AddressRepo.scala          |  1 +
 .../person/address/AddressRepoImpl.scala      | 20 ++++++++++
 .../person/address/AddressRepoMock.scala      | 10 +++++
 .../person/addresstype/AddresstypeRepo.scala  |  1 +
 .../addresstype/AddresstypeRepoImpl.scala     | 15 +++++++
 .../addresstype/AddresstypeRepoMock.scala     | 10 +++++
 .../businessentity/BusinessentityRepo.scala   |  1 +
 .../BusinessentityRepoImpl.scala              | 14 +++++++
 .../BusinessentityRepoMock.scala              | 10 +++++
 .../BusinessentityaddressRepo.scala           |  1 +
 .../BusinessentityaddressRepoImpl.scala       | 14 +++++++
 .../BusinessentityaddressRepoMock.scala       | 10 +++++
 .../BusinessentitycontactRepo.scala           |  1 +
 .../BusinessentitycontactRepoImpl.scala       | 14 +++++++
 .../BusinessentitycontactRepoMock.scala       | 10 +++++
 .../person/contacttype/ContacttypeRepo.scala  |  1 +
 .../contacttype/ContacttypeRepoImpl.scala     | 14 +++++++
 .../contacttype/ContacttypeRepoMock.scala     | 10 +++++
 .../countryregion/CountryregionRepo.scala     |  1 +
 .../countryregion/CountryregionRepoImpl.scala | 14 +++++++
 .../countryregion/CountryregionRepoMock.scala | 10 +++++
 .../emailaddress/EmailaddressRepo.scala       |  1 +
 .../emailaddress/EmailaddressRepoImpl.scala   | 15 +++++++
 .../emailaddress/EmailaddressRepoMock.scala   | 10 +++++
 .../person/password/PasswordRepo.scala        |  1 +
 .../person/password/PasswordRepoImpl.scala    | 16 ++++++++
 .../person/password/PasswordRepoMock.scala    | 10 +++++
 .../person/person/PersonRepo.scala            |  1 +
 .../person/person/PersonRepoImpl.scala        | 24 ++++++++++++
 .../person/person/PersonRepoMock.scala        | 10 +++++
 .../person/personphone/PersonphoneRepo.scala  |  1 +
 .../personphone/PersonphoneRepoImpl.scala     | 13 +++++++
 .../personphone/PersonphoneRepoMock.scala     | 10 +++++
 .../phonenumbertype/PhonenumbertypeRepo.scala |  1 +
 .../PhonenumbertypeRepoImpl.scala             | 14 +++++++
 .../PhonenumbertypeRepoMock.scala             | 10 +++++
 .../stateprovince/StateprovinceRepo.scala     |  1 +
 .../stateprovince/StateprovinceRepoImpl.scala | 19 +++++++++
 .../stateprovince/StateprovinceRepoMock.scala | 10 +++++
 .../billofmaterials/BillofmaterialsRepo.scala |  1 +
 .../BillofmaterialsRepoImpl.scala             | 20 ++++++++++
 .../BillofmaterialsRepoMock.scala             | 10 +++++
 .../production/culture/CultureRepo.scala      |  1 +
 .../production/culture/CultureRepoImpl.scala  | 14 +++++++
 .../production/culture/CultureRepoMock.scala  | 10 +++++
 .../production/document/DocumentRepo.scala    |  1 +
 .../document/DocumentRepoImpl.scala           | 24 ++++++++++++
 .../document/DocumentRepoMock.scala           | 10 +++++
 .../illustration/IllustrationRepo.scala       |  1 +
 .../illustration/IllustrationRepoImpl.scala   | 14 +++++++
 .../illustration/IllustrationRepoMock.scala   | 10 +++++
 .../production/location/LocationRepo.scala    |  1 +
 .../location/LocationRepoImpl.scala           | 16 ++++++++
 .../location/LocationRepoMock.scala           | 10 +++++
 .../production/product/ProductRepo.scala      |  1 +
 .../production/product/ProductRepoImpl.scala  | 36 +++++++++++++++++
 .../production/product/ProductRepoMock.scala  | 10 +++++
 .../productcategory/ProductcategoryRepo.scala |  1 +
 .../ProductcategoryRepoImpl.scala             | 15 +++++++
 .../ProductcategoryRepoMock.scala             | 10 +++++
 .../ProductcosthistoryRepo.scala              |  1 +
 .../ProductcosthistoryRepoImpl.scala          | 15 +++++++
 .../ProductcosthistoryRepoMock.scala          | 10 +++++
 .../ProductdescriptionRepo.scala              |  1 +
 .../ProductdescriptionRepoImpl.scala          | 15 +++++++
 .../ProductdescriptionRepoMock.scala          | 10 +++++
 .../productdocument/ProductdocumentRepo.scala |  1 +
 .../ProductdocumentRepoImpl.scala             | 13 +++++++
 .../ProductdocumentRepoMock.scala             | 10 +++++
 .../ProductinventoryRepo.scala                |  1 +
 .../ProductinventoryRepoImpl.scala            | 17 ++++++++
 .../ProductinventoryRepoMock.scala            | 10 +++++
 .../ProductlistpricehistoryRepo.scala         |  1 +
 .../ProductlistpricehistoryRepoImpl.scala     | 15 +++++++
 .../ProductlistpricehistoryRepoMock.scala     | 10 +++++
 .../productmodel/ProductmodelRepo.scala       |  1 +
 .../productmodel/ProductmodelRepoImpl.scala   | 17 ++++++++
 .../productmodel/ProductmodelRepoMock.scala   | 10 +++++
 .../ProductmodelillustrationRepo.scala        |  1 +
 .../ProductmodelillustrationRepoImpl.scala    | 13 +++++++
 .../ProductmodelillustrationRepoMock.scala    | 10 +++++
 ...ctmodelproductdescriptioncultureRepo.scala |  1 +
 ...delproductdescriptioncultureRepoImpl.scala | 13 +++++++
 ...delproductdescriptioncultureRepoMock.scala | 10 +++++
 .../productphoto/ProductphotoRepo.scala       |  1 +
 .../productphoto/ProductphotoRepoImpl.scala   | 17 ++++++++
 .../productphoto/ProductphotoRepoMock.scala   | 10 +++++
 .../ProductproductphotoRepo.scala             |  1 +
 .../ProductproductphotoRepoImpl.scala         | 14 +++++++
 .../ProductproductphotoRepoMock.scala         | 10 +++++
 .../productreview/ProductreviewRepo.scala     |  1 +
 .../productreview/ProductreviewRepoImpl.scala | 19 +++++++++
 .../productreview/ProductreviewRepoMock.scala | 10 +++++
 .../ProductsubcategoryRepo.scala              |  1 +
 .../ProductsubcategoryRepoImpl.scala          | 16 ++++++++
 .../ProductsubcategoryRepoMock.scala          | 10 +++++
 .../scrapreason/ScrapreasonRepo.scala         |  1 +
 .../scrapreason/ScrapreasonRepoImpl.scala     | 14 +++++++
 .../scrapreason/ScrapreasonRepoMock.scala     | 10 +++++
 .../TransactionhistoryRepo.scala              |  1 +
 .../TransactionhistoryRepoImpl.scala          | 20 ++++++++++
 .../TransactionhistoryRepoMock.scala          | 10 +++++
 .../TransactionhistoryarchiveRepo.scala       |  1 +
 .../TransactionhistoryarchiveRepoImpl.scala   | 20 ++++++++++
 .../TransactionhistoryarchiveRepoMock.scala   | 10 +++++
 .../unitmeasure/UnitmeasureRepo.scala         |  1 +
 .../unitmeasure/UnitmeasureRepoImpl.scala     | 14 +++++++
 .../unitmeasure/UnitmeasureRepoMock.scala     | 10 +++++
 .../production/workorder/WorkorderRepo.scala  |  1 +
 .../workorder/WorkorderRepoImpl.scala         | 20 ++++++++++
 .../workorder/WorkorderRepoMock.scala         | 10 +++++
 .../WorkorderroutingRepo.scala                |  1 +
 .../WorkorderroutingRepoImpl.scala            | 21 ++++++++++
 .../WorkorderroutingRepoMock.scala            | 10 +++++
 .../public/flaff/FlaffRepo.scala              |  1 +
 .../public/flaff/FlaffRepoImpl.scala          | 13 +++++++
 .../public/flaff/FlaffRepoMock.scala          | 10 +++++
 .../identity_test/IdentityTestRepo.scala      |  1 +
 .../identity_test/IdentityTestRepoImpl.scala  | 14 +++++++
 .../identity_test/IdentityTestRepoMock.scala  | 10 +++++
 .../public/users/UsersRepo.scala              |  1 +
 .../public/users/UsersRepoImpl.scala          | 18 +++++++++
 .../public/users/UsersRepoMock.scala          | 10 +++++
 .../productvendor/ProductvendorRepo.scala     |  1 +
 .../productvendor/ProductvendorRepoImpl.scala | 21 ++++++++++
 .../productvendor/ProductvendorRepoMock.scala | 10 +++++
 .../PurchaseorderheaderRepo.scala             |  1 +
 .../PurchaseorderheaderRepoImpl.scala         | 23 +++++++++++
 .../PurchaseorderheaderRepoMock.scala         | 10 +++++
 .../shipmethod/ShipmethodRepo.scala           |  1 +
 .../shipmethod/ShipmethodRepoImpl.scala       | 17 ++++++++
 .../shipmethod/ShipmethodRepoMock.scala       | 10 +++++
 .../purchasing/vendor/VendorRepo.scala        |  1 +
 .../purchasing/vendor/VendorRepoImpl.scala    | 19 +++++++++
 .../purchasing/vendor/VendorRepoMock.scala    | 10 +++++
 .../CountryregioncurrencyRepo.scala           |  1 +
 .../CountryregioncurrencyRepoImpl.scala       | 13 +++++++
 .../CountryregioncurrencyRepoMock.scala       | 10 +++++
 .../sales/creditcard/CreditcardRepo.scala     |  1 +
 .../sales/creditcard/CreditcardRepoImpl.scala | 17 ++++++++
 .../sales/creditcard/CreditcardRepoMock.scala | 10 +++++
 .../sales/currency/CurrencyRepo.scala         |  1 +
 .../sales/currency/CurrencyRepoImpl.scala     | 14 +++++++
 .../sales/currency/CurrencyRepoMock.scala     | 10 +++++
 .../sales/currencyrate/CurrencyrateRepo.scala |  1 +
 .../currencyrate/CurrencyrateRepoImpl.scala   | 18 +++++++++
 .../currencyrate/CurrencyrateRepoMock.scala   | 10 +++++
 .../sales/customer/CustomerRepo.scala         |  1 +
 .../sales/customer/CustomerRepoImpl.scala     | 17 ++++++++
 .../sales/customer/CustomerRepoMock.scala     | 10 +++++
 .../PersoncreditcardRepo.scala                |  1 +
 .../PersoncreditcardRepoImpl.scala            | 13 +++++++
 .../PersoncreditcardRepoMock.scala            | 10 +++++
 .../SalesorderdetailRepo.scala                |  1 +
 .../SalesorderdetailRepoImpl.scala            | 20 ++++++++++
 .../SalesorderdetailRepoMock.scala            | 10 +++++
 .../SalesorderheaderRepo.scala                |  1 +
 .../SalesorderheaderRepoImpl.scala            | 36 +++++++++++++++++
 .../SalesorderheaderRepoMock.scala            | 10 +++++
 .../SalesorderheadersalesreasonRepo.scala     |  1 +
 .../SalesorderheadersalesreasonRepoImpl.scala | 13 +++++++
 .../SalesorderheadersalesreasonRepoMock.scala | 10 +++++
 .../sales/salesperson/SalespersonRepo.scala   |  1 +
 .../salesperson/SalespersonRepoImpl.scala     | 20 ++++++++++
 .../salesperson/SalespersonRepoMock.scala     | 10 +++++
 .../SalespersonquotahistoryRepo.scala         |  1 +
 .../SalespersonquotahistoryRepoImpl.scala     | 15 +++++++
 .../SalespersonquotahistoryRepoMock.scala     | 10 +++++
 .../sales/salesreason/SalesreasonRepo.scala   |  1 +
 .../salesreason/SalesreasonRepoImpl.scala     | 15 +++++++
 .../salesreason/SalesreasonRepoMock.scala     | 10 +++++
 .../sales/salestaxrate/SalestaxrateRepo.scala |  1 +
 .../salestaxrate/SalestaxrateRepoImpl.scala   | 18 +++++++++
 .../salestaxrate/SalestaxrateRepoMock.scala   | 10 +++++
 .../salesterritory/SalesterritoryRepo.scala   |  1 +
 .../SalesterritoryRepoImpl.scala              | 21 ++++++++++
 .../SalesterritoryRepoMock.scala              | 10 +++++
 .../SalesterritoryhistoryRepo.scala           |  1 +
 .../SalesterritoryhistoryRepoImpl.scala       | 15 +++++++
 .../SalesterritoryhistoryRepoMock.scala       | 10 +++++
 .../ShoppingcartitemRepo.scala                |  1 +
 .../ShoppingcartitemRepoImpl.scala            | 17 ++++++++
 .../ShoppingcartitemRepoMock.scala            | 10 +++++
 .../sales/specialoffer/SpecialofferRepo.scala |  1 +
 .../specialoffer/SpecialofferRepoImpl.scala   | 22 +++++++++++
 .../specialoffer/SpecialofferRepoMock.scala   | 10 +++++
 .../SpecialofferproductRepo.scala             |  1 +
 .../SpecialofferproductRepoImpl.scala         | 14 +++++++
 .../SpecialofferproductRepoMock.scala         | 10 +++++
 .../sales/store/StoreRepo.scala               |  1 +
 .../sales/store/StoreRepoImpl.scala           | 17 ++++++++
 .../sales/store/StoreRepoMock.scala           | 10 +++++
 .../production/product/RepoTest.scala         | 29 ++++++++++++++
 .../department/DepartmentRepo.scala           |  1 +
 .../department/DepartmentRepoImpl.scala       | 14 +++++++
 .../department/DepartmentRepoMock.scala       |  8 ++++
 .../employee/EmployeeRepo.scala               |  1 +
 .../employee/EmployeeRepoImpl.scala           | 25 ++++++++++++
 .../employee/EmployeeRepoMock.scala           |  8 ++++
 .../EmployeedepartmenthistoryRepo.scala       |  1 +
 .../EmployeedepartmenthistoryRepoImpl.scala   | 13 +++++++
 .../EmployeedepartmenthistoryRepoMock.scala   |  8 ++++
 .../EmployeepayhistoryRepo.scala              |  1 +
 .../EmployeepayhistoryRepoImpl.scala          | 14 +++++++
 .../EmployeepayhistoryRepoMock.scala          |  8 ++++
 .../jobcandidate/JobcandidateRepo.scala       |  1 +
 .../jobcandidate/JobcandidateRepoImpl.scala   | 14 +++++++
 .../jobcandidate/JobcandidateRepoMock.scala   |  8 ++++
 .../humanresources/shift/ShiftRepo.scala      |  1 +
 .../humanresources/shift/ShiftRepoImpl.scala  | 15 +++++++
 .../humanresources/shift/ShiftRepoMock.scala  |  8 ++++
 .../information_schema/CardinalNumber.scala   | 38 ++++++++++++++++++
 .../information_schema/CharacterData.scala    | 38 ++++++++++++++++++
 .../information_schema/SqlIdentifier.scala    | 38 ++++++++++++++++++
 .../information_schema/TimeStamp.scala        | 39 +++++++++++++++++++
 .../information_schema/YesOrNo.scala          | 38 ++++++++++++++++++
 .../person/address/AddressRepo.scala          |  1 +
 .../person/address/AddressRepoImpl.scala      | 19 +++++++++
 .../person/address/AddressRepoMock.scala      |  8 ++++
 .../person/addresstype/AddresstypeRepo.scala  |  1 +
 .../addresstype/AddresstypeRepoImpl.scala     | 14 +++++++
 .../addresstype/AddresstypeRepoMock.scala     |  8 ++++
 .../businessentity/BusinessentityRepo.scala   |  1 +
 .../BusinessentityRepoImpl.scala              | 13 +++++++
 .../BusinessentityRepoMock.scala              |  8 ++++
 .../BusinessentityaddressRepo.scala           |  1 +
 .../BusinessentityaddressRepoImpl.scala       | 13 +++++++
 .../BusinessentityaddressRepoMock.scala       |  8 ++++
 .../BusinessentitycontactRepo.scala           |  1 +
 .../BusinessentitycontactRepoImpl.scala       | 13 +++++++
 .../BusinessentitycontactRepoMock.scala       |  8 ++++
 .../person/contacttype/ContacttypeRepo.scala  |  1 +
 .../contacttype/ContacttypeRepoImpl.scala     | 13 +++++++
 .../contacttype/ContacttypeRepoMock.scala     |  8 ++++
 .../countryregion/CountryregionRepo.scala     |  1 +
 .../countryregion/CountryregionRepoImpl.scala | 13 +++++++
 .../countryregion/CountryregionRepoMock.scala |  8 ++++
 .../emailaddress/EmailaddressRepo.scala       |  1 +
 .../emailaddress/EmailaddressRepoImpl.scala   | 14 +++++++
 .../emailaddress/EmailaddressRepoMock.scala   |  8 ++++
 .../person/password/PasswordRepo.scala        |  1 +
 .../person/password/PasswordRepoImpl.scala    | 15 +++++++
 .../person/password/PasswordRepoMock.scala    |  8 ++++
 .../person/person/PersonRepo.scala            |  1 +
 .../person/person/PersonRepoImpl.scala        | 23 +++++++++++
 .../person/person/PersonRepoMock.scala        |  8 ++++
 .../person/personphone/PersonphoneRepo.scala  |  1 +
 .../personphone/PersonphoneRepoImpl.scala     | 12 ++++++
 .../personphone/PersonphoneRepoMock.scala     |  8 ++++
 .../phonenumbertype/PhonenumbertypeRepo.scala |  1 +
 .../PhonenumbertypeRepoImpl.scala             | 13 +++++++
 .../PhonenumbertypeRepoMock.scala             |  8 ++++
 .../stateprovince/StateprovinceRepo.scala     |  1 +
 .../stateprovince/StateprovinceRepoImpl.scala | 18 +++++++++
 .../stateprovince/StateprovinceRepoMock.scala |  8 ++++
 .../billofmaterials/BillofmaterialsRepo.scala |  1 +
 .../BillofmaterialsRepoImpl.scala             | 19 +++++++++
 .../BillofmaterialsRepoMock.scala             |  8 ++++
 .../production/culture/CultureRepo.scala      |  1 +
 .../production/culture/CultureRepoImpl.scala  | 13 +++++++
 .../production/culture/CultureRepoMock.scala  |  8 ++++
 .../production/document/DocumentRepo.scala    |  1 +
 .../document/DocumentRepoImpl.scala           | 23 +++++++++++
 .../document/DocumentRepoMock.scala           |  8 ++++
 .../illustration/IllustrationRepo.scala       |  1 +
 .../illustration/IllustrationRepoImpl.scala   | 13 +++++++
 .../illustration/IllustrationRepoMock.scala   |  8 ++++
 .../production/location/LocationRepo.scala    |  1 +
 .../location/LocationRepoImpl.scala           | 15 +++++++
 .../location/LocationRepoMock.scala           |  8 ++++
 .../production/product/ProductRepo.scala      |  1 +
 .../production/product/ProductRepoImpl.scala  | 35 +++++++++++++++++
 .../production/product/ProductRepoMock.scala  |  8 ++++
 .../productcategory/ProductcategoryRepo.scala |  1 +
 .../ProductcategoryRepoImpl.scala             | 14 +++++++
 .../ProductcategoryRepoMock.scala             |  8 ++++
 .../ProductcosthistoryRepo.scala              |  1 +
 .../ProductcosthistoryRepoImpl.scala          | 14 +++++++
 .../ProductcosthistoryRepoMock.scala          |  8 ++++
 .../ProductdescriptionRepo.scala              |  1 +
 .../ProductdescriptionRepoImpl.scala          | 14 +++++++
 .../ProductdescriptionRepoMock.scala          |  8 ++++
 .../productdocument/ProductdocumentRepo.scala |  1 +
 .../ProductdocumentRepoImpl.scala             | 12 ++++++
 .../ProductdocumentRepoMock.scala             |  8 ++++
 .../ProductinventoryRepo.scala                |  1 +
 .../ProductinventoryRepoImpl.scala            | 16 ++++++++
 .../ProductinventoryRepoMock.scala            |  8 ++++
 .../ProductlistpricehistoryRepo.scala         |  1 +
 .../ProductlistpricehistoryRepoImpl.scala     | 14 +++++++
 .../ProductlistpricehistoryRepoMock.scala     |  8 ++++
 .../productmodel/ProductmodelRepo.scala       |  1 +
 .../productmodel/ProductmodelRepoImpl.scala   | 16 ++++++++
 .../productmodel/ProductmodelRepoMock.scala   |  8 ++++
 .../ProductmodelillustrationRepo.scala        |  1 +
 .../ProductmodelillustrationRepoImpl.scala    | 12 ++++++
 .../ProductmodelillustrationRepoMock.scala    |  8 ++++
 ...ctmodelproductdescriptioncultureRepo.scala |  1 +
 ...delproductdescriptioncultureRepoImpl.scala | 12 ++++++
 ...delproductdescriptioncultureRepoMock.scala |  8 ++++
 .../productphoto/ProductphotoRepo.scala       |  1 +
 .../productphoto/ProductphotoRepoImpl.scala   | 16 ++++++++
 .../productphoto/ProductphotoRepoMock.scala   |  8 ++++
 .../ProductproductphotoRepo.scala             |  1 +
 .../ProductproductphotoRepoImpl.scala         | 13 +++++++
 .../ProductproductphotoRepoMock.scala         |  8 ++++
 .../productreview/ProductreviewRepo.scala     |  1 +
 .../productreview/ProductreviewRepoImpl.scala | 18 +++++++++
 .../productreview/ProductreviewRepoMock.scala |  8 ++++
 .../ProductsubcategoryRepo.scala              |  1 +
 .../ProductsubcategoryRepoImpl.scala          | 15 +++++++
 .../ProductsubcategoryRepoMock.scala          |  8 ++++
 .../scrapreason/ScrapreasonRepo.scala         |  1 +
 .../scrapreason/ScrapreasonRepoImpl.scala     | 13 +++++++
 .../scrapreason/ScrapreasonRepoMock.scala     |  8 ++++
 .../TransactionhistoryRepo.scala              |  1 +
 .../TransactionhistoryRepoImpl.scala          | 19 +++++++++
 .../TransactionhistoryRepoMock.scala          |  8 ++++
 .../TransactionhistoryarchiveRepo.scala       |  1 +
 .../TransactionhistoryarchiveRepoImpl.scala   | 19 +++++++++
 .../TransactionhistoryarchiveRepoMock.scala   |  8 ++++
 .../unitmeasure/UnitmeasureRepo.scala         |  1 +
 .../unitmeasure/UnitmeasureRepoImpl.scala     | 13 +++++++
 .../unitmeasure/UnitmeasureRepoMock.scala     |  8 ++++
 .../production/workorder/WorkorderRepo.scala  |  1 +
 .../workorder/WorkorderRepoImpl.scala         | 19 +++++++++
 .../workorder/WorkorderRepoMock.scala         |  8 ++++
 .../WorkorderroutingRepo.scala                |  1 +
 .../WorkorderroutingRepoImpl.scala            | 20 ++++++++++
 .../WorkorderroutingRepoMock.scala            |  8 ++++
 .../public/flaff/FlaffRepo.scala              |  1 +
 .../public/flaff/FlaffRepoImpl.scala          | 12 ++++++
 .../public/flaff/FlaffRepoMock.scala          |  8 ++++
 .../identity_test/IdentityTestRepo.scala      |  1 +
 .../identity_test/IdentityTestRepoImpl.scala  | 13 +++++++
 .../identity_test/IdentityTestRepoMock.scala  |  8 ++++
 .../public/users/UsersRepo.scala              |  1 +
 .../public/users/UsersRepoImpl.scala          | 17 ++++++++
 .../public/users/UsersRepoMock.scala          |  8 ++++
 .../productvendor/ProductvendorRepo.scala     |  1 +
 .../productvendor/ProductvendorRepoImpl.scala | 20 ++++++++++
 .../productvendor/ProductvendorRepoMock.scala |  8 ++++
 .../PurchaseorderheaderRepo.scala             |  1 +
 .../PurchaseorderheaderRepoImpl.scala         | 22 +++++++++++
 .../PurchaseorderheaderRepoMock.scala         |  8 ++++
 .../shipmethod/ShipmethodRepo.scala           |  1 +
 .../shipmethod/ShipmethodRepoImpl.scala       | 16 ++++++++
 .../shipmethod/ShipmethodRepoMock.scala       |  8 ++++
 .../purchasing/vendor/VendorRepo.scala        |  1 +
 .../purchasing/vendor/VendorRepoImpl.scala    | 18 +++++++++
 .../purchasing/vendor/VendorRepoMock.scala    |  8 ++++
 .../CountryregioncurrencyRepo.scala           |  1 +
 .../CountryregioncurrencyRepoImpl.scala       | 12 ++++++
 .../CountryregioncurrencyRepoMock.scala       |  8 ++++
 .../sales/creditcard/CreditcardRepo.scala     |  1 +
 .../sales/creditcard/CreditcardRepoImpl.scala | 16 ++++++++
 .../sales/creditcard/CreditcardRepoMock.scala |  8 ++++
 .../sales/currency/CurrencyRepo.scala         |  1 +
 .../sales/currency/CurrencyRepoImpl.scala     | 13 +++++++
 .../sales/currency/CurrencyRepoMock.scala     |  8 ++++
 .../sales/currencyrate/CurrencyrateRepo.scala |  1 +
 .../currencyrate/CurrencyrateRepoImpl.scala   | 17 ++++++++
 .../currencyrate/CurrencyrateRepoMock.scala   |  8 ++++
 .../sales/customer/CustomerRepo.scala         |  1 +
 .../sales/customer/CustomerRepoImpl.scala     | 16 ++++++++
 .../sales/customer/CustomerRepoMock.scala     |  8 ++++
 .../PersoncreditcardRepo.scala                |  1 +
 .../PersoncreditcardRepoImpl.scala            | 12 ++++++
 .../PersoncreditcardRepoMock.scala            |  8 ++++
 .../SalesorderdetailRepo.scala                |  1 +
 .../SalesorderdetailRepoImpl.scala            | 19 +++++++++
 .../SalesorderdetailRepoMock.scala            |  8 ++++
 .../SalesorderheaderRepo.scala                |  1 +
 .../SalesorderheaderRepoImpl.scala            | 35 +++++++++++++++++
 .../SalesorderheaderRepoMock.scala            |  8 ++++
 .../SalesorderheadersalesreasonRepo.scala     |  1 +
 .../SalesorderheadersalesreasonRepoImpl.scala | 12 ++++++
 .../SalesorderheadersalesreasonRepoMock.scala |  8 ++++
 .../sales/salesperson/SalespersonRepo.scala   |  1 +
 .../salesperson/SalespersonRepoImpl.scala     | 19 +++++++++
 .../salesperson/SalespersonRepoMock.scala     |  8 ++++
 .../SalespersonquotahistoryRepo.scala         |  1 +
 .../SalespersonquotahistoryRepoImpl.scala     | 14 +++++++
 .../SalespersonquotahistoryRepoMock.scala     |  8 ++++
 .../sales/salesreason/SalesreasonRepo.scala   |  1 +
 .../salesreason/SalesreasonRepoImpl.scala     | 14 +++++++
 .../salesreason/SalesreasonRepoMock.scala     |  8 ++++
 .../sales/salestaxrate/SalestaxrateRepo.scala |  1 +
 .../salestaxrate/SalestaxrateRepoImpl.scala   | 17 ++++++++
 .../salestaxrate/SalestaxrateRepoMock.scala   |  8 ++++
 .../salesterritory/SalesterritoryRepo.scala   |  1 +
 .../SalesterritoryRepoImpl.scala              | 20 ++++++++++
 .../SalesterritoryRepoMock.scala              |  8 ++++
 .../SalesterritoryhistoryRepo.scala           |  1 +
 .../SalesterritoryhistoryRepoImpl.scala       | 14 +++++++
 .../SalesterritoryhistoryRepoMock.scala       |  8 ++++
 .../ShoppingcartitemRepo.scala                |  1 +
 .../ShoppingcartitemRepoImpl.scala            | 16 ++++++++
 .../ShoppingcartitemRepoMock.scala            |  8 ++++
 .../sales/specialoffer/SpecialofferRepo.scala |  1 +
 .../specialoffer/SpecialofferRepoImpl.scala   | 21 ++++++++++
 .../specialoffer/SpecialofferRepoMock.scala   |  8 ++++
 .../SpecialofferproductRepo.scala             |  1 +
 .../SpecialofferproductRepoImpl.scala         | 13 +++++++
 .../SpecialofferproductRepoMock.scala         |  8 ++++
 .../sales/store/StoreRepo.scala               |  1 +
 .../sales/store/StoreRepoImpl.scala           | 16 ++++++++
 .../sales/store/StoreRepoMock.scala           |  8 ++++
 .../production/product/RepoTest.scala         | 31 +++++++++++++++
 .../scala/typo/internal/ComputedTable.scala   |  3 ++
 typo/src/scala/typo/internal/RepoMethod.scala |  7 ++++
 .../typo/internal/codegen/DbLibAnorm.scala    | 28 +++++++++++++
 .../typo/internal/codegen/DbLibDoobie.scala   | 39 +++++++++++++++++++
 .../typo/internal/codegen/DbLibZioJdbc.scala  | 33 ++++++++++++++++
 726 files changed, 6677 insertions(+)
 create mode 100644 typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
 create mode 100644 typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
 create mode 100644 typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
 create mode 100644 typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
 create mode 100644 typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
 create mode 100644 typo-tester-anorm/src/scala/adventureworks/production/product/RepoTest.scala
 create mode 100644 typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
 create mode 100644 typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
 create mode 100644 typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
 create mode 100644 typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
 create mode 100644 typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
 create mode 100644 typo-tester-doobie/src/scala/adventureworks/production/product/RepoTest.scala
 create mode 100644 typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
 create mode 100644 typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
 create mode 100644 typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
 create mode 100644 typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
 create mode 100644 typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
 create mode 100644 typo-tester-zio-jdbc/src/scala/adventureworks/production/product/RepoTest.scala

diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 5e479597f4..770bb5568c 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -29,4 +29,5 @@ trait PersonRepo {
   def update(row: PersonRow)(implicit c: Connection): Boolean
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: PersonRow)(implicit c: Connection): PersonRow
+  def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 41b54c8cd1..f3884e11d0 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import testdb.hardcoded.customtypes.Defaulted
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
@@ -148,4 +149,15 @@ class PersonRepoImpl extends PersonRepo {
       .executeInsert(PersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table person_TEMP (like compositepk.person) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy person_TEMP("one", "two", "name") from stdin""", batchSize, unsaved)(PersonRow.text, c): @nowarn
+    SQL"""insert into compositepk.person("one", "two", "name")
+          select * from person_TEMP
+          on conflict ("one", "two")
+          do update set
+            "name" = EXCLUDED."name"
+          ;
+          drop table person_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 2c1451f0fa..4379dd3f69 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -100,4 +100,10 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 0f0a9a4075..3cb4135ef3 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -29,4 +29,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow)(implicit c: Connection): Boolean
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: FootballClubRow)(implicit c: Connection): FootballClubRow
+  def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 8d8836da5b..4ed77a8ad3 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -16,6 +16,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -130,4 +131,15 @@ class FootballClubRepoImpl extends FootballClubRepo {
       .executeInsert(FootballClubRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy football_club_TEMP("id", "name") from stdin""", batchSize, unsaved)(FootballClubRow.text, c): @nowarn
+    SQL"""insert into myschema.football_club("id", "name")
+          select * from football_club_TEMP
+          on conflict ("id")
+          do update set
+            "name" = EXCLUDED."name"
+          ;
+          drop table football_club_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index e0fe8f1bd0..109604cf4e 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -97,4 +97,10 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index cf8ea88c39..bd745b1327 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -27,4 +27,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId])(implicit c: Connection): Map[MaritalStatusId, MaritalStatusRow]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow)(implicit c: Connection): MaritalStatusRow
+  def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index 9bec11ce6b..fa98fcbb28 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -15,6 +15,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -103,4 +104,15 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
       .executeInsert(MaritalStatusRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy marital_status_TEMP("id") from stdin""", batchSize, unsaved)(MaritalStatusRow.text, c): @nowarn
+    SQL"""insert into myschema.marital_status("id")
+          select * from marital_status_TEMP
+          on conflict ("id")
+          do update set
+            
+          ;
+          drop table marital_status_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index 9b4c2bb8dc..7b26344a3c 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -72,4 +72,10 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index d3c6b5bd62..0311068434 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -32,4 +32,5 @@ trait PersonRepo {
   def update(row: PersonRow)(implicit c: Connection): Boolean
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: PersonRow)(implicit c: Connection): PersonRow
+  def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index 0afad0da33..8e9f2c7199 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import testdb.hardcoded.customtypes.Defaulted
 import testdb.hardcoded.myschema.football_club.FootballClubId
 import testdb.hardcoded.myschema.marital_status.MaritalStatusId
@@ -231,4 +232,25 @@ class PersonRepoImpl extends PersonRepo {
       .executeInsert(PersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table person_TEMP (like myschema.person) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""", batchSize, unsaved)(PersonRow.text, c): @nowarn
+    SQL"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+          select * from person_TEMP
+          on conflict ("id")
+          do update set
+            "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+            "name" = EXCLUDED."name",
+            "nick_name" = EXCLUDED."nick_name",
+            "blog_url" = EXCLUDED."blog_url",
+            "email" = EXCLUDED."email",
+            "phone" = EXCLUDED."phone",
+            "likes_pizza" = EXCLUDED."likes_pizza",
+            "marital_status_id" = EXCLUDED."marital_status_id",
+            "work_email" = EXCLUDED."work_email",
+            "sector" = EXCLUDED."sector",
+            "favorite_number" = EXCLUDED."favorite_number"
+          ;
+          drop table person_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index f74fcf88eb..a00ce2e34d 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -129,4 +129,10 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 5e479597f4..770bb5568c 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -29,4 +29,5 @@ trait PersonRepo {
   def update(row: PersonRow)(implicit c: Connection): Boolean
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: PersonRow)(implicit c: Connection): PersonRow
+  def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 41b54c8cd1..f3884e11d0 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import testdb.hardcoded.customtypes.Defaulted
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
@@ -148,4 +149,15 @@ class PersonRepoImpl extends PersonRepo {
       .executeInsert(PersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table person_TEMP (like compositepk.person) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy person_TEMP("one", "two", "name") from stdin""", batchSize, unsaved)(PersonRow.text, c): @nowarn
+    SQL"""insert into compositepk.person("one", "two", "name")
+          select * from person_TEMP
+          on conflict ("one", "two")
+          do update set
+            "name" = EXCLUDED."name"
+          ;
+          drop table person_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 2c1451f0fa..4379dd3f69 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -100,4 +100,10 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 0f0a9a4075..3cb4135ef3 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -29,4 +29,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow)(implicit c: Connection): Boolean
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: FootballClubRow)(implicit c: Connection): FootballClubRow
+  def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 8d8836da5b..4ed77a8ad3 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -16,6 +16,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -130,4 +131,15 @@ class FootballClubRepoImpl extends FootballClubRepo {
       .executeInsert(FootballClubRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy football_club_TEMP("id", "name") from stdin""", batchSize, unsaved)(FootballClubRow.text, c): @nowarn
+    SQL"""insert into myschema.football_club("id", "name")
+          select * from football_club_TEMP
+          on conflict ("id")
+          do update set
+            "name" = EXCLUDED."name"
+          ;
+          drop table football_club_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index e0fe8f1bd0..109604cf4e 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -97,4 +97,10 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[FootballClubRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index cf8ea88c39..bd745b1327 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -27,4 +27,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId])(implicit c: Connection): Map[MaritalStatusId, MaritalStatusRow]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow)(implicit c: Connection): MaritalStatusRow
+  def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index 9bec11ce6b..fa98fcbb28 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -15,6 +15,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -103,4 +104,15 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
       .executeInsert(MaritalStatusRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy marital_status_TEMP("id") from stdin""", batchSize, unsaved)(MaritalStatusRow.text, c): @nowarn
+    SQL"""insert into myschema.marital_status("id")
+          select * from marital_status_TEMP
+          on conflict ("id")
+          do update set
+            
+          ;
+          drop table marital_status_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index 9b4c2bb8dc..7b26344a3c 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -72,4 +72,10 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[MaritalStatusRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index d3c6b5bd62..0311068434 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -32,4 +32,5 @@ trait PersonRepo {
   def update(row: PersonRow)(implicit c: Connection): Boolean
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]])(implicit c: Connection): Boolean
   def upsert(unsaved: PersonRow)(implicit c: Connection): PersonRow
+  def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index 0afad0da33..8e9f2c7199 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import testdb.hardcoded.customtypes.Defaulted
 import testdb.hardcoded.myschema.football_club.FootballClubId
 import testdb.hardcoded.myschema.marital_status.MaritalStatusId
@@ -231,4 +232,25 @@ class PersonRepoImpl extends PersonRepo {
       .executeInsert(PersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table person_TEMP (like myschema.person) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""", batchSize, unsaved)(PersonRow.text, c): @nowarn
+    SQL"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+          select * from person_TEMP
+          on conflict ("id")
+          do update set
+            "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+            "name" = EXCLUDED."name",
+            "nick_name" = EXCLUDED."nick_name",
+            "blog_url" = EXCLUDED."blog_url",
+            "email" = EXCLUDED."email",
+            "phone" = EXCLUDED."phone",
+            "likes_pizza" = EXCLUDED."likes_pizza",
+            "marital_status_id" = EXCLUDED."marital_status_id",
+            "work_email" = EXCLUDED."work_email",
+            "sector" = EXCLUDED."sector",
+            "favorite_number" = EXCLUDED."favorite_number"
+          ;
+          drop table person_TEMP;""".executeUpdate()
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index f74fcf88eb..a00ce2e34d 100644
--- a/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-anorm@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -129,4 +129,10 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
     map.put(unsaved.id, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.id -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 300cd52c67..b84bd59287 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -30,4 +30,5 @@ trait PersonRepo {
   def update(row: PersonRow): ConnectionIO[Boolean]
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: PersonRow): ConnectionIO[PersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 742b01d597..80195152e8 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -130,4 +130,17 @@ class PersonRepoImpl extends PersonRepo {
           returning "one", "two", "name"
        """.query(using PersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table person_TEMP (like compositepk.person) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy person_TEMP("one", "two", "name") from stdin""").copyIn(unsaved, batchSize)(using PersonRow.text)
+      res <- sql"""insert into compositepk.person("one", "two", "name")
+                   select * from person_TEMP
+                   on conflict ("one", "two")
+                   do update set
+                     "name" = EXCLUDED."name"
+                   ;
+                   drop table person_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 0c56cce4d4..a204ef226b 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -120,4 +120,14 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 34e5502bbd..2c85ecafa3 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -30,4 +30,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow): ConnectionIO[Boolean]
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: FootballClubRow): ConnectionIO[FootballClubRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 0c0b7adfc4..20cef353d2 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -107,4 +107,17 @@ class FootballClubRepoImpl extends FootballClubRepo {
           returning "id", "name"
        """.query(using FootballClubRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy football_club_TEMP("id", "name") from stdin""").copyIn(unsaved, batchSize)(using FootballClubRow.text)
+      res <- sql"""insert into myschema.football_club("id", "name")
+                   select * from football_club_TEMP
+                   on conflict ("id")
+                   do update set
+                     "name" = EXCLUDED."name"
+                   ;
+                   drop table football_club_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index 40df5f1815..ac6d5476f2 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -115,4 +115,14 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index 29564dfea6..5701d43681 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -28,4 +28,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId]): ConnectionIO[Map[MaritalStatusId, MaritalStatusRow]]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow): ConnectionIO[MaritalStatusRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index c2253807d2..3344b1bf79 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -79,4 +79,17 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
           returning "id"
        """.query(using MaritalStatusRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy marital_status_TEMP("id") from stdin""").copyIn(unsaved, batchSize)(using MaritalStatusRow.text)
+      res <- sql"""insert into myschema.marital_status("id")
+                   select * from marital_status_TEMP
+                   on conflict ("id")
+                   do update set
+                     
+                   ;
+                   drop table marital_status_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index 15191cb112..b65684fe27 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -86,4 +86,14 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index 5e9fe04f97..a41c3c43cf 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -33,4 +33,5 @@ trait PersonRepo {
   def update(row: PersonRow): ConnectionIO[Boolean]
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: PersonRow): ConnectionIO[PersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index cbcdf4cd8b..88fa77b2dc 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -207,4 +207,27 @@ class PersonRepoImpl extends PersonRepo {
           returning "id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number"
        """.query(using PersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table person_TEMP (like myschema.person) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""").copyIn(unsaved, batchSize)(using PersonRow.text)
+      res <- sql"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+                   select * from person_TEMP
+                   on conflict ("id")
+                   do update set
+                     "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+                     "name" = EXCLUDED."name",
+                     "nick_name" = EXCLUDED."nick_name",
+                     "blog_url" = EXCLUDED."blog_url",
+                     "email" = EXCLUDED."email",
+                     "phone" = EXCLUDED."phone",
+                     "likes_pizza" = EXCLUDED."likes_pizza",
+                     "marital_status_id" = EXCLUDED."marital_status_id",
+                     "work_email" = EXCLUDED."work_email",
+                     "sector" = EXCLUDED."sector",
+                     "favorite_number" = EXCLUDED."favorite_number"
+                   ;
+                   drop table person_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index 3bcd444f70..30be154a2d 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -151,4 +151,14 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 300cd52c67..b84bd59287 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -30,4 +30,5 @@ trait PersonRepo {
   def update(row: PersonRow): ConnectionIO[Boolean]
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: PersonRow): ConnectionIO[PersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 742b01d597..80195152e8 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -130,4 +130,17 @@ class PersonRepoImpl extends PersonRepo {
           returning "one", "two", "name"
        """.query(using PersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table person_TEMP (like compositepk.person) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy person_TEMP("one", "two", "name") from stdin""").copyIn(unsaved, batchSize)(using PersonRow.text)
+      res <- sql"""insert into compositepk.person("one", "two", "name")
+                   select * from person_TEMP
+                   on conflict ("one", "two")
+                   do update set
+                     "name" = EXCLUDED."name"
+                   ;
+                   drop table person_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 0c56cce4d4..a204ef226b 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -120,4 +120,14 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 34e5502bbd..2c85ecafa3 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -30,4 +30,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow): ConnectionIO[Boolean]
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: FootballClubRow): ConnectionIO[FootballClubRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 0c0b7adfc4..20cef353d2 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -107,4 +107,17 @@ class FootballClubRepoImpl extends FootballClubRepo {
           returning "id", "name"
        """.query(using FootballClubRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy football_club_TEMP("id", "name") from stdin""").copyIn(unsaved, batchSize)(using FootballClubRow.text)
+      res <- sql"""insert into myschema.football_club("id", "name")
+                   select * from football_club_TEMP
+                   on conflict ("id")
+                   do update set
+                     "name" = EXCLUDED."name"
+                   ;
+                   drop table football_club_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index 40df5f1815..ac6d5476f2 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -115,4 +115,14 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FootballClubRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index 29564dfea6..5701d43681 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -28,4 +28,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId]): ConnectionIO[Map[MaritalStatusId, MaritalStatusRow]]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow): ConnectionIO[MaritalStatusRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index c2253807d2..3344b1bf79 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -79,4 +79,17 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
           returning "id"
        """.query(using MaritalStatusRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy marital_status_TEMP("id") from stdin""").copyIn(unsaved, batchSize)(using MaritalStatusRow.text)
+      res <- sql"""insert into myschema.marital_status("id")
+                   select * from marital_status_TEMP
+                   on conflict ("id")
+                   do update set
+                     
+                   ;
+                   drop table marital_status_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index 15191cb112..b65684fe27 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -86,4 +86,14 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, MaritalStatusRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index 5e9fe04f97..a41c3c43cf 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -33,4 +33,5 @@ trait PersonRepo {
   def update(row: PersonRow): ConnectionIO[Boolean]
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]]): ConnectionIO[Boolean]
   def upsert(unsaved: PersonRow): ConnectionIO[PersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index cbcdf4cd8b..88fa77b2dc 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -207,4 +207,27 @@ class PersonRepoImpl extends PersonRepo {
           returning "id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number"
        """.query(using PersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table person_TEMP (like myschema.person) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""").copyIn(unsaved, batchSize)(using PersonRow.text)
+      res <- sql"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+                   select * from person_TEMP
+                   on conflict ("id")
+                   do update set
+                     "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+                     "name" = EXCLUDED."name",
+                     "nick_name" = EXCLUDED."nick_name",
+                     "blog_url" = EXCLUDED."blog_url",
+                     "email" = EXCLUDED."email",
+                     "phone" = EXCLUDED."phone",
+                     "likes_pizza" = EXCLUDED."likes_pizza",
+                     "marital_status_id" = EXCLUDED."marital_status_id",
+                     "work_email" = EXCLUDED."work_email",
+                     "sector" = EXCLUDED."sector",
+                     "favorite_number" = EXCLUDED."favorite_number"
+                   ;
+                   drop table person_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index 3bcd444f70..30be154a2d 100644
--- a/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-doobie@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -151,4 +151,14 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.id -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 2a17943bfb..c4faffc4b6 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -32,4 +32,5 @@ trait PersonRepo {
   def update(row: PersonRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonRow): ZIO[ZConnection, Throwable, UpdateResult[PersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 99e80552b5..b26d0501b0 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -123,4 +123,16 @@ class PersonRepoImpl extends PersonRepo {
             "name" = EXCLUDED."name"
           returning "one", "two", "name"""".insertReturning(using PersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table person_TEMP (like compositepk.person) on commit drop".execute
+    val copied = streamingInsert(s"""copy person_TEMP("one", "two", "name") from stdin""", batchSize, unsaved)(PersonRow.text)
+    val merged = sql"""insert into compositepk.person("one", "two", "name")
+                       select * from person_TEMP
+                       on conflict ("one", "two")
+                       do update set
+                         "name" = EXCLUDED."name"
+                       ;
+                       drop table person_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 4f70aa2069..e3a80c5561 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -119,4 +119,12 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 652845f0c7..48568abd90 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -32,4 +32,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: FootballClubRow): ZIO[ZConnection, Throwable, UpdateResult[FootballClubRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 3a7a40b828..31327b662e 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -103,4 +103,16 @@ class FootballClubRepoImpl extends FootballClubRepo {
             "name" = EXCLUDED."name"
           returning "id", "name"""".insertReturning(using FootballClubRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".execute
+    val copied = streamingInsert(s"""copy football_club_TEMP("id", "name") from stdin""", batchSize, unsaved)(FootballClubRow.text)
+    val merged = sql"""insert into myschema.football_club("id", "name")
+                       select * from football_club_TEMP
+                       on conflict ("id")
+                       do update set
+                         "name" = EXCLUDED."name"
+                       ;
+                       drop table football_club_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index 90089894b2..957f0ab13b 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -116,4 +116,12 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index a12b10174e..11d4a1c1cc 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -30,4 +30,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId]): ZIO[ZConnection, Throwable, Map[MaritalStatusId, MaritalStatusRow]]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow): ZIO[ZConnection, Throwable, UpdateResult[MaritalStatusRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index effe6fc4f4..14ed3e60b7 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -80,4 +80,16 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
           on conflict ("id")
           returning "id"""".insertReturning(using MaritalStatusRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".execute
+    val copied = streamingInsert(s"""copy marital_status_TEMP("id") from stdin""", batchSize, unsaved)(MaritalStatusRow.text)
+    val merged = sql"""insert into myschema.marital_status("id")
+                       select * from marital_status_TEMP
+                       on conflict ("id")
+                       do update set
+                         
+                       ;
+                       drop table marital_status_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index c87c7a6b21..b7b300b40c 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -87,4 +87,12 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index 7eb24cee51..e646cf8ed1 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -35,4 +35,5 @@ trait PersonRepo {
   def update(row: PersonRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonRow): ZIO[ZConnection, Throwable, UpdateResult[PersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index 47ce473aa9..9026f2ae83 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -200,4 +200,26 @@ class PersonRepoImpl extends PersonRepo {
             "favorite_number" = EXCLUDED."favorite_number"
           returning "id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number"""".insertReturning(using PersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table person_TEMP (like myschema.person) on commit drop".execute
+    val copied = streamingInsert(s"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""", batchSize, unsaved)(PersonRow.text)
+    val merged = sql"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+                       select * from person_TEMP
+                       on conflict ("id")
+                       do update set
+                         "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+                         "name" = EXCLUDED."name",
+                         "nick_name" = EXCLUDED."nick_name",
+                         "blog_url" = EXCLUDED."blog_url",
+                         "email" = EXCLUDED."email",
+                         "phone" = EXCLUDED."phone",
+                         "likes_pizza" = EXCLUDED."likes_pizza",
+                         "marital_status_id" = EXCLUDED."marital_status_id",
+                         "work_email" = EXCLUDED."work_email",
+                         "sector" = EXCLUDED."sector",
+                         "favorite_number" = EXCLUDED."favorite_number"
+                       ;
+                       drop table person_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index 880b46fefa..ac2e406035 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm213/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -150,4 +150,12 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
index 2a17943bfb..c4faffc4b6 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepo.scala
@@ -32,4 +32,5 @@ trait PersonRepo {
   def update(row: PersonRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(compositeId: PersonId, fieldValues: List[PersonFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonRow): ZIO[ZConnection, Throwable, UpdateResult[PersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
index 99e80552b5..b26d0501b0 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoImpl.scala
@@ -123,4 +123,16 @@ class PersonRepoImpl extends PersonRepo {
             "name" = EXCLUDED."name"
           returning "one", "two", "name"""".insertReturning(using PersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table person_TEMP (like compositepk.person) on commit drop".execute
+    val copied = streamingInsert(s"""copy person_TEMP("one", "two", "name") from stdin""", batchSize, unsaved)(PersonRow.text)
+    val merged = sql"""insert into compositepk.person("one", "two", "name")
+                       select * from person_TEMP
+                       on conflict ("one", "two")
+                       do update set
+                         "name" = EXCLUDED."name"
+                       ;
+                       drop table person_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
index 4f70aa2069..e3a80c5561 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/compositepk/person/PersonRepoMock.scala
@@ -119,4 +119,12 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
index 652845f0c7..48568abd90 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepo.scala
@@ -32,4 +32,5 @@ trait FootballClubRepo {
   def update(row: FootballClubRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(id: FootballClubId, fieldValues: List[FootballClubFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: FootballClubRow): ZIO[ZConnection, Throwable, UpdateResult[FootballClubRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
index 3a7a40b828..31327b662e 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoImpl.scala
@@ -103,4 +103,16 @@ class FootballClubRepoImpl extends FootballClubRepo {
             "name" = EXCLUDED."name"
           returning "id", "name"""".insertReturning(using FootballClubRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table football_club_TEMP (like myschema.football_club) on commit drop".execute
+    val copied = streamingInsert(s"""copy football_club_TEMP("id", "name") from stdin""", batchSize, unsaved)(FootballClubRow.text)
+    val merged = sql"""insert into myschema.football_club("id", "name")
+                       select * from football_club_TEMP
+                       on conflict ("id")
+                       do update set
+                         "name" = EXCLUDED."name"
+                       ;
+                       drop table football_club_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
index 90089894b2..957f0ab13b 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/football_club/FootballClubRepoMock.scala
@@ -116,4 +116,12 @@ class FootballClubRepoMock(map: scala.collection.mutable.Map[FootballClubId, Foo
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FootballClubRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
index a12b10174e..11d4a1c1cc 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepo.scala
@@ -30,4 +30,5 @@ trait MaritalStatusRepo {
   def selectByIdsTracked(ids: Array[MaritalStatusId]): ZIO[ZConnection, Throwable, Map[MaritalStatusId, MaritalStatusRow]]
   def update: UpdateBuilder[MaritalStatusFields, MaritalStatusRow]
   def upsert(unsaved: MaritalStatusRow): ZIO[ZConnection, Throwable, UpdateResult[MaritalStatusRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
index effe6fc4f4..14ed3e60b7 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoImpl.scala
@@ -80,4 +80,16 @@ class MaritalStatusRepoImpl extends MaritalStatusRepo {
           on conflict ("id")
           returning "id"""".insertReturning(using MaritalStatusRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table marital_status_TEMP (like myschema.marital_status) on commit drop".execute
+    val copied = streamingInsert(s"""copy marital_status_TEMP("id") from stdin""", batchSize, unsaved)(MaritalStatusRow.text)
+    val merged = sql"""insert into myschema.marital_status("id")
+                       select * from marital_status_TEMP
+                       on conflict ("id")
+                       do update set
+                         
+                       ;
+                       drop table marital_status_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
index c87c7a6b21..b7b300b40c 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/marital_status/MaritalStatusRepoMock.scala
@@ -87,4 +87,12 @@ class MaritalStatusRepoMock(map: scala.collection.mutable.Map[MaritalStatusId, M
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, MaritalStatusRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
index 7eb24cee51..e646cf8ed1 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepo.scala
@@ -35,4 +35,5 @@ trait PersonRepo {
   def update(row: PersonRow): ZIO[ZConnection, Throwable, Boolean]
   def updateFieldValues(id: PersonId, fieldValues: List[PersonFieldValue[?]]): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonRow): ZIO[ZConnection, Throwable, UpdateResult[PersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
index 47ce473aa9..9026f2ae83 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoImpl.scala
@@ -200,4 +200,26 @@ class PersonRepoImpl extends PersonRepo {
             "favorite_number" = EXCLUDED."favorite_number"
           returning "id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number"""".insertReturning(using PersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table person_TEMP (like myschema.person) on commit drop".execute
+    val copied = streamingInsert(s"""copy person_TEMP("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number") from stdin""", batchSize, unsaved)(PersonRow.text)
+    val merged = sql"""insert into myschema.person("id", "favourite_football_club_id", "name", "nick_name", "blog_url", "email", "phone", "likes_pizza", "marital_status_id", "work_email", "sector", "favorite_number")
+                       select * from person_TEMP
+                       on conflict ("id")
+                       do update set
+                         "favourite_football_club_id" = EXCLUDED."favourite_football_club_id",
+                         "name" = EXCLUDED."name",
+                         "nick_name" = EXCLUDED."nick_name",
+                         "blog_url" = EXCLUDED."blog_url",
+                         "email" = EXCLUDED."email",
+                         "phone" = EXCLUDED."phone",
+                         "likes_pizza" = EXCLUDED."likes_pizza",
+                         "marital_status_id" = EXCLUDED."marital_status_id",
+                         "work_email" = EXCLUDED."work_email",
+                         "sector" = EXCLUDED."sector",
+                         "favorite_number" = EXCLUDED."favorite_number"
+                       ;
+                       drop table person_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
index 880b46fefa..ac2e406035 100644
--- a/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
+++ b/.bleep/generated-sources/typo-tester-zio-jdbc@jvm3/scripts.GenHardcodedFiles/testdb/hardcoded/myschema/person/PersonRepoMock.scala
@@ -150,4 +150,12 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.id -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/site-in/other-features/testing-with-stubs.md b/site-in/other-features/testing-with-stubs.md
index cd97ab5642..5aee82df2b 100644
--- a/site-in/other-features/testing-with-stubs.md
+++ b/site-in/other-features/testing-with-stubs.md
@@ -107,6 +107,12 @@ class AddressRepoMock(toRow: Function1[AddressRowUnsaved, AddressRow],
     map.put(unsaved.addressid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[AddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.addressid -> row)
+    }
+    unsaved.size
+  }
 }
 ```
 
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
index 54d667ecb9..b2af163ab9 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
@@ -29,4 +29,5 @@ trait DepartmentRepo {
   def update: UpdateBuilder[DepartmentFields, DepartmentRow]
   def update(row: DepartmentRow)(implicit c: Connection): Boolean
   def upsert(unsaved: DepartmentRow)(implicit c: Connection): DepartmentRow
+  def upsertStreaming(unsaved: Iterator[DepartmentRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
index 38574bf288..47197af2fe 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -135,4 +136,17 @@ class DepartmentRepoImpl extends DepartmentRepo {
       .executeInsert(DepartmentRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[DepartmentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table department_TEMP (like humanresources.department) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy department_TEMP("departmentid", "name", "groupname", "modifieddate") from stdin""", batchSize, unsaved)(DepartmentRow.text, c): @nowarn
+    SQL"""insert into humanresources.department("departmentid", "name", "groupname", "modifieddate")
+          select * from department_TEMP
+          on conflict ("departmentid")
+          do update set
+            "name" = EXCLUDED."name",
+            "groupname" = EXCLUDED."groupname",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table department_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
index f65fb7948d..6d797e43e3 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
@@ -87,4 +87,10 @@ class DepartmentRepoMock(toRow: Function1[DepartmentRowUnsaved, DepartmentRow],
     map.put(unsaved.departmentid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[DepartmentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.departmentid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
index 70387571de..2e2d7d21c4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
@@ -30,4 +30,5 @@ trait EmployeeRepo {
   def update: UpdateBuilder[EmployeeFields, EmployeeRow]
   def update(row: EmployeeRow)(implicit c: Connection): Boolean
   def upsert(unsaved: EmployeeRow)(implicit c: Connection): EmployeeRow
+  def upsertStreaming(unsaved: Iterator[EmployeeRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
index 50dcfdc9ad..e735da6e89 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
@@ -23,6 +23,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -200,4 +201,28 @@ class EmployeeRepoImpl extends EmployeeRepo {
       .executeInsert(EmployeeRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table employee_TEMP (like humanresources.employee) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy employee_TEMP("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode") from stdin""", batchSize, unsaved)(EmployeeRow.text, c): @nowarn
+    SQL"""insert into humanresources.employee("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode")
+          select * from employee_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "nationalidnumber" = EXCLUDED."nationalidnumber",
+            "loginid" = EXCLUDED."loginid",
+            "jobtitle" = EXCLUDED."jobtitle",
+            "birthdate" = EXCLUDED."birthdate",
+            "maritalstatus" = EXCLUDED."maritalstatus",
+            "gender" = EXCLUDED."gender",
+            "hiredate" = EXCLUDED."hiredate",
+            "salariedflag" = EXCLUDED."salariedflag",
+            "vacationhours" = EXCLUDED."vacationhours",
+            "sickleavehours" = EXCLUDED."sickleavehours",
+            "currentflag" = EXCLUDED."currentflag",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate",
+            "organizationnode" = EXCLUDED."organizationnode"
+          ;
+          drop table employee_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
index 48f677140d..a56e2540e1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
@@ -88,4 +88,10 @@ class EmployeeRepoMock(toRow: Function1[EmployeeRowUnsaved, EmployeeRow],
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
index ebe64177b9..1c1eb5780c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
@@ -29,4 +29,5 @@ trait EmployeedepartmenthistoryRepo {
   def update: UpdateBuilder[EmployeedepartmenthistoryFields, EmployeedepartmenthistoryRow]
   def update(row: EmployeedepartmenthistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: EmployeedepartmenthistoryRow)(implicit c: Connection): EmployeedepartmenthistoryRow
+  def upsertStreaming(unsaved: Iterator[EmployeedepartmenthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
index 1a5e87af5a..5386d25af7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -148,4 +149,16 @@ class EmployeedepartmenthistoryRepoImpl extends EmployeedepartmenthistoryRepo {
       .executeInsert(EmployeedepartmenthistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeedepartmenthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table employeedepartmenthistory_TEMP (like humanresources.employeedepartmenthistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy employeedepartmenthistory_TEMP("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate") from stdin""", batchSize, unsaved)(EmployeedepartmenthistoryRow.text, c): @nowarn
+    SQL"""insert into humanresources.employeedepartmenthistory("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate")
+          select * from employeedepartmenthistory_TEMP
+          on conflict ("businessentityid", "startdate", "departmentid", "shiftid")
+          do update set
+            "enddate" = EXCLUDED."enddate",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table employeedepartmenthistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
index ed2c820247..3038106a5a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
@@ -87,4 +87,10 @@ class EmployeedepartmenthistoryRepoMock(toRow: Function1[Employeedepartmenthisto
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeedepartmenthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
index d3e9a2dc48..c9bc556724 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
@@ -29,4 +29,5 @@ trait EmployeepayhistoryRepo {
   def update: UpdateBuilder[EmployeepayhistoryFields, EmployeepayhistoryRow]
   def update(row: EmployeepayhistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: EmployeepayhistoryRow)(implicit c: Connection): EmployeepayhistoryRow
+  def upsertStreaming(unsaved: Iterator[EmployeepayhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
index fddf76313a..21781ea9b6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -142,4 +143,17 @@ class EmployeepayhistoryRepoImpl extends EmployeepayhistoryRepo {
       .executeInsert(EmployeepayhistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeepayhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table employeepayhistory_TEMP (like humanresources.employeepayhistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy employeepayhistory_TEMP("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate") from stdin""", batchSize, unsaved)(EmployeepayhistoryRow.text, c): @nowarn
+    SQL"""insert into humanresources.employeepayhistory("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate")
+          select * from employeepayhistory_TEMP
+          on conflict ("businessentityid", "ratechangedate")
+          do update set
+            "rate" = EXCLUDED."rate",
+            "payfrequency" = EXCLUDED."payfrequency",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table employeepayhistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
index 8aa642fb2b..b906de1664 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
@@ -87,4 +87,10 @@ class EmployeepayhistoryRepoMock(toRow: Function1[EmployeepayhistoryRowUnsaved,
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[EmployeepayhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
index bdb9369575..6ea9cb26d6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
@@ -29,4 +29,5 @@ trait JobcandidateRepo {
   def update: UpdateBuilder[JobcandidateFields, JobcandidateRow]
   def update(row: JobcandidateRow)(implicit c: Connection): Boolean
   def upsert(unsaved: JobcandidateRow)(implicit c: Connection): JobcandidateRow
+  def upsertStreaming(unsaved: Iterator[JobcandidateRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
index 0b8b561970..e03e387088 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -137,4 +138,17 @@ class JobcandidateRepoImpl extends JobcandidateRepo {
       .executeInsert(JobcandidateRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[JobcandidateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table jobcandidate_TEMP (like humanresources.jobcandidate) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy jobcandidate_TEMP("jobcandidateid", "businessentityid", "resume", "modifieddate") from stdin""", batchSize, unsaved)(JobcandidateRow.text, c): @nowarn
+    SQL"""insert into humanresources.jobcandidate("jobcandidateid", "businessentityid", "resume", "modifieddate")
+          select * from jobcandidate_TEMP
+          on conflict ("jobcandidateid")
+          do update set
+            "businessentityid" = EXCLUDED."businessentityid",
+            "resume" = EXCLUDED."resume",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table jobcandidate_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
index e3a4c4226a..d566db97a4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
@@ -87,4 +87,10 @@ class JobcandidateRepoMock(toRow: Function1[JobcandidateRowUnsaved, Jobcandidate
     map.put(unsaved.jobcandidateid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[JobcandidateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.jobcandidateid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
index e3a5bb1ba8..30a2e9a1b8 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
@@ -29,4 +29,5 @@ trait ShiftRepo {
   def update: UpdateBuilder[ShiftFields, ShiftRow]
   def update(row: ShiftRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ShiftRow)(implicit c: Connection): ShiftRow
+  def upsertStreaming(unsaved: Iterator[ShiftRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
index e37a6cb66e..9fdb53a84c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -140,4 +141,18 @@ class ShiftRepoImpl extends ShiftRepo {
       .executeInsert(ShiftRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ShiftRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table shift_TEMP (like humanresources.shift) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy shift_TEMP("shiftid", "name", "starttime", "endtime", "modifieddate") from stdin""", batchSize, unsaved)(ShiftRow.text, c): @nowarn
+    SQL"""insert into humanresources.shift("shiftid", "name", "starttime", "endtime", "modifieddate")
+          select * from shift_TEMP
+          on conflict ("shiftid")
+          do update set
+            "name" = EXCLUDED."name",
+            "starttime" = EXCLUDED."starttime",
+            "endtime" = EXCLUDED."endtime",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table shift_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
index 851844c035..d6b6aab7b7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
@@ -87,4 +87,10 @@ class ShiftRepoMock(toRow: Function1[ShiftRowUnsaved, ShiftRow],
     map.put(unsaved.shiftid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ShiftRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.shiftid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
new file mode 100644
index 0000000000..dfb29023af
--- /dev/null
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import anorm.Column
+import anorm.ParameterMetaData
+import anorm.ToStatement
+import java.sql.Types
+import play.api.libs.json.Reads
+import play.api.libs.json.Writes
+import typo.dsl.Bijection
+
+/** Domain `information_schema.cardinal_number`
+  * Constraint: CHECK ((VALUE >= 0))
+  */
+case class CardinalNumber(value: Int)
+object CardinalNumber {
+  implicit lazy val arrayColumn: Column[Array[CardinalNumber]] = Column.columnToArray(column, implicitly)
+  implicit lazy val arrayToStatement: ToStatement[Array[CardinalNumber]] = adventureworks.IntArrayToStatement.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CardinalNumber, Int] = Bijection[CardinalNumber, Int](_.value)(CardinalNumber.apply)
+  implicit lazy val column: Column[CardinalNumber] = Column.columnToInt.map(CardinalNumber.apply)
+  implicit lazy val ordering: Ordering[CardinalNumber] = Ordering.by(_.value)
+  implicit lazy val parameterMetadata: ParameterMetaData[CardinalNumber] = new ParameterMetaData[CardinalNumber] {
+    override def sqlType: String = """"information_schema"."cardinal_number""""
+    override def jdbcType: Int = Types.OTHER
+  }
+  implicit lazy val reads: Reads[CardinalNumber] = Reads.IntReads.map(CardinalNumber.apply)
+  implicit lazy val text: Text[CardinalNumber] = new Text[CardinalNumber] {
+    override def unsafeEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeArrayEncode(v.value, sb)
+  }
+  implicit lazy val toStatement: ToStatement[CardinalNumber] = ToStatement.intToStatement.contramap(_.value)
+  implicit lazy val writes: Writes[CardinalNumber] = Writes.IntWrites.contramap(_.value)
+}
\ No newline at end of file
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
new file mode 100644
index 0000000000..2edda18808
--- /dev/null
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import anorm.Column
+import anorm.ParameterMetaData
+import anorm.ToStatement
+import java.sql.Types
+import play.api.libs.json.Reads
+import play.api.libs.json.Writes
+import typo.dsl.Bijection
+
+/** Domain `information_schema.character_data`
+  * No constraint
+  */
+case class CharacterData(value: String)
+object CharacterData {
+  implicit lazy val arrayColumn: Column[Array[CharacterData]] = Column.columnToArray(column, implicitly)
+  implicit lazy val arrayToStatement: ToStatement[Array[CharacterData]] = ToStatement.arrayToParameter(ParameterMetaData.StringParameterMetaData).contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CharacterData, String] = Bijection[CharacterData, String](_.value)(CharacterData.apply)
+  implicit lazy val column: Column[CharacterData] = Column.columnToString.map(CharacterData.apply)
+  implicit lazy val ordering: Ordering[CharacterData] = Ordering.by(_.value)
+  implicit lazy val parameterMetadata: ParameterMetaData[CharacterData] = new ParameterMetaData[CharacterData] {
+    override def sqlType: String = """"information_schema"."character_data""""
+    override def jdbcType: Int = Types.OTHER
+  }
+  implicit lazy val reads: Reads[CharacterData] = Reads.StringReads.map(CharacterData.apply)
+  implicit lazy val text: Text[CharacterData] = new Text[CharacterData] {
+    override def unsafeEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+  implicit lazy val toStatement: ToStatement[CharacterData] = ToStatement.stringToStatement.contramap(_.value)
+  implicit lazy val writes: Writes[CharacterData] = Writes.StringWrites.contramap(_.value)
+}
\ No newline at end of file
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
new file mode 100644
index 0000000000..9fb1d7b0af
--- /dev/null
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import anorm.Column
+import anorm.ParameterMetaData
+import anorm.ToStatement
+import java.sql.Types
+import play.api.libs.json.Reads
+import play.api.libs.json.Writes
+import typo.dsl.Bijection
+
+/** Domain `information_schema.sql_identifier`
+  * No constraint
+  */
+case class SqlIdentifier(value: String)
+object SqlIdentifier {
+  implicit lazy val arrayColumn: Column[Array[SqlIdentifier]] = Column.columnToArray(column, implicitly)
+  implicit lazy val arrayToStatement: ToStatement[Array[SqlIdentifier]] = ToStatement.arrayToParameter(ParameterMetaData.StringParameterMetaData).contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[SqlIdentifier, String] = Bijection[SqlIdentifier, String](_.value)(SqlIdentifier.apply)
+  implicit lazy val column: Column[SqlIdentifier] = Column.columnToString.map(SqlIdentifier.apply)
+  implicit lazy val ordering: Ordering[SqlIdentifier] = Ordering.by(_.value)
+  implicit lazy val parameterMetadata: ParameterMetaData[SqlIdentifier] = new ParameterMetaData[SqlIdentifier] {
+    override def sqlType: String = """"information_schema"."sql_identifier""""
+    override def jdbcType: Int = Types.OTHER
+  }
+  implicit lazy val reads: Reads[SqlIdentifier] = Reads.StringReads.map(SqlIdentifier.apply)
+  implicit lazy val text: Text[SqlIdentifier] = new Text[SqlIdentifier] {
+    override def unsafeEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+  implicit lazy val toStatement: ToStatement[SqlIdentifier] = ToStatement.stringToStatement.contramap(_.value)
+  implicit lazy val writes: Writes[SqlIdentifier] = Writes.StringWrites.contramap(_.value)
+}
\ No newline at end of file
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
new file mode 100644
index 0000000000..445ce7267a
--- /dev/null
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
@@ -0,0 +1,39 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import adventureworks.customtypes.TypoInstant
+import anorm.Column
+import anorm.ParameterMetaData
+import anorm.ToStatement
+import java.sql.Types
+import play.api.libs.json.Reads
+import play.api.libs.json.Writes
+import typo.dsl.Bijection
+
+/** Domain `information_schema.time_stamp`
+  * No constraint
+  */
+case class TimeStamp(value: TypoInstant)
+object TimeStamp {
+  implicit lazy val arrayColumn: Column[Array[TimeStamp]] = Column.columnToArray(column, implicitly)
+  implicit lazy val arrayToStatement: ToStatement[Array[TimeStamp]] = TypoInstant.arrayToStatement.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[TimeStamp, TypoInstant] = Bijection[TimeStamp, TypoInstant](_.value)(TimeStamp.apply)
+  implicit lazy val column: Column[TimeStamp] = TypoInstant.column.map(TimeStamp.apply)
+  implicit def ordering(implicit O0: Ordering[TypoInstant]): Ordering[TimeStamp] = Ordering.by(_.value)
+  implicit lazy val parameterMetadata: ParameterMetaData[TimeStamp] = new ParameterMetaData[TimeStamp] {
+    override def sqlType: String = """"information_schema"."time_stamp""""
+    override def jdbcType: Int = Types.OTHER
+  }
+  implicit lazy val reads: Reads[TimeStamp] = TypoInstant.reads.map(TimeStamp.apply)
+  implicit lazy val text: Text[TimeStamp] = new Text[TimeStamp] {
+    override def unsafeEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeArrayEncode(v.value, sb)
+  }
+  implicit lazy val toStatement: ToStatement[TimeStamp] = TypoInstant.toStatement.contramap(_.value)
+  implicit lazy val writes: Writes[TimeStamp] = TypoInstant.writes.contramap(_.value)
+}
\ No newline at end of file
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
new file mode 100644
index 0000000000..9e60bb7c0e
--- /dev/null
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import anorm.Column
+import anorm.ParameterMetaData
+import anorm.ToStatement
+import java.sql.Types
+import play.api.libs.json.Reads
+import play.api.libs.json.Writes
+import typo.dsl.Bijection
+
+/** Domain `information_schema.yes_or_no`
+  * Constraint: CHECK (((VALUE)::text = ANY ((ARRAY['YES'::character varying, 'NO'::character varying])::text[])))
+  */
+case class YesOrNo(value: String)
+object YesOrNo {
+  implicit lazy val arrayColumn: Column[Array[YesOrNo]] = Column.columnToArray(column, implicitly)
+  implicit lazy val arrayToStatement: ToStatement[Array[YesOrNo]] = ToStatement.arrayToParameter(ParameterMetaData.StringParameterMetaData).contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[YesOrNo, String] = Bijection[YesOrNo, String](_.value)(YesOrNo.apply)
+  implicit lazy val column: Column[YesOrNo] = Column.columnToString.map(YesOrNo.apply)
+  implicit lazy val ordering: Ordering[YesOrNo] = Ordering.by(_.value)
+  implicit lazy val parameterMetadata: ParameterMetaData[YesOrNo] = new ParameterMetaData[YesOrNo] {
+    override def sqlType: String = """"information_schema"."yes_or_no""""
+    override def jdbcType: Int = Types.OTHER
+  }
+  implicit lazy val reads: Reads[YesOrNo] = Reads.StringReads.map(YesOrNo.apply)
+  implicit lazy val text: Text[YesOrNo] = new Text[YesOrNo] {
+    override def unsafeEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+  implicit lazy val toStatement: ToStatement[YesOrNo] = ToStatement.stringToStatement.contramap(_.value)
+  implicit lazy val writes: Writes[YesOrNo] = Writes.StringWrites.contramap(_.value)
+}
\ No newline at end of file
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
index d6a3f76afa..f8c6e432d6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
@@ -29,4 +29,5 @@ trait AddressRepo {
   def update: UpdateBuilder[AddressFields, AddressRow]
   def update(row: AddressRow)(implicit c: Connection): Boolean
   def upsert(unsaved: AddressRow)(implicit c: Connection): AddressRow
+  def upsertStreaming(unsaved: Iterator[AddressRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
index e4e757127d..d587424178 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -162,4 +163,22 @@ class AddressRepoImpl extends AddressRepo {
       .executeInsert(AddressRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[AddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table address_TEMP (like person.address) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy address_TEMP("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(AddressRow.text, c): @nowarn
+    SQL"""insert into person.address("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate")
+          select * from address_TEMP
+          on conflict ("addressid")
+          do update set
+            "addressline1" = EXCLUDED."addressline1",
+            "addressline2" = EXCLUDED."addressline2",
+            "city" = EXCLUDED."city",
+            "stateprovinceid" = EXCLUDED."stateprovinceid",
+            "postalcode" = EXCLUDED."postalcode",
+            "spatiallocation" = EXCLUDED."spatiallocation",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table address_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
index 087842773c..73248ed3f1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
@@ -87,4 +87,10 @@ class AddressRepoMock(toRow: Function1[AddressRowUnsaved, AddressRow],
     map.put(unsaved.addressid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[AddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.addressid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
index b2bd59f5c2..4d2cd3e3e0 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
@@ -29,4 +29,5 @@ trait AddresstypeRepo {
   def update: UpdateBuilder[AddresstypeFields, AddresstypeRow]
   def update(row: AddresstypeRow)(implicit c: Connection): Boolean
   def upsert(unsaved: AddresstypeRow)(implicit c: Connection): AddresstypeRow
+  def upsertStreaming(unsaved: Iterator[AddresstypeRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
index 92550a8042..321e0d5359 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -139,4 +140,17 @@ class AddresstypeRepoImpl extends AddresstypeRepo {
       .executeInsert(AddresstypeRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[AddresstypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table addresstype_TEMP (like person.addresstype) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy addresstype_TEMP("addresstypeid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(AddresstypeRow.text, c): @nowarn
+    SQL"""insert into person.addresstype("addresstypeid", "name", "rowguid", "modifieddate")
+          select * from addresstype_TEMP
+          on conflict ("addresstypeid")
+          do update set
+            "name" = EXCLUDED."name",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table addresstype_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
index 9224317679..63666c6095 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
@@ -87,4 +87,10 @@ class AddresstypeRepoMock(toRow: Function1[AddresstypeRowUnsaved, AddresstypeRow
     map.put(unsaved.addresstypeid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[AddresstypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.addresstypeid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
index 655e8b3210..374d52497c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
@@ -29,4 +29,5 @@ trait BusinessentityRepo {
   def update: UpdateBuilder[BusinessentityFields, BusinessentityRow]
   def update(row: BusinessentityRow)(implicit c: Connection): Boolean
   def upsert(unsaved: BusinessentityRow)(implicit c: Connection): BusinessentityRow
+  def upsertStreaming(unsaved: Iterator[BusinessentityRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
index bc51a38ed7..2292af334c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -134,4 +135,16 @@ class BusinessentityRepoImpl extends BusinessentityRepo {
       .executeInsert(BusinessentityRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentityRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table businessentity_TEMP (like person.businessentity) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy businessentity_TEMP("businessentityid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentityRow.text, c): @nowarn
+    SQL"""insert into person.businessentity("businessentityid", "rowguid", "modifieddate")
+          select * from businessentity_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table businessentity_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
index 17cc0fa777..599eec3c27 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
@@ -87,4 +87,10 @@ class BusinessentityRepoMock(toRow: Function1[BusinessentityRowUnsaved, Business
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentityRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
index 85611f4d33..defaefde60 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
@@ -29,4 +29,5 @@ trait BusinessentityaddressRepo {
   def update: UpdateBuilder[BusinessentityaddressFields, BusinessentityaddressRow]
   def update(row: BusinessentityaddressRow)(implicit c: Connection): Boolean
   def upsert(unsaved: BusinessentityaddressRow)(implicit c: Connection): BusinessentityaddressRow
+  def upsertStreaming(unsaved: Iterator[BusinessentityaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
index c1468c00a4..05c89d6d07 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -146,4 +147,16 @@ class BusinessentityaddressRepoImpl extends BusinessentityaddressRepo {
       .executeInsert(BusinessentityaddressRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentityaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table businessentityaddress_TEMP (like person.businessentityaddress) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy businessentityaddress_TEMP("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentityaddressRow.text, c): @nowarn
+    SQL"""insert into person.businessentityaddress("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate")
+          select * from businessentityaddress_TEMP
+          on conflict ("businessentityid", "addressid", "addresstypeid")
+          do update set
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table businessentityaddress_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
index 7d9a336681..acd4257d80 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
@@ -87,4 +87,10 @@ class BusinessentityaddressRepoMock(toRow: Function1[BusinessentityaddressRowUns
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentityaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
index 3d311c8717..75aac1c5ba 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
@@ -29,4 +29,5 @@ trait BusinessentitycontactRepo {
   def update: UpdateBuilder[BusinessentitycontactFields, BusinessentitycontactRow]
   def update(row: BusinessentitycontactRow)(implicit c: Connection): Boolean
   def upsert(unsaved: BusinessentitycontactRow)(implicit c: Connection): BusinessentitycontactRow
+  def upsertStreaming(unsaved: Iterator[BusinessentitycontactRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
index 0952223e1c..ba694b70d2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -145,4 +146,16 @@ class BusinessentitycontactRepoImpl extends BusinessentitycontactRepo {
       .executeInsert(BusinessentitycontactRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentitycontactRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table businessentitycontact_TEMP (like person.businessentitycontact) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy businessentitycontact_TEMP("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentitycontactRow.text, c): @nowarn
+    SQL"""insert into person.businessentitycontact("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate")
+          select * from businessentitycontact_TEMP
+          on conflict ("businessentityid", "personid", "contacttypeid")
+          do update set
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table businessentitycontact_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
index ca0c746983..9c85d71ecf 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
@@ -87,4 +87,10 @@ class BusinessentitycontactRepoMock(toRow: Function1[BusinessentitycontactRowUns
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[BusinessentitycontactRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
index 69c219b04e..948667aa25 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
@@ -29,4 +29,5 @@ trait ContacttypeRepo {
   def update: UpdateBuilder[ContacttypeFields, ContacttypeRow]
   def update(row: ContacttypeRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ContacttypeRow)(implicit c: Connection): ContacttypeRow
+  def upsertStreaming(unsaved: Iterator[ContacttypeRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
index c416212e50..7cb58057a4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -131,4 +132,16 @@ class ContacttypeRepoImpl extends ContacttypeRepo {
       .executeInsert(ContacttypeRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ContacttypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table contacttype_TEMP (like person.contacttype) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy contacttype_TEMP("contacttypeid", "name", "modifieddate") from stdin""", batchSize, unsaved)(ContacttypeRow.text, c): @nowarn
+    SQL"""insert into person.contacttype("contacttypeid", "name", "modifieddate")
+          select * from contacttype_TEMP
+          on conflict ("contacttypeid")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table contacttype_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
index 165c5bdfa1..7c4ebe2c63 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
@@ -87,4 +87,10 @@ class ContacttypeRepoMock(toRow: Function1[ContacttypeRowUnsaved, ContacttypeRow
     map.put(unsaved.contacttypeid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ContacttypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.contacttypeid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
index 3d2aebce3a..fdfb356fff 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
@@ -29,4 +29,5 @@ trait CountryregionRepo {
   def update: UpdateBuilder[CountryregionFields, CountryregionRow]
   def update(row: CountryregionRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CountryregionRow)(implicit c: Connection): CountryregionRow
+  def upsertStreaming(unsaved: Iterator[CountryregionRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
index 27182db4b0..9f20c20f4f 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -128,4 +129,16 @@ class CountryregionRepoImpl extends CountryregionRepo {
       .executeInsert(CountryregionRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CountryregionRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table countryregion_TEMP (like person.countryregion) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy countryregion_TEMP("countryregioncode", "name", "modifieddate") from stdin""", batchSize, unsaved)(CountryregionRow.text, c): @nowarn
+    SQL"""insert into person.countryregion("countryregioncode", "name", "modifieddate")
+          select * from countryregion_TEMP
+          on conflict ("countryregioncode")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table countryregion_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
index ac8b613740..699bd1f4bf 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
@@ -87,4 +87,10 @@ class CountryregionRepoMock(toRow: Function1[CountryregionRowUnsaved, Countryreg
     map.put(unsaved.countryregioncode, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CountryregionRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.countryregioncode -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
index 4c4282b63a..7fb373f813 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
@@ -29,4 +29,5 @@ trait EmailaddressRepo {
   def update: UpdateBuilder[EmailaddressFields, EmailaddressRow]
   def update(row: EmailaddressRow)(implicit c: Connection): Boolean
   def upsert(unsaved: EmailaddressRow)(implicit c: Connection): EmailaddressRow
+  def upsertStreaming(unsaved: Iterator[EmailaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
index 4a83773fbf..fe31716f74 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -149,4 +150,17 @@ class EmailaddressRepoImpl extends EmailaddressRepo {
       .executeInsert(EmailaddressRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[EmailaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table emailaddress_TEMP (like person.emailaddress) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy emailaddress_TEMP("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(EmailaddressRow.text, c): @nowarn
+    SQL"""insert into person.emailaddress("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate")
+          select * from emailaddress_TEMP
+          on conflict ("businessentityid", "emailaddressid")
+          do update set
+            "emailaddress" = EXCLUDED."emailaddress",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table emailaddress_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
index 90f6fa0e6e..e1c101d963 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
@@ -87,4 +87,10 @@ class EmailaddressRepoMock(toRow: Function1[EmailaddressRowUnsaved, Emailaddress
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[EmailaddressRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
index bedde72dc6..6c83fc06ce 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
@@ -30,4 +30,5 @@ trait PasswordRepo {
   def update: UpdateBuilder[PasswordFields, PasswordRow]
   def update(row: PasswordRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PasswordRow)(implicit c: Connection): PasswordRow
+  def upsertStreaming(unsaved: Iterator[PasswordRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
index e5a1c45df6..e70df87efd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -141,4 +142,18 @@ class PasswordRepoImpl extends PasswordRepo {
       .executeInsert(PasswordRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PasswordRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table password_TEMP (like person.password) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy password_TEMP("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(PasswordRow.text, c): @nowarn
+    SQL"""insert into person.password("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate")
+          select * from password_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "passwordhash" = EXCLUDED."passwordhash",
+            "passwordsalt" = EXCLUDED."passwordsalt",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table password_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
index 0a5634f39b..abca11e3d7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
@@ -88,4 +88,10 @@ class PasswordRepoMock(toRow: Function1[PasswordRowUnsaved, PasswordRow],
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PasswordRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
index 9dbec66538..3b75b9a95e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
@@ -30,4 +30,5 @@ trait PersonRepo {
   def update: UpdateBuilder[PersonFields, PersonRow]
   def update(row: PersonRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PersonRow)(implicit c: Connection): PersonRow
+  def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
index 940ca52253..647fc23eea 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
@@ -24,6 +24,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -184,4 +185,26 @@ class PersonRepoImpl extends PersonRepo {
       .executeInsert(PersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table person_TEMP (like person.person) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy person_TEMP("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(PersonRow.text, c): @nowarn
+    SQL"""insert into person.person("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate")
+          select * from person_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "persontype" = EXCLUDED."persontype",
+            "namestyle" = EXCLUDED."namestyle",
+            "title" = EXCLUDED."title",
+            "firstname" = EXCLUDED."firstname",
+            "middlename" = EXCLUDED."middlename",
+            "lastname" = EXCLUDED."lastname",
+            "suffix" = EXCLUDED."suffix",
+            "emailpromotion" = EXCLUDED."emailpromotion",
+            "additionalcontactinfo" = EXCLUDED."additionalcontactinfo",
+            "demographics" = EXCLUDED."demographics",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table person_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
index ab4d398f22..12d0339895 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
@@ -88,4 +88,10 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
index e1ef04026b..fc2ac7554b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
@@ -29,4 +29,5 @@ trait PersonphoneRepo {
   def update: UpdateBuilder[PersonphoneFields, PersonphoneRow]
   def update(row: PersonphoneRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PersonphoneRow)(implicit c: Connection): PersonphoneRow
+  def upsertStreaming(unsaved: Iterator[PersonphoneRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
index c2afac90ff..e2f783160a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -138,4 +139,15 @@ class PersonphoneRepoImpl extends PersonphoneRepo {
       .executeInsert(PersonphoneRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersonphoneRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table personphone_TEMP (like person.personphone) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy personphone_TEMP("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate") from stdin""", batchSize, unsaved)(PersonphoneRow.text, c): @nowarn
+    SQL"""insert into person.personphone("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate")
+          select * from personphone_TEMP
+          on conflict ("businessentityid", "phonenumber", "phonenumbertypeid")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table personphone_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
index 92853f8132..6eaf151ef0 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
@@ -87,4 +87,10 @@ class PersonphoneRepoMock(toRow: Function1[PersonphoneRowUnsaved, PersonphoneRow
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersonphoneRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
index 0be2c2c174..1c31133371 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
@@ -29,4 +29,5 @@ trait PhonenumbertypeRepo {
   def update: UpdateBuilder[PhonenumbertypeFields, PhonenumbertypeRow]
   def update(row: PhonenumbertypeRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PhonenumbertypeRow)(implicit c: Connection): PhonenumbertypeRow
+  def upsertStreaming(unsaved: Iterator[PhonenumbertypeRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
index 065ac42cc4..c311694b4a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -131,4 +132,16 @@ class PhonenumbertypeRepoImpl extends PhonenumbertypeRepo {
       .executeInsert(PhonenumbertypeRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PhonenumbertypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table phonenumbertype_TEMP (like person.phonenumbertype) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy phonenumbertype_TEMP("phonenumbertypeid", "name", "modifieddate") from stdin""", batchSize, unsaved)(PhonenumbertypeRow.text, c): @nowarn
+    SQL"""insert into person.phonenumbertype("phonenumbertypeid", "name", "modifieddate")
+          select * from phonenumbertype_TEMP
+          on conflict ("phonenumbertypeid")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table phonenumbertype_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
index eb0b166c68..d7b3c653b0 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
@@ -87,4 +87,10 @@ class PhonenumbertypeRepoMock(toRow: Function1[PhonenumbertypeRowUnsaved, Phonen
     map.put(unsaved.phonenumbertypeid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PhonenumbertypeRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.phonenumbertypeid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
index 279c3c91af..47843d0cf1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
@@ -29,4 +29,5 @@ trait StateprovinceRepo {
   def update: UpdateBuilder[StateprovinceFields, StateprovinceRow]
   def update(row: StateprovinceRow)(implicit c: Connection): Boolean
   def upsert(unsaved: StateprovinceRow)(implicit c: Connection): StateprovinceRow
+  def upsertStreaming(unsaved: Iterator[StateprovinceRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
index 228f4abf12..e4445e431c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
@@ -22,6 +22,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -162,4 +163,21 @@ class StateprovinceRepoImpl extends StateprovinceRepo {
       .executeInsert(StateprovinceRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[StateprovinceRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table stateprovince_TEMP (like person.stateprovince) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy stateprovince_TEMP("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(StateprovinceRow.text, c): @nowarn
+    SQL"""insert into person.stateprovince("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate")
+          select * from stateprovince_TEMP
+          on conflict ("stateprovinceid")
+          do update set
+            "stateprovincecode" = EXCLUDED."stateprovincecode",
+            "countryregioncode" = EXCLUDED."countryregioncode",
+            "isonlystateprovinceflag" = EXCLUDED."isonlystateprovinceflag",
+            "name" = EXCLUDED."name",
+            "territoryid" = EXCLUDED."territoryid",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table stateprovince_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
index d7b8f962a1..90d2ea71a9 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
@@ -87,4 +87,10 @@ class StateprovinceRepoMock(toRow: Function1[StateprovinceRowUnsaved, Stateprovi
     map.put(unsaved.stateprovinceid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[StateprovinceRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.stateprovinceid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
index 560fea6a75..010f441f6a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
@@ -29,4 +29,5 @@ trait BillofmaterialsRepo {
   def update: UpdateBuilder[BillofmaterialsFields, BillofmaterialsRow]
   def update(row: BillofmaterialsRow)(implicit c: Connection): Boolean
   def upsert(unsaved: BillofmaterialsRow)(implicit c: Connection): BillofmaterialsRow
+  def upsertStreaming(unsaved: Iterator[BillofmaterialsRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
index a8c84e1f55..7eb3d7ad7e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -164,4 +165,22 @@ class BillofmaterialsRepoImpl extends BillofmaterialsRepo {
       .executeInsert(BillofmaterialsRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[BillofmaterialsRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table billofmaterials_TEMP (like production.billofmaterials) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy billofmaterials_TEMP("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate") from stdin""", batchSize, unsaved)(BillofmaterialsRow.text, c): @nowarn
+    SQL"""insert into production.billofmaterials("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate")
+          select * from billofmaterials_TEMP
+          on conflict ("billofmaterialsid")
+          do update set
+            "productassemblyid" = EXCLUDED."productassemblyid",
+            "componentid" = EXCLUDED."componentid",
+            "startdate" = EXCLUDED."startdate",
+            "enddate" = EXCLUDED."enddate",
+            "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+            "bomlevel" = EXCLUDED."bomlevel",
+            "perassemblyqty" = EXCLUDED."perassemblyqty",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table billofmaterials_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
index 397e97f21e..82f0ad53dd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
@@ -87,4 +87,10 @@ class BillofmaterialsRepoMock(toRow: Function1[BillofmaterialsRowUnsaved, Billof
     map.put(unsaved.billofmaterialsid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[BillofmaterialsRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.billofmaterialsid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
index f1c7fcff17..cd4f1f13c1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
@@ -29,4 +29,5 @@ trait CultureRepo {
   def update: UpdateBuilder[CultureFields, CultureRow]
   def update(row: CultureRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CultureRow)(implicit c: Connection): CultureRow
+  def upsertStreaming(unsaved: Iterator[CultureRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
index 168ccdcdc4..a6e277d207 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -128,4 +129,16 @@ class CultureRepoImpl extends CultureRepo {
       .executeInsert(CultureRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CultureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table culture_TEMP (like production.culture) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy culture_TEMP("cultureid", "name", "modifieddate") from stdin""", batchSize, unsaved)(CultureRow.text, c): @nowarn
+    SQL"""insert into production.culture("cultureid", "name", "modifieddate")
+          select * from culture_TEMP
+          on conflict ("cultureid")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table culture_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
index 79c532d76d..4252a41917 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
@@ -87,4 +87,10 @@ class CultureRepoMock(toRow: Function1[CultureRowUnsaved, CultureRow],
     map.put(unsaved.cultureid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CultureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.cultureid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
index e11b65000f..fed9503809 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
@@ -31,4 +31,5 @@ trait DocumentRepo {
   def update: UpdateBuilder[DocumentFields, DocumentRow]
   def update(row: DocumentRow)(implicit c: Connection): Boolean
   def upsert(unsaved: DocumentRow)(implicit c: Connection): DocumentRow
+  def upsertStreaming(unsaved: Iterator[DocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
index 130dfb5a07..dd852d77f6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
@@ -23,6 +23,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -193,4 +194,26 @@ class DocumentRepoImpl extends DocumentRepo {
       .executeInsert(DocumentRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[DocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table document_TEMP (like production.document) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy document_TEMP("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode") from stdin""", batchSize, unsaved)(DocumentRow.text, c): @nowarn
+    SQL"""insert into production.document("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode")
+          select * from document_TEMP
+          on conflict ("documentnode")
+          do update set
+            "title" = EXCLUDED."title",
+            "owner" = EXCLUDED."owner",
+            "folderflag" = EXCLUDED."folderflag",
+            "filename" = EXCLUDED."filename",
+            "fileextension" = EXCLUDED."fileextension",
+            "revision" = EXCLUDED."revision",
+            "changenumber" = EXCLUDED."changenumber",
+            "status" = EXCLUDED."status",
+            "documentsummary" = EXCLUDED."documentsummary",
+            "document" = EXCLUDED."document",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table document_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
index 9f4d2ff643..206326d96e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
@@ -91,4 +91,10 @@ class DocumentRepoMock(toRow: Function1[DocumentRowUnsaved, DocumentRow],
     map.put(unsaved.documentnode, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[DocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.documentnode -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
index 6c0210c763..95f6583847 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
@@ -29,4 +29,5 @@ trait IllustrationRepo {
   def update: UpdateBuilder[IllustrationFields, IllustrationRow]
   def update(row: IllustrationRow)(implicit c: Connection): Boolean
   def upsert(unsaved: IllustrationRow)(implicit c: Connection): IllustrationRow
+  def upsertStreaming(unsaved: Iterator[IllustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
index e366c777a5..d6480dc994 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -132,4 +133,16 @@ class IllustrationRepoImpl extends IllustrationRepo {
       .executeInsert(IllustrationRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[IllustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table illustration_TEMP (like production.illustration) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy illustration_TEMP("illustrationid", "diagram", "modifieddate") from stdin""", batchSize, unsaved)(IllustrationRow.text, c): @nowarn
+    SQL"""insert into production.illustration("illustrationid", "diagram", "modifieddate")
+          select * from illustration_TEMP
+          on conflict ("illustrationid")
+          do update set
+            "diagram" = EXCLUDED."diagram",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table illustration_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
index 3ecbea1fae..41369968c4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
@@ -87,4 +87,10 @@ class IllustrationRepoMock(toRow: Function1[IllustrationRowUnsaved, Illustration
     map.put(unsaved.illustrationid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[IllustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.illustrationid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
index 5a14375801..597d3e9c68 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
@@ -29,4 +29,5 @@ trait LocationRepo {
   def update: UpdateBuilder[LocationFields, LocationRow]
   def update(row: LocationRow)(implicit c: Connection): Boolean
   def upsert(unsaved: LocationRow)(implicit c: Connection): LocationRow
+  def upsertStreaming(unsaved: Iterator[LocationRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
index 431455ca8d..75458843e5 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -146,4 +147,18 @@ class LocationRepoImpl extends LocationRepo {
       .executeInsert(LocationRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[LocationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table location_TEMP (like production.location) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy location_TEMP("locationid", "name", "costrate", "availability", "modifieddate") from stdin""", batchSize, unsaved)(LocationRow.text, c): @nowarn
+    SQL"""insert into production.location("locationid", "name", "costrate", "availability", "modifieddate")
+          select * from location_TEMP
+          on conflict ("locationid")
+          do update set
+            "name" = EXCLUDED."name",
+            "costrate" = EXCLUDED."costrate",
+            "availability" = EXCLUDED."availability",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table location_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
index da374be2c9..30af65d9da 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
@@ -87,4 +87,10 @@ class LocationRepoMock(toRow: Function1[LocationRowUnsaved, LocationRow],
     map.put(unsaved.locationid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[LocationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.locationid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
index e077e4b2de..232a944696 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
@@ -29,4 +29,5 @@ trait ProductRepo {
   def update: UpdateBuilder[ProductFields, ProductRow]
   def update(row: ProductRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductRow)(implicit c: Connection): ProductRow
+  def upsertStreaming(unsaved: Iterator[ProductRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
index 12baefb389..719058370c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
@@ -25,6 +25,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -236,4 +237,38 @@ class ProductRepoImpl extends ProductRepo {
       .executeInsert(ProductRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table product_TEMP (like production.product) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy product_TEMP("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductRow.text, c): @nowarn
+    SQL"""insert into production.product("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate")
+          select * from product_TEMP
+          on conflict ("productid")
+          do update set
+            "name" = EXCLUDED."name",
+            "productnumber" = EXCLUDED."productnumber",
+            "makeflag" = EXCLUDED."makeflag",
+            "finishedgoodsflag" = EXCLUDED."finishedgoodsflag",
+            "color" = EXCLUDED."color",
+            "safetystocklevel" = EXCLUDED."safetystocklevel",
+            "reorderpoint" = EXCLUDED."reorderpoint",
+            "standardcost" = EXCLUDED."standardcost",
+            "listprice" = EXCLUDED."listprice",
+            "size" = EXCLUDED."size",
+            "sizeunitmeasurecode" = EXCLUDED."sizeunitmeasurecode",
+            "weightunitmeasurecode" = EXCLUDED."weightunitmeasurecode",
+            "weight" = EXCLUDED."weight",
+            "daystomanufacture" = EXCLUDED."daystomanufacture",
+            "productline" = EXCLUDED."productline",
+            "class" = EXCLUDED."class",
+            "style" = EXCLUDED."style",
+            "productsubcategoryid" = EXCLUDED."productsubcategoryid",
+            "productmodelid" = EXCLUDED."productmodelid",
+            "sellstartdate" = EXCLUDED."sellstartdate",
+            "sellenddate" = EXCLUDED."sellenddate",
+            "discontinueddate" = EXCLUDED."discontinueddate",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table product_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
index dd88783d48..174fa07b06 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
@@ -87,4 +87,10 @@ class ProductRepoMock(toRow: Function1[ProductRowUnsaved, ProductRow],
     map.put(unsaved.productid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
index 3715886c04..c78ec593e5 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
@@ -29,4 +29,5 @@ trait ProductcategoryRepo {
   def update: UpdateBuilder[ProductcategoryFields, ProductcategoryRow]
   def update(row: ProductcategoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductcategoryRow)(implicit c: Connection): ProductcategoryRow
+  def upsertStreaming(unsaved: Iterator[ProductcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
index 95c88ef909..d91d71522c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -139,4 +140,17 @@ class ProductcategoryRepoImpl extends ProductcategoryRepo {
       .executeInsert(ProductcategoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productcategory_TEMP (like production.productcategory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productcategory_TEMP("productcategoryid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductcategoryRow.text, c): @nowarn
+    SQL"""insert into production.productcategory("productcategoryid", "name", "rowguid", "modifieddate")
+          select * from productcategory_TEMP
+          on conflict ("productcategoryid")
+          do update set
+            "name" = EXCLUDED."name",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productcategory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
index 98bf69181f..b1af434734 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
@@ -87,4 +87,10 @@ class ProductcategoryRepoMock(toRow: Function1[ProductcategoryRowUnsaved, Produc
     map.put(unsaved.productcategoryid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productcategoryid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
index b1a1d6a0f7..9d97aa8ed4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
@@ -29,4 +29,5 @@ trait ProductcosthistoryRepo {
   def update: UpdateBuilder[ProductcosthistoryFields, ProductcosthistoryRow]
   def update(row: ProductcosthistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductcosthistoryRow)(implicit c: Connection): ProductcosthistoryRow
+  def upsertStreaming(unsaved: Iterator[ProductcosthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
index 3d06d52ced..788c9c21e4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -141,4 +142,17 @@ class ProductcosthistoryRepoImpl extends ProductcosthistoryRepo {
       .executeInsert(ProductcosthistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductcosthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productcosthistory_TEMP (like production.productcosthistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productcosthistory_TEMP("productid", "startdate", "enddate", "standardcost", "modifieddate") from stdin""", batchSize, unsaved)(ProductcosthistoryRow.text, c): @nowarn
+    SQL"""insert into production.productcosthistory("productid", "startdate", "enddate", "standardcost", "modifieddate")
+          select * from productcosthistory_TEMP
+          on conflict ("productid", "startdate")
+          do update set
+            "enddate" = EXCLUDED."enddate",
+            "standardcost" = EXCLUDED."standardcost",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productcosthistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
index 4f92133d1a..b847ece0b9 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
@@ -87,4 +87,10 @@ class ProductcosthistoryRepoMock(toRow: Function1[ProductcosthistoryRowUnsaved,
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductcosthistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
index 56c66e1700..07d52c4345 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
@@ -29,4 +29,5 @@ trait ProductdescriptionRepo {
   def update: UpdateBuilder[ProductdescriptionFields, ProductdescriptionRow]
   def update(row: ProductdescriptionRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductdescriptionRow)(implicit c: Connection): ProductdescriptionRow
+  def upsertStreaming(unsaved: Iterator[ProductdescriptionRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
index 42190ac7ac..9c1d2ff365 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -139,4 +140,17 @@ class ProductdescriptionRepoImpl extends ProductdescriptionRepo {
       .executeInsert(ProductdescriptionRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductdescriptionRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productdescription_TEMP (like production.productdescription) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productdescription_TEMP("productdescriptionid", "description", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductdescriptionRow.text, c): @nowarn
+    SQL"""insert into production.productdescription("productdescriptionid", "description", "rowguid", "modifieddate")
+          select * from productdescription_TEMP
+          on conflict ("productdescriptionid")
+          do update set
+            "description" = EXCLUDED."description",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productdescription_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
index 80c10400cf..27991f8c2a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
@@ -87,4 +87,10 @@ class ProductdescriptionRepoMock(toRow: Function1[ProductdescriptionRowUnsaved,
     map.put(unsaved.productdescriptionid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductdescriptionRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productdescriptionid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
index 2a78e52772..a235f099ee 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
@@ -29,4 +29,5 @@ trait ProductdocumentRepo {
   def update: UpdateBuilder[ProductdocumentFields, ProductdocumentRow]
   def update(row: ProductdocumentRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductdocumentRow)(implicit c: Connection): ProductdocumentRow
+  def upsertStreaming(unsaved: Iterator[ProductdocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
index 28a794ad1e..c532dcfd73 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -136,4 +137,15 @@ class ProductdocumentRepoImpl extends ProductdocumentRepo {
       .executeInsert(ProductdocumentRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductdocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productdocument_TEMP (like production.productdocument) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productdocument_TEMP("productid", "modifieddate", "documentnode") from stdin""", batchSize, unsaved)(ProductdocumentRow.text, c): @nowarn
+    SQL"""insert into production.productdocument("productid", "modifieddate", "documentnode")
+          select * from productdocument_TEMP
+          on conflict ("productid", "documentnode")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productdocument_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
index d7b8cd12bf..26977020d1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
@@ -87,4 +87,10 @@ class ProductdocumentRepoMock(toRow: Function1[ProductdocumentRowUnsaved, Produc
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductdocumentRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
index ed3a87eb90..af481e2d6f 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
@@ -29,4 +29,5 @@ trait ProductinventoryRepo {
   def update: UpdateBuilder[ProductinventoryFields, ProductinventoryRow]
   def update(row: ProductinventoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductinventoryRow)(implicit c: Connection): ProductinventoryRow
+  def upsertStreaming(unsaved: Iterator[ProductinventoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
index fd0dc5d4ef..67e3cec4f8 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -158,4 +159,19 @@ class ProductinventoryRepoImpl extends ProductinventoryRepo {
       .executeInsert(ProductinventoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductinventoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productinventory_TEMP (like production.productinventory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productinventory_TEMP("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductinventoryRow.text, c): @nowarn
+    SQL"""insert into production.productinventory("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate")
+          select * from productinventory_TEMP
+          on conflict ("productid", "locationid")
+          do update set
+            "shelf" = EXCLUDED."shelf",
+            "bin" = EXCLUDED."bin",
+            "quantity" = EXCLUDED."quantity",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productinventory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
index 0039022c35..be6a83ceb0 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
@@ -87,4 +87,10 @@ class ProductinventoryRepoMock(toRow: Function1[ProductinventoryRowUnsaved, Prod
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductinventoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
index f2af790106..179603fa61 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
@@ -29,4 +29,5 @@ trait ProductlistpricehistoryRepo {
   def update: UpdateBuilder[ProductlistpricehistoryFields, ProductlistpricehistoryRow]
   def update(row: ProductlistpricehistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductlistpricehistoryRow)(implicit c: Connection): ProductlistpricehistoryRow
+  def upsertStreaming(unsaved: Iterator[ProductlistpricehistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
index 22559619f4..8f2538d7f7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -141,4 +142,17 @@ class ProductlistpricehistoryRepoImpl extends ProductlistpricehistoryRepo {
       .executeInsert(ProductlistpricehistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductlistpricehistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productlistpricehistory_TEMP (like production.productlistpricehistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productlistpricehistory_TEMP("productid", "startdate", "enddate", "listprice", "modifieddate") from stdin""", batchSize, unsaved)(ProductlistpricehistoryRow.text, c): @nowarn
+    SQL"""insert into production.productlistpricehistory("productid", "startdate", "enddate", "listprice", "modifieddate")
+          select * from productlistpricehistory_TEMP
+          on conflict ("productid", "startdate")
+          do update set
+            "enddate" = EXCLUDED."enddate",
+            "listprice" = EXCLUDED."listprice",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productlistpricehistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
index 36b13e37ad..4bd18d58c2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
@@ -87,4 +87,10 @@ class ProductlistpricehistoryRepoMock(toRow: Function1[ProductlistpricehistoryRo
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductlistpricehistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
index 091ac06c9d..0b29c94d6d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
@@ -29,4 +29,5 @@ trait ProductmodelRepo {
   def update: UpdateBuilder[ProductmodelFields, ProductmodelRow]
   def update(row: ProductmodelRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductmodelRow)(implicit c: Connection): ProductmodelRow
+  def upsertStreaming(unsaved: Iterator[ProductmodelRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
index 965bdf1e3c..283a614d81 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -149,4 +150,19 @@ class ProductmodelRepoImpl extends ProductmodelRepo {
       .executeInsert(ProductmodelRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productmodel_TEMP (like production.productmodel) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productmodel_TEMP("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelRow.text, c): @nowarn
+    SQL"""insert into production.productmodel("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate")
+          select * from productmodel_TEMP
+          on conflict ("productmodelid")
+          do update set
+            "name" = EXCLUDED."name",
+            "catalogdescription" = EXCLUDED."catalogdescription",
+            "instructions" = EXCLUDED."instructions",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productmodel_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
index 138aaf1bdd..2bf036f9eb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
@@ -87,4 +87,10 @@ class ProductmodelRepoMock(toRow: Function1[ProductmodelRowUnsaved, Productmodel
     map.put(unsaved.productmodelid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productmodelid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
index 31b7f19698..52132f5c9c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
@@ -29,4 +29,5 @@ trait ProductmodelillustrationRepo {
   def update: UpdateBuilder[ProductmodelillustrationFields, ProductmodelillustrationRow]
   def update(row: ProductmodelillustrationRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductmodelillustrationRow)(implicit c: Connection): ProductmodelillustrationRow
+  def upsertStreaming(unsaved: Iterator[ProductmodelillustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
index 41df2e3e8a..9912c653cc 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -133,4 +134,15 @@ class ProductmodelillustrationRepoImpl extends ProductmodelillustrationRepo {
       .executeInsert(ProductmodelillustrationRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelillustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productmodelillustration_TEMP (like production.productmodelillustration) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productmodelillustration_TEMP("productmodelid", "illustrationid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelillustrationRow.text, c): @nowarn
+    SQL"""insert into production.productmodelillustration("productmodelid", "illustrationid", "modifieddate")
+          select * from productmodelillustration_TEMP
+          on conflict ("productmodelid", "illustrationid")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productmodelillustration_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
index 903ada02a8..ba2a213617 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
@@ -87,4 +87,10 @@ class ProductmodelillustrationRepoMock(toRow: Function1[Productmodelillustration
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelillustrationRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
index cbc87422c9..06c4eddc60 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
@@ -29,4 +29,5 @@ trait ProductmodelproductdescriptioncultureRepo {
   def update: UpdateBuilder[ProductmodelproductdescriptioncultureFields, ProductmodelproductdescriptioncultureRow]
   def update(row: ProductmodelproductdescriptioncultureRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductmodelproductdescriptioncultureRow)(implicit c: Connection): ProductmodelproductdescriptioncultureRow
+  def upsertStreaming(unsaved: Iterator[ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
index 366b82cff4..1ae0e83003 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -138,4 +139,15 @@ class ProductmodelproductdescriptioncultureRepoImpl extends Productmodelproductd
       .executeInsert(ProductmodelproductdescriptioncultureRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productmodelproductdescriptionculture_TEMP (like production.productmodelproductdescriptionculture) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productmodelproductdescriptionculture_TEMP("productmodelid", "productdescriptionid", "cultureid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelproductdescriptioncultureRow.text, c): @nowarn
+    SQL"""insert into production.productmodelproductdescriptionculture("productmodelid", "productdescriptionid", "cultureid", "modifieddate")
+          select * from productmodelproductdescriptionculture_TEMP
+          on conflict ("productmodelid", "productdescriptionid", "cultureid")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productmodelproductdescriptionculture_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
index be236f9531..dc78a39d02 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
@@ -87,4 +87,10 @@ class ProductmodelproductdescriptioncultureRepoMock(toRow: Function1[Productmode
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
index e73a0c3124..5f93ddd0ff 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
@@ -29,4 +29,5 @@ trait ProductphotoRepo {
   def update: UpdateBuilder[ProductphotoFields, ProductphotoRow]
   def update(row: ProductphotoRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductphotoRow)(implicit c: Connection): ProductphotoRow
+  def upsertStreaming(unsaved: Iterator[ProductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
index c67fe329fb..9aa4da33ff 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -145,4 +146,19 @@ class ProductphotoRepoImpl extends ProductphotoRepo {
       .executeInsert(ProductphotoRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productphoto_TEMP (like production.productphoto) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productphoto_TEMP("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate") from stdin""", batchSize, unsaved)(ProductphotoRow.text, c): @nowarn
+    SQL"""insert into production.productphoto("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate")
+          select * from productphoto_TEMP
+          on conflict ("productphotoid")
+          do update set
+            "thumbnailphoto" = EXCLUDED."thumbnailphoto",
+            "thumbnailphotofilename" = EXCLUDED."thumbnailphotofilename",
+            "largephoto" = EXCLUDED."largephoto",
+            "largephotofilename" = EXCLUDED."largephotofilename",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productphoto_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
index fa62988679..d643633c67 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
@@ -87,4 +87,10 @@ class ProductphotoRepoMock(toRow: Function1[ProductphotoRowUnsaved, Productphoto
     map.put(unsaved.productphotoid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productphotoid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
index 669286788f..ed32f4b3a2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
@@ -29,4 +29,5 @@ trait ProductproductphotoRepo {
   def update: UpdateBuilder[ProductproductphotoFields, ProductproductphotoRow]
   def update(row: ProductproductphotoRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductproductphotoRow)(implicit c: Connection): ProductproductphotoRow
+  def upsertStreaming(unsaved: Iterator[ProductproductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
index c790f676ac..e5f4849e09 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -141,4 +142,16 @@ class ProductproductphotoRepoImpl extends ProductproductphotoRepo {
       .executeInsert(ProductproductphotoRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductproductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productproductphoto_TEMP (like production.productproductphoto) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productproductphoto_TEMP("productid", "productphotoid", "primary", "modifieddate") from stdin""", batchSize, unsaved)(ProductproductphotoRow.text, c): @nowarn
+    SQL"""insert into production.productproductphoto("productid", "productphotoid", "primary", "modifieddate")
+          select * from productproductphoto_TEMP
+          on conflict ("productid", "productphotoid")
+          do update set
+            "primary" = EXCLUDED."primary",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productproductphoto_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
index 71f288b1e1..bf7a135a1a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
@@ -87,4 +87,10 @@ class ProductproductphotoRepoMock(toRow: Function1[ProductproductphotoRowUnsaved
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductproductphotoRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
index 1dce4ece3c..af444282d6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
@@ -29,4 +29,5 @@ trait ProductreviewRepo {
   def update: UpdateBuilder[ProductreviewFields, ProductreviewRow]
   def update(row: ProductreviewRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductreviewRow)(implicit c: Connection): ProductreviewRow
+  def upsertStreaming(unsaved: Iterator[ProductreviewRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
index da515e31d5..bc24183983 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -157,4 +158,21 @@ class ProductreviewRepoImpl extends ProductreviewRepo {
       .executeInsert(ProductreviewRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductreviewRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productreview_TEMP (like production.productreview) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productreview_TEMP("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate") from stdin""", batchSize, unsaved)(ProductreviewRow.text, c): @nowarn
+    SQL"""insert into production.productreview("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate")
+          select * from productreview_TEMP
+          on conflict ("productreviewid")
+          do update set
+            "productid" = EXCLUDED."productid",
+            "reviewername" = EXCLUDED."reviewername",
+            "reviewdate" = EXCLUDED."reviewdate",
+            "emailaddress" = EXCLUDED."emailaddress",
+            "rating" = EXCLUDED."rating",
+            "comments" = EXCLUDED."comments",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productreview_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
index 1bc884d950..dd973633dd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
@@ -87,4 +87,10 @@ class ProductreviewRepoMock(toRow: Function1[ProductreviewRowUnsaved, Productrev
     map.put(unsaved.productreviewid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductreviewRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productreviewid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
index 14ea904267..b45b71ba32 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
@@ -29,4 +29,5 @@ trait ProductsubcategoryRepo {
   def update: UpdateBuilder[ProductsubcategoryFields, ProductsubcategoryRow]
   def update(row: ProductsubcategoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductsubcategoryRow)(implicit c: Connection): ProductsubcategoryRow
+  def upsertStreaming(unsaved: Iterator[ProductsubcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
index cade4b72d9..72abc76199 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -144,4 +145,18 @@ class ProductsubcategoryRepoImpl extends ProductsubcategoryRepo {
       .executeInsert(ProductsubcategoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductsubcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productsubcategory_TEMP (like production.productsubcategory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productsubcategory_TEMP("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductsubcategoryRow.text, c): @nowarn
+    SQL"""insert into production.productsubcategory("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate")
+          select * from productsubcategory_TEMP
+          on conflict ("productsubcategoryid")
+          do update set
+            "productcategoryid" = EXCLUDED."productcategoryid",
+            "name" = EXCLUDED."name",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productsubcategory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
index 2336212e1b..7374921677 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
@@ -87,4 +87,10 @@ class ProductsubcategoryRepoMock(toRow: Function1[ProductsubcategoryRowUnsaved,
     map.put(unsaved.productsubcategoryid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductsubcategoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.productsubcategoryid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
index 011a077cd4..6236b01fb9 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
@@ -29,4 +29,5 @@ trait ScrapreasonRepo {
   def update: UpdateBuilder[ScrapreasonFields, ScrapreasonRow]
   def update(row: ScrapreasonRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ScrapreasonRow)(implicit c: Connection): ScrapreasonRow
+  def upsertStreaming(unsaved: Iterator[ScrapreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
index e19d32c764..e0806e2674 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -131,4 +132,16 @@ class ScrapreasonRepoImpl extends ScrapreasonRepo {
       .executeInsert(ScrapreasonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ScrapreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table scrapreason_TEMP (like production.scrapreason) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy scrapreason_TEMP("scrapreasonid", "name", "modifieddate") from stdin""", batchSize, unsaved)(ScrapreasonRow.text, c): @nowarn
+    SQL"""insert into production.scrapreason("scrapreasonid", "name", "modifieddate")
+          select * from scrapreason_TEMP
+          on conflict ("scrapreasonid")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table scrapreason_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
index 5d161f69cf..d3b8fdb711 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
@@ -87,4 +87,10 @@ class ScrapreasonRepoMock(toRow: Function1[ScrapreasonRowUnsaved, ScrapreasonRow
     map.put(unsaved.scrapreasonid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ScrapreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.scrapreasonid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
index 0a61c5d64e..4a124cd173 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
@@ -29,4 +29,5 @@ trait TransactionhistoryRepo {
   def update: UpdateBuilder[TransactionhistoryFields, TransactionhistoryRow]
   def update(row: TransactionhistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: TransactionhistoryRow)(implicit c: Connection): TransactionhistoryRow
+  def upsertStreaming(unsaved: Iterator[TransactionhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
index 48f473c4ed..65230d77eb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -162,4 +163,22 @@ class TransactionhistoryRepoImpl extends TransactionhistoryRepo {
       .executeInsert(TransactionhistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[TransactionhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table transactionhistory_TEMP (like production.transactionhistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy transactionhistory_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(TransactionhistoryRow.text, c): @nowarn
+    SQL"""insert into production.transactionhistory("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+          select * from transactionhistory_TEMP
+          on conflict ("transactionid")
+          do update set
+            "productid" = EXCLUDED."productid",
+            "referenceorderid" = EXCLUDED."referenceorderid",
+            "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+            "transactiondate" = EXCLUDED."transactiondate",
+            "transactiontype" = EXCLUDED."transactiontype",
+            "quantity" = EXCLUDED."quantity",
+            "actualcost" = EXCLUDED."actualcost",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table transactionhistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
index d3a7048ab5..af214d3429 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
@@ -87,4 +87,10 @@ class TransactionhistoryRepoMock(toRow: Function1[TransactionhistoryRowUnsaved,
     map.put(unsaved.transactionid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[TransactionhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.transactionid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
index 6e0b145c2b..e6a70fe7c4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
@@ -29,4 +29,5 @@ trait TransactionhistoryarchiveRepo {
   def update: UpdateBuilder[TransactionhistoryarchiveFields, TransactionhistoryarchiveRow]
   def update(row: TransactionhistoryarchiveRow)(implicit c: Connection): Boolean
   def upsert(unsaved: TransactionhistoryarchiveRow)(implicit c: Connection): TransactionhistoryarchiveRow
+  def upsertStreaming(unsaved: Iterator[TransactionhistoryarchiveRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
index d3ebb6a4a5..7f5599a372 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -158,4 +159,22 @@ class TransactionhistoryarchiveRepoImpl extends TransactionhistoryarchiveRepo {
       .executeInsert(TransactionhistoryarchiveRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[TransactionhistoryarchiveRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table transactionhistoryarchive_TEMP (like production.transactionhistoryarchive) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy transactionhistoryarchive_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(TransactionhistoryarchiveRow.text, c): @nowarn
+    SQL"""insert into production.transactionhistoryarchive("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+          select * from transactionhistoryarchive_TEMP
+          on conflict ("transactionid")
+          do update set
+            "productid" = EXCLUDED."productid",
+            "referenceorderid" = EXCLUDED."referenceorderid",
+            "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+            "transactiondate" = EXCLUDED."transactiondate",
+            "transactiontype" = EXCLUDED."transactiontype",
+            "quantity" = EXCLUDED."quantity",
+            "actualcost" = EXCLUDED."actualcost",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table transactionhistoryarchive_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
index 9c972c3b84..df23cf39d6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
@@ -87,4 +87,10 @@ class TransactionhistoryarchiveRepoMock(toRow: Function1[Transactionhistoryarchi
     map.put(unsaved.transactionid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[TransactionhistoryarchiveRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.transactionid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
index fbf624a03d..f0c4eb6acd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
@@ -29,4 +29,5 @@ trait UnitmeasureRepo {
   def update: UpdateBuilder[UnitmeasureFields, UnitmeasureRow]
   def update(row: UnitmeasureRow)(implicit c: Connection): Boolean
   def upsert(unsaved: UnitmeasureRow)(implicit c: Connection): UnitmeasureRow
+  def upsertStreaming(unsaved: Iterator[UnitmeasureRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
index 3afc1c48c6..866ad6f71d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -128,4 +129,16 @@ class UnitmeasureRepoImpl extends UnitmeasureRepo {
       .executeInsert(UnitmeasureRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[UnitmeasureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table unitmeasure_TEMP (like production.unitmeasure) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy unitmeasure_TEMP("unitmeasurecode", "name", "modifieddate") from stdin""", batchSize, unsaved)(UnitmeasureRow.text, c): @nowarn
+    SQL"""insert into production.unitmeasure("unitmeasurecode", "name", "modifieddate")
+          select * from unitmeasure_TEMP
+          on conflict ("unitmeasurecode")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table unitmeasure_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
index 5248989617..85797a1c50 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
@@ -87,4 +87,10 @@ class UnitmeasureRepoMock(toRow: Function1[UnitmeasureRowUnsaved, UnitmeasureRow
     map.put(unsaved.unitmeasurecode, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[UnitmeasureRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.unitmeasurecode -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
index 08cb693e5c..06f43e811a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
@@ -29,4 +29,5 @@ trait WorkorderRepo {
   def update: UpdateBuilder[WorkorderFields, WorkorderRow]
   def update(row: WorkorderRow)(implicit c: Connection): Boolean
   def upsert(unsaved: WorkorderRow)(implicit c: Connection): WorkorderRow
+  def upsertStreaming(unsaved: Iterator[WorkorderRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
index 23741d0ea7..bd4470022c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -158,4 +159,22 @@ class WorkorderRepoImpl extends WorkorderRepo {
       .executeInsert(WorkorderRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[WorkorderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table workorder_TEMP (like production.workorder) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy workorder_TEMP("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate") from stdin""", batchSize, unsaved)(WorkorderRow.text, c): @nowarn
+    SQL"""insert into production.workorder("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate")
+          select * from workorder_TEMP
+          on conflict ("workorderid")
+          do update set
+            "productid" = EXCLUDED."productid",
+            "orderqty" = EXCLUDED."orderqty",
+            "scrappedqty" = EXCLUDED."scrappedqty",
+            "startdate" = EXCLUDED."startdate",
+            "enddate" = EXCLUDED."enddate",
+            "duedate" = EXCLUDED."duedate",
+            "scrapreasonid" = EXCLUDED."scrapreasonid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table workorder_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
index 7e787c8f23..1e507a3864 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
@@ -87,4 +87,10 @@ class WorkorderRepoMock(toRow: Function1[WorkorderRowUnsaved, WorkorderRow],
     map.put(unsaved.workorderid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[WorkorderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.workorderid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
index a7b98aa541..30bffe1c4d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
@@ -29,4 +29,5 @@ trait WorkorderroutingRepo {
   def update: UpdateBuilder[WorkorderroutingFields, WorkorderroutingRow]
   def update(row: WorkorderroutingRow)(implicit c: Connection): Boolean
   def upsert(unsaved: WorkorderroutingRow)(implicit c: Connection): WorkorderroutingRow
+  def upsertStreaming(unsaved: Iterator[WorkorderroutingRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
index 7c3081d795..8d5cce4b94 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -172,4 +173,23 @@ class WorkorderroutingRepoImpl extends WorkorderroutingRepo {
       .executeInsert(WorkorderroutingRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[WorkorderroutingRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table workorderrouting_TEMP (like production.workorderrouting) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy workorderrouting_TEMP("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(WorkorderroutingRow.text, c): @nowarn
+    SQL"""insert into production.workorderrouting("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate")
+          select * from workorderrouting_TEMP
+          on conflict ("workorderid", "productid", "operationsequence")
+          do update set
+            "locationid" = EXCLUDED."locationid",
+            "scheduledstartdate" = EXCLUDED."scheduledstartdate",
+            "scheduledenddate" = EXCLUDED."scheduledenddate",
+            "actualstartdate" = EXCLUDED."actualstartdate",
+            "actualenddate" = EXCLUDED."actualenddate",
+            "actualresourcehrs" = EXCLUDED."actualresourcehrs",
+            "plannedcost" = EXCLUDED."plannedcost",
+            "actualcost" = EXCLUDED."actualcost",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table workorderrouting_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
index d302a12ed3..db22b3f326 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
@@ -87,4 +87,10 @@ class WorkorderroutingRepoMock(toRow: Function1[WorkorderroutingRowUnsaved, Work
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[WorkorderroutingRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
index 609b5fb3e8..fee64a7b78 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
@@ -26,4 +26,5 @@ trait FlaffRepo {
   def update: UpdateBuilder[FlaffFields, FlaffRow]
   def update(row: FlaffRow)(implicit c: Connection): Boolean
   def upsert(unsaved: FlaffRow)(implicit c: Connection): FlaffRow
+  def upsertStreaming(unsaved: Iterator[FlaffRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
index 71e7cab75c..55fea75d21 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
@@ -11,6 +11,7 @@ import anorm.ParameterValue
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -103,4 +104,15 @@ class FlaffRepoImpl extends FlaffRepo {
       .executeInsert(FlaffRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[FlaffRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table flaff_TEMP (like public.flaff) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy flaff_TEMP("code", "another_code", "some_number", "specifier", "parentspecifier") from stdin""", batchSize, unsaved)(FlaffRow.text, c): @nowarn
+    SQL"""insert into public.flaff("code", "another_code", "some_number", "specifier", "parentspecifier")
+          select * from flaff_TEMP
+          on conflict ("code", "another_code", "some_number", "specifier")
+          do update set
+            "parentspecifier" = EXCLUDED."parentspecifier"
+          ;
+          drop table flaff_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
index 59eae40c99..7351c70a75 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
@@ -75,4 +75,10 @@ class FlaffRepoMock(map: scala.collection.mutable.Map[FlaffId, FlaffRow] = scala
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[FlaffRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
index f684ba2886..312444dd8c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
@@ -29,4 +29,5 @@ trait IdentityTestRepo {
   def update: UpdateBuilder[IdentityTestFields, IdentityTestRow]
   def update(row: IdentityTestRow)(implicit c: Connection): Boolean
   def upsert(unsaved: IdentityTestRow)(implicit c: Connection): IdentityTestRow
+  def upsertStreaming(unsaved: Iterator[IdentityTestRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
index 91b4026e5f..722eb848d8 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
@@ -16,6 +16,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -126,4 +127,16 @@ class IdentityTestRepoImpl extends IdentityTestRepo {
       .executeInsert(IdentityTestRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[IdentityTestRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table identity-test_TEMP (like public.identity-test) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy identity-test_TEMP("always_generated", "default_generated", "name") from stdin""", batchSize, unsaved)(IdentityTestRow.text, c): @nowarn
+    SQL"""insert into public.identity-test("always_generated", "default_generated", "name")
+          select * from identity-test_TEMP
+          on conflict ("name")
+          do update set
+            "always_generated" = EXCLUDED."always_generated",
+            "default_generated" = EXCLUDED."default_generated"
+          ;
+          drop table identity-test_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
index b52d7335a4..199443fa63 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
@@ -87,4 +87,10 @@ class IdentityTestRepoMock(toRow: Function1[IdentityTestRowUnsaved, IdentityTest
     map.put(unsaved.name, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[IdentityTestRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.name -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
index b91d7dbd7c..1ac37906f0 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
@@ -31,4 +31,5 @@ trait UsersRepo {
   def update: UpdateBuilder[UsersFields, UsersRow]
   def update(row: UsersRow)(implicit c: Connection): Boolean
   def upsert(unsaved: UsersRow)(implicit c: Connection): UsersRow
+  def upsertStreaming(unsaved: Iterator[UsersRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
index 1734741fdb..14068f60f2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -153,4 +154,20 @@ class UsersRepoImpl extends UsersRepo {
       .executeInsert(UsersRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[UsersRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table users_TEMP (like public.users) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy users_TEMP("user_id", "name", "last_name", "email", "password", "created_at", "verified_on") from stdin""", batchSize, unsaved)(UsersRow.text, c): @nowarn
+    SQL"""insert into public.users("user_id", "name", "last_name", "email", "password", "created_at", "verified_on")
+          select * from users_TEMP
+          on conflict ("user_id")
+          do update set
+            "name" = EXCLUDED."name",
+            "last_name" = EXCLUDED."last_name",
+            "email" = EXCLUDED."email",
+            "password" = EXCLUDED."password",
+            "created_at" = EXCLUDED."created_at",
+            "verified_on" = EXCLUDED."verified_on"
+          ;
+          drop table users_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
index 5c36bc2de8..43ea7a5fdb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
@@ -91,4 +91,10 @@ class UsersRepoMock(toRow: Function1[UsersRowUnsaved, UsersRow],
     map.put(unsaved.userId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[UsersRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.userId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
index 6be9365233..ff991cb1f3 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
@@ -29,4 +29,5 @@ trait ProductvendorRepo {
   def update: UpdateBuilder[ProductvendorFields, ProductvendorRow]
   def update(row: ProductvendorRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ProductvendorRow)(implicit c: Connection): ProductvendorRow
+  def upsertStreaming(unsaved: Iterator[ProductvendorRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
index 0be92ff9e4..739b237046 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -168,4 +169,23 @@ class ProductvendorRepoImpl extends ProductvendorRepo {
       .executeInsert(ProductvendorRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ProductvendorRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table productvendor_TEMP (like purchasing.productvendor) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy productvendor_TEMP("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate") from stdin""", batchSize, unsaved)(ProductvendorRow.text, c): @nowarn
+    SQL"""insert into purchasing.productvendor("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate")
+          select * from productvendor_TEMP
+          on conflict ("productid", "businessentityid")
+          do update set
+            "averageleadtime" = EXCLUDED."averageleadtime",
+            "standardprice" = EXCLUDED."standardprice",
+            "lastreceiptcost" = EXCLUDED."lastreceiptcost",
+            "lastreceiptdate" = EXCLUDED."lastreceiptdate",
+            "minorderqty" = EXCLUDED."minorderqty",
+            "maxorderqty" = EXCLUDED."maxorderqty",
+            "onorderqty" = EXCLUDED."onorderqty",
+            "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table productvendor_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
index c478d4ffd0..be9e0398bd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
@@ -87,4 +87,10 @@ class ProductvendorRepoMock(toRow: Function1[ProductvendorRowUnsaved, Productven
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ProductvendorRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
index 6eff633cc3..92c03fbaa6 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
@@ -29,4 +29,5 @@ trait PurchaseorderheaderRepo {
   def update: UpdateBuilder[PurchaseorderheaderFields, PurchaseorderheaderRow]
   def update(row: PurchaseorderheaderRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PurchaseorderheaderRow)(implicit c: Connection): PurchaseorderheaderRow
+  def upsertStreaming(unsaved: Iterator[PurchaseorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
index 9b71be81cb..85fb05f5d1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -188,4 +189,25 @@ class PurchaseorderheaderRepoImpl extends PurchaseorderheaderRepo {
       .executeInsert(PurchaseorderheaderRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PurchaseorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table purchaseorderheader_TEMP (like purchasing.purchaseorderheader) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy purchaseorderheader_TEMP("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate") from stdin""", batchSize, unsaved)(PurchaseorderheaderRow.text, c): @nowarn
+    SQL"""insert into purchasing.purchaseorderheader("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate")
+          select * from purchaseorderheader_TEMP
+          on conflict ("purchaseorderid")
+          do update set
+            "revisionnumber" = EXCLUDED."revisionnumber",
+            "status" = EXCLUDED."status",
+            "employeeid" = EXCLUDED."employeeid",
+            "vendorid" = EXCLUDED."vendorid",
+            "shipmethodid" = EXCLUDED."shipmethodid",
+            "orderdate" = EXCLUDED."orderdate",
+            "shipdate" = EXCLUDED."shipdate",
+            "subtotal" = EXCLUDED."subtotal",
+            "taxamt" = EXCLUDED."taxamt",
+            "freight" = EXCLUDED."freight",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table purchaseorderheader_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
index b87ed685b3..6c2a16ac2b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
@@ -87,4 +87,10 @@ class PurchaseorderheaderRepoMock(toRow: Function1[PurchaseorderheaderRowUnsaved
     map.put(unsaved.purchaseorderid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PurchaseorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.purchaseorderid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
index 2bcc28e36d..bc246029e5 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
@@ -29,4 +29,5 @@ trait ShipmethodRepo {
   def update: UpdateBuilder[ShipmethodFields, ShipmethodRow]
   def update(row: ShipmethodRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ShipmethodRow)(implicit c: Connection): ShipmethodRow
+  def upsertStreaming(unsaved: Iterator[ShipmethodRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
index 6b41ceec70..1e17e429bf 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -154,4 +155,19 @@ class ShipmethodRepoImpl extends ShipmethodRepo {
       .executeInsert(ShipmethodRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ShipmethodRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table shipmethod_TEMP (like purchasing.shipmethod) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy shipmethod_TEMP("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ShipmethodRow.text, c): @nowarn
+    SQL"""insert into purchasing.shipmethod("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate")
+          select * from shipmethod_TEMP
+          on conflict ("shipmethodid")
+          do update set
+            "name" = EXCLUDED."name",
+            "shipbase" = EXCLUDED."shipbase",
+            "shiprate" = EXCLUDED."shiprate",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table shipmethod_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
index e20971743f..d7a4b318eb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
@@ -87,4 +87,10 @@ class ShipmethodRepoMock(toRow: Function1[ShipmethodRowUnsaved, ShipmethodRow],
     map.put(unsaved.shipmethodid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ShipmethodRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.shipmethodid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
index 1c6e1739c5..de1639d7e5 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
@@ -30,4 +30,5 @@ trait VendorRepo {
   def update: UpdateBuilder[VendorFields, VendorRow]
   def update(row: VendorRow)(implicit c: Connection): Boolean
   def upsert(unsaved: VendorRow)(implicit c: Connection): VendorRow
+  def upsertStreaming(unsaved: Iterator[VendorRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
index 7808f01971..18f8ec773d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
@@ -23,6 +23,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -160,4 +161,21 @@ class VendorRepoImpl extends VendorRepo {
       .executeInsert(VendorRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[VendorRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table vendor_TEMP (like purchasing.vendor) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy vendor_TEMP("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate") from stdin""", batchSize, unsaved)(VendorRow.text, c): @nowarn
+    SQL"""insert into purchasing.vendor("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate")
+          select * from vendor_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "accountnumber" = EXCLUDED."accountnumber",
+            "name" = EXCLUDED."name",
+            "creditrating" = EXCLUDED."creditrating",
+            "preferredvendorstatus" = EXCLUDED."preferredvendorstatus",
+            "activeflag" = EXCLUDED."activeflag",
+            "purchasingwebserviceurl" = EXCLUDED."purchasingwebserviceurl",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table vendor_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
index 75443f4d89..12ac1f214c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
@@ -88,4 +88,10 @@ class VendorRepoMock(toRow: Function1[VendorRowUnsaved, VendorRow],
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[VendorRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
index b688c30554..cf3a48e15c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
@@ -29,4 +29,5 @@ trait CountryregioncurrencyRepo {
   def update: UpdateBuilder[CountryregioncurrencyFields, CountryregioncurrencyRow]
   def update(row: CountryregioncurrencyRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CountryregioncurrencyRow)(implicit c: Connection): CountryregioncurrencyRow
+  def upsertStreaming(unsaved: Iterator[CountryregioncurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
index 5d3284f755..06c2b80301 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -133,4 +134,15 @@ class CountryregioncurrencyRepoImpl extends CountryregioncurrencyRepo {
       .executeInsert(CountryregioncurrencyRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CountryregioncurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table countryregioncurrency_TEMP (like sales.countryregioncurrency) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy countryregioncurrency_TEMP("countryregioncode", "currencycode", "modifieddate") from stdin""", batchSize, unsaved)(CountryregioncurrencyRow.text, c): @nowarn
+    SQL"""insert into sales.countryregioncurrency("countryregioncode", "currencycode", "modifieddate")
+          select * from countryregioncurrency_TEMP
+          on conflict ("countryregioncode", "currencycode")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table countryregioncurrency_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
index 0c568d54ee..0fd03c43a7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
@@ -87,4 +87,10 @@ class CountryregioncurrencyRepoMock(toRow: Function1[CountryregioncurrencyRowUns
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CountryregioncurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
index 51ba3e86f1..9928d6ef34 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
@@ -31,4 +31,5 @@ trait CreditcardRepo {
   def update: UpdateBuilder[CreditcardFields, CreditcardRow]
   def update(row: CreditcardRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CreditcardRow)(implicit c: Connection): CreditcardRow
+  def upsertStreaming(unsaved: Iterator[CreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
index 123da8791a..894bfa360d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -145,4 +146,19 @@ class CreditcardRepoImpl extends CreditcardRepo {
       .executeInsert(CreditcardRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table creditcard_TEMP (like sales.creditcard) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy creditcard_TEMP("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate") from stdin""", batchSize, unsaved)(CreditcardRow.text, c): @nowarn
+    SQL"""insert into sales.creditcard("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate")
+          select * from creditcard_TEMP
+          on conflict ("creditcardid")
+          do update set
+            "cardtype" = EXCLUDED."cardtype",
+            "cardnumber" = EXCLUDED."cardnumber",
+            "expmonth" = EXCLUDED."expmonth",
+            "expyear" = EXCLUDED."expyear",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table creditcard_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
index 5ecef2b209..587c9707eb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
@@ -89,4 +89,10 @@ class CreditcardRepoMock(toRow: Function1[CreditcardRowUnsaved, CreditcardRow],
     map.put(unsaved.creditcardid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.creditcardid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
index 5fe703c795..5690c8326c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
@@ -29,4 +29,5 @@ trait CurrencyRepo {
   def update: UpdateBuilder[CurrencyFields, CurrencyRow]
   def update(row: CurrencyRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CurrencyRow)(implicit c: Connection): CurrencyRow
+  def upsertStreaming(unsaved: Iterator[CurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
index 7ba724beec..b21609b8cd 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -128,4 +129,16 @@ class CurrencyRepoImpl extends CurrencyRepo {
       .executeInsert(CurrencyRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table currency_TEMP (like sales.currency) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy currency_TEMP("currencycode", "name", "modifieddate") from stdin""", batchSize, unsaved)(CurrencyRow.text, c): @nowarn
+    SQL"""insert into sales.currency("currencycode", "name", "modifieddate")
+          select * from currency_TEMP
+          on conflict ("currencycode")
+          do update set
+            "name" = EXCLUDED."name",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table currency_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
index 5bf8164da9..57baee9d64 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
@@ -87,4 +87,10 @@ class CurrencyRepoMock(toRow: Function1[CurrencyRowUnsaved, CurrencyRow],
     map.put(unsaved.currencycode, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CurrencyRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.currencycode -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
index 51c409f6fa..763c8fa50c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
@@ -29,4 +29,5 @@ trait CurrencyrateRepo {
   def update: UpdateBuilder[CurrencyrateFields, CurrencyrateRow]
   def update(row: CurrencyrateRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CurrencyrateRow)(implicit c: Connection): CurrencyrateRow
+  def upsertStreaming(unsaved: Iterator[CurrencyrateRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
index 71aab263ff..e6d914d2d4 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -148,4 +149,20 @@ class CurrencyrateRepoImpl extends CurrencyrateRepo {
       .executeInsert(CurrencyrateRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CurrencyrateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table currencyrate_TEMP (like sales.currencyrate) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy currencyrate_TEMP("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate") from stdin""", batchSize, unsaved)(CurrencyrateRow.text, c): @nowarn
+    SQL"""insert into sales.currencyrate("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate")
+          select * from currencyrate_TEMP
+          on conflict ("currencyrateid")
+          do update set
+            "currencyratedate" = EXCLUDED."currencyratedate",
+            "fromcurrencycode" = EXCLUDED."fromcurrencycode",
+            "tocurrencycode" = EXCLUDED."tocurrencycode",
+            "averagerate" = EXCLUDED."averagerate",
+            "endofdayrate" = EXCLUDED."endofdayrate",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table currencyrate_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
index 4f17e13bd7..c589dee799 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
@@ -87,4 +87,10 @@ class CurrencyrateRepoMock(toRow: Function1[CurrencyrateRowUnsaved, Currencyrate
     map.put(unsaved.currencyrateid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CurrencyrateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.currencyrateid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
index 1c04b7e16d..70f384d06e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
@@ -29,4 +29,5 @@ trait CustomerRepo {
   def update: UpdateBuilder[CustomerFields, CustomerRow]
   def update(row: CustomerRow)(implicit c: Connection): Boolean
   def upsert(unsaved: CustomerRow)(implicit c: Connection): CustomerRow
+  def upsertStreaming(unsaved: Iterator[CustomerRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
index 06e88c2a20..e3f0225f9a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -149,4 +150,19 @@ class CustomerRepoImpl extends CustomerRepo {
       .executeInsert(CustomerRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[CustomerRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table customer_TEMP (like sales.customer) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy customer_TEMP("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(CustomerRow.text, c): @nowarn
+    SQL"""insert into sales.customer("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate")
+          select * from customer_TEMP
+          on conflict ("customerid")
+          do update set
+            "personid" = EXCLUDED."personid",
+            "storeid" = EXCLUDED."storeid",
+            "territoryid" = EXCLUDED."territoryid",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table customer_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
index 909601c34e..345291d12b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
@@ -87,4 +87,10 @@ class CustomerRepoMock(toRow: Function1[CustomerRowUnsaved, CustomerRow],
     map.put(unsaved.customerid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[CustomerRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.customerid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
index 2748f91ad8..a9bc0e5892 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
@@ -31,4 +31,5 @@ trait PersoncreditcardRepo {
   def update: UpdateBuilder[PersoncreditcardFields, PersoncreditcardRow]
   def update(row: PersoncreditcardRow)(implicit c: Connection): Boolean
   def upsert(unsaved: PersoncreditcardRow)(implicit c: Connection): PersoncreditcardRow
+  def upsertStreaming(unsaved: Iterator[PersoncreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
index 4e6597cb39..68f7d2d8ae 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -134,4 +135,15 @@ class PersoncreditcardRepoImpl extends PersoncreditcardRepo {
       .executeInsert(PersoncreditcardRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[PersoncreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table personcreditcard_TEMP (like sales.personcreditcard) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy personcreditcard_TEMP("businessentityid", "creditcardid", "modifieddate") from stdin""", batchSize, unsaved)(PersoncreditcardRow.text, c): @nowarn
+    SQL"""insert into sales.personcreditcard("businessentityid", "creditcardid", "modifieddate")
+          select * from personcreditcard_TEMP
+          on conflict ("businessentityid", "creditcardid")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table personcreditcard_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
index 9f2dba0e44..cfc41227c1 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
@@ -89,4 +89,10 @@ class PersoncreditcardRepoMock(toRow: Function1[PersoncreditcardRowUnsaved, Pers
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[PersoncreditcardRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
index a6d48fa801..a1d82a57e3 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
@@ -29,4 +29,5 @@ trait SalesorderdetailRepo {
   def update: UpdateBuilder[SalesorderdetailFields, SalesorderdetailRow]
   def update(row: SalesorderdetailRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesorderdetailRow)(implicit c: Connection): SalesorderdetailRow
+  def upsertStreaming(unsaved: Iterator[SalesorderdetailRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
index 6f2d7ee79b..1fa63550c8 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
@@ -23,6 +23,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -175,4 +176,22 @@ class SalesorderdetailRepoImpl extends SalesorderdetailRepo {
       .executeInsert(SalesorderdetailRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderdetailRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesorderdetail_TEMP (like sales.salesorderdetail) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesorderdetail_TEMP("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderdetailRow.text, c): @nowarn
+    SQL"""insert into sales.salesorderdetail("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate")
+          select * from salesorderdetail_TEMP
+          on conflict ("salesorderid", "salesorderdetailid")
+          do update set
+            "carriertrackingnumber" = EXCLUDED."carriertrackingnumber",
+            "orderqty" = EXCLUDED."orderqty",
+            "productid" = EXCLUDED."productid",
+            "specialofferid" = EXCLUDED."specialofferid",
+            "unitprice" = EXCLUDED."unitprice",
+            "unitpricediscount" = EXCLUDED."unitpricediscount",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesorderdetail_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
index b2df97004c..170f0579b7 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
@@ -87,4 +87,10 @@ class SalesorderdetailRepoMock(toRow: Function1[SalesorderdetailRowUnsaved, Sale
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderdetailRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
index f9ee388f14..102076513b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
@@ -29,4 +29,5 @@ trait SalesorderheaderRepo {
   def update: UpdateBuilder[SalesorderheaderFields, SalesorderheaderRow]
   def update(row: SalesorderheaderRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesorderheaderRow)(implicit c: Connection): SalesorderheaderRow
+  def upsertStreaming(unsaved: Iterator[SalesorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
index 7d63f09f7c..127245a5e2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
@@ -30,6 +30,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -256,4 +257,38 @@ class SalesorderheaderRepoImpl extends SalesorderheaderRepo {
       .executeInsert(SalesorderheaderRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesorderheader_TEMP (like sales.salesorderheader) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesorderheader_TEMP("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderheaderRow.text, c): @nowarn
+    SQL"""insert into sales.salesorderheader("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate")
+          select * from salesorderheader_TEMP
+          on conflict ("salesorderid")
+          do update set
+            "revisionnumber" = EXCLUDED."revisionnumber",
+            "orderdate" = EXCLUDED."orderdate",
+            "duedate" = EXCLUDED."duedate",
+            "shipdate" = EXCLUDED."shipdate",
+            "status" = EXCLUDED."status",
+            "onlineorderflag" = EXCLUDED."onlineorderflag",
+            "purchaseordernumber" = EXCLUDED."purchaseordernumber",
+            "accountnumber" = EXCLUDED."accountnumber",
+            "customerid" = EXCLUDED."customerid",
+            "salespersonid" = EXCLUDED."salespersonid",
+            "territoryid" = EXCLUDED."territoryid",
+            "billtoaddressid" = EXCLUDED."billtoaddressid",
+            "shiptoaddressid" = EXCLUDED."shiptoaddressid",
+            "shipmethodid" = EXCLUDED."shipmethodid",
+            "creditcardid" = EXCLUDED."creditcardid",
+            "creditcardapprovalcode" = EXCLUDED."creditcardapprovalcode",
+            "currencyrateid" = EXCLUDED."currencyrateid",
+            "subtotal" = EXCLUDED."subtotal",
+            "taxamt" = EXCLUDED."taxamt",
+            "freight" = EXCLUDED."freight",
+            "totaldue" = EXCLUDED."totaldue",
+            "comment" = EXCLUDED."comment",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesorderheader_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
index e72ac1386e..91d6eee255 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
@@ -87,4 +87,10 @@ class SalesorderheaderRepoMock(toRow: Function1[SalesorderheaderRowUnsaved, Sale
     map.put(unsaved.salesorderid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderheaderRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.salesorderid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
index a180bb4b18..3f3822e95e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
@@ -29,4 +29,5 @@ trait SalesorderheadersalesreasonRepo {
   def update: UpdateBuilder[SalesorderheadersalesreasonFields, SalesorderheadersalesreasonRow]
   def update(row: SalesorderheadersalesreasonRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesorderheadersalesreasonRow)(implicit c: Connection): SalesorderheadersalesreasonRow
+  def upsertStreaming(unsaved: Iterator[SalesorderheadersalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
index 31804a9eb4..d305053f3c 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -133,4 +134,15 @@ class SalesorderheadersalesreasonRepoImpl extends SalesorderheadersalesreasonRep
       .executeInsert(SalesorderheadersalesreasonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderheadersalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesorderheadersalesreason_TEMP (like sales.salesorderheadersalesreason) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesorderheadersalesreason_TEMP("salesorderid", "salesreasonid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderheadersalesreasonRow.text, c): @nowarn
+    SQL"""insert into sales.salesorderheadersalesreason("salesorderid", "salesreasonid", "modifieddate")
+          select * from salesorderheadersalesreason_TEMP
+          on conflict ("salesorderid", "salesreasonid")
+          do update set
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesorderheadersalesreason_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
index 986b889e5a..0f506f701e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
@@ -87,4 +87,10 @@ class SalesorderheadersalesreasonRepoMock(toRow: Function1[Salesorderheadersales
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesorderheadersalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
index 4b97eb12be..cf6d5ff520 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
@@ -30,4 +30,5 @@ trait SalespersonRepo {
   def update: UpdateBuilder[SalespersonFields, SalespersonRow]
   def update(row: SalespersonRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalespersonRow)(implicit c: Connection): SalespersonRow
+  def upsertStreaming(unsaved: Iterator[SalespersonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
index 449aba6f3e..7502f86571 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -171,4 +172,22 @@ class SalespersonRepoImpl extends SalespersonRepo {
       .executeInsert(SalespersonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalespersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesperson_TEMP (like sales.salesperson) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesperson_TEMP("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalespersonRow.text, c): @nowarn
+    SQL"""insert into sales.salesperson("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate")
+          select * from salesperson_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "territoryid" = EXCLUDED."territoryid",
+            "salesquota" = EXCLUDED."salesquota",
+            "bonus" = EXCLUDED."bonus",
+            "commissionpct" = EXCLUDED."commissionpct",
+            "salesytd" = EXCLUDED."salesytd",
+            "saleslastyear" = EXCLUDED."saleslastyear",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesperson_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
index 0a057283e8..f5e24195c9 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
@@ -88,4 +88,10 @@ class SalespersonRepoMock(toRow: Function1[SalespersonRowUnsaved, SalespersonRow
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalespersonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
index 07ec8d4a06..088fa58bd2 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
@@ -29,4 +29,5 @@ trait SalespersonquotahistoryRepo {
   def update: UpdateBuilder[SalespersonquotahistoryFields, SalespersonquotahistoryRow]
   def update(row: SalespersonquotahistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalespersonquotahistoryRow)(implicit c: Connection): SalespersonquotahistoryRow
+  def upsertStreaming(unsaved: Iterator[SalespersonquotahistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
index 722bcc9fe1..de50393fbf 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -145,4 +146,17 @@ class SalespersonquotahistoryRepoImpl extends SalespersonquotahistoryRepo {
       .executeInsert(SalespersonquotahistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalespersonquotahistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salespersonquotahistory_TEMP (like sales.salespersonquotahistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salespersonquotahistory_TEMP("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalespersonquotahistoryRow.text, c): @nowarn
+    SQL"""insert into sales.salespersonquotahistory("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate")
+          select * from salespersonquotahistory_TEMP
+          on conflict ("businessentityid", "quotadate")
+          do update set
+            "salesquota" = EXCLUDED."salesquota",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salespersonquotahistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
index a16a8e84b9..56f7759727 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
@@ -87,4 +87,10 @@ class SalespersonquotahistoryRepoMock(toRow: Function1[SalespersonquotahistoryRo
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalespersonquotahistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
index 16b7c307ba..e942ec6a3d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
@@ -29,4 +29,5 @@ trait SalesreasonRepo {
   def update: UpdateBuilder[SalesreasonFields, SalesreasonRow]
   def update(row: SalesreasonRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesreasonRow)(implicit c: Connection): SalesreasonRow
+  def upsertStreaming(unsaved: Iterator[SalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
index 5cae0a888d..6e297fe517 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
@@ -17,6 +17,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -135,4 +136,17 @@ class SalesreasonRepoImpl extends SalesreasonRepo {
       .executeInsert(SalesreasonRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesreason_TEMP (like sales.salesreason) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesreason_TEMP("salesreasonid", "name", "reasontype", "modifieddate") from stdin""", batchSize, unsaved)(SalesreasonRow.text, c): @nowarn
+    SQL"""insert into sales.salesreason("salesreasonid", "name", "reasontype", "modifieddate")
+          select * from salesreason_TEMP
+          on conflict ("salesreasonid")
+          do update set
+            "name" = EXCLUDED."name",
+            "reasontype" = EXCLUDED."reasontype",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesreason_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
index a9926ec349..c22f8718bb 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
@@ -87,4 +87,10 @@ class SalesreasonRepoMock(toRow: Function1[SalesreasonRowUnsaved, SalesreasonRow
     map.put(unsaved.salesreasonid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesreasonRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.salesreasonid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
index cd72e6ef17..64cd5e7c9d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
@@ -29,4 +29,5 @@ trait SalestaxrateRepo {
   def update: UpdateBuilder[SalestaxrateFields, SalestaxrateRow]
   def update(row: SalestaxrateRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalestaxrateRow)(implicit c: Connection): SalestaxrateRow
+  def upsertStreaming(unsaved: Iterator[SalestaxrateRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
index b965bdfd24..1cc6a0c6cc 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -157,4 +158,20 @@ class SalestaxrateRepoImpl extends SalestaxrateRepo {
       .executeInsert(SalestaxrateRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalestaxrateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salestaxrate_TEMP (like sales.salestaxrate) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salestaxrate_TEMP("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalestaxrateRow.text, c): @nowarn
+    SQL"""insert into sales.salestaxrate("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate")
+          select * from salestaxrate_TEMP
+          on conflict ("salestaxrateid")
+          do update set
+            "stateprovinceid" = EXCLUDED."stateprovinceid",
+            "taxtype" = EXCLUDED."taxtype",
+            "taxrate" = EXCLUDED."taxrate",
+            "name" = EXCLUDED."name",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salestaxrate_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
index 48ef8c5c19..85c2331228 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
@@ -87,4 +87,10 @@ class SalestaxrateRepoMock(toRow: Function1[SalestaxrateRowUnsaved, Salestaxrate
     map.put(unsaved.salestaxrateid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalestaxrateRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.salestaxrateid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
index eac709b2fd..e0220032af 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
@@ -29,4 +29,5 @@ trait SalesterritoryRepo {
   def update: UpdateBuilder[SalesterritoryFields, SalesterritoryRow]
   def update(row: SalesterritoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesterritoryRow)(implicit c: Connection): SalesterritoryRow
+  def upsertStreaming(unsaved: Iterator[SalesterritoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
index 5174fa28bb..572698098b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -177,4 +178,23 @@ class SalesterritoryRepoImpl extends SalesterritoryRepo {
       .executeInsert(SalesterritoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesterritoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesterritory_TEMP (like sales.salesterritory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesterritory_TEMP("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesterritoryRow.text, c): @nowarn
+    SQL"""insert into sales.salesterritory("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate")
+          select * from salesterritory_TEMP
+          on conflict ("territoryid")
+          do update set
+            "name" = EXCLUDED."name",
+            "countryregioncode" = EXCLUDED."countryregioncode",
+            "group" = EXCLUDED."group",
+            "salesytd" = EXCLUDED."salesytd",
+            "saleslastyear" = EXCLUDED."saleslastyear",
+            "costytd" = EXCLUDED."costytd",
+            "costlastyear" = EXCLUDED."costlastyear",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesterritory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
index 214dff433a..082ff35202 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
@@ -87,4 +87,10 @@ class SalesterritoryRepoMock(toRow: Function1[SalesterritoryRowUnsaved, Salester
     map.put(unsaved.territoryid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesterritoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.territoryid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
index e1b55d5696..338dacea79 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
@@ -29,4 +29,5 @@ trait SalesterritoryhistoryRepo {
   def update: UpdateBuilder[SalesterritoryhistoryFields, SalesterritoryhistoryRow]
   def update(row: SalesterritoryhistoryRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SalesterritoryhistoryRow)(implicit c: Connection): SalesterritoryhistoryRow
+  def upsertStreaming(unsaved: Iterator[SalesterritoryhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
index 5d8edda1cf..8c4207e98b 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
@@ -20,6 +20,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -150,4 +151,17 @@ class SalesterritoryhistoryRepoImpl extends SalesterritoryhistoryRepo {
       .executeInsert(SalesterritoryhistoryRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SalesterritoryhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table salesterritoryhistory_TEMP (like sales.salesterritoryhistory) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy salesterritoryhistory_TEMP("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesterritoryhistoryRow.text, c): @nowarn
+    SQL"""insert into sales.salesterritoryhistory("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate")
+          select * from salesterritoryhistory_TEMP
+          on conflict ("businessentityid", "startdate", "territoryid")
+          do update set
+            "enddate" = EXCLUDED."enddate",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table salesterritoryhistory_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
index 4d90d0ac31..fa34495388 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
@@ -87,4 +87,10 @@ class SalesterritoryhistoryRepoMock(toRow: Function1[SalesterritoryhistoryRowUns
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SalesterritoryhistoryRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
index fd54f6963b..b5f1bfcf10 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
@@ -29,4 +29,5 @@ trait ShoppingcartitemRepo {
   def update: UpdateBuilder[ShoppingcartitemFields, ShoppingcartitemRow]
   def update(row: ShoppingcartitemRow)(implicit c: Connection): Boolean
   def upsert(unsaved: ShoppingcartitemRow)(implicit c: Connection): ShoppingcartitemRow
+  def upsertStreaming(unsaved: Iterator[ShoppingcartitemRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
index 43897887f5..64f4770065 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
@@ -18,6 +18,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -150,4 +151,19 @@ class ShoppingcartitemRepoImpl extends ShoppingcartitemRepo {
       .executeInsert(ShoppingcartitemRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[ShoppingcartitemRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table shoppingcartitem_TEMP (like sales.shoppingcartitem) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy shoppingcartitem_TEMP("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate") from stdin""", batchSize, unsaved)(ShoppingcartitemRow.text, c): @nowarn
+    SQL"""insert into sales.shoppingcartitem("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate")
+          select * from shoppingcartitem_TEMP
+          on conflict ("shoppingcartitemid")
+          do update set
+            "shoppingcartid" = EXCLUDED."shoppingcartid",
+            "quantity" = EXCLUDED."quantity",
+            "productid" = EXCLUDED."productid",
+            "datecreated" = EXCLUDED."datecreated",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table shoppingcartitem_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
index 9c5120481e..9791a09879 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
@@ -87,4 +87,10 @@ class ShoppingcartitemRepoMock(toRow: Function1[ShoppingcartitemRowUnsaved, Shop
     map.put(unsaved.shoppingcartitemid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[ShoppingcartitemRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.shoppingcartitemid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
index f3af8fbdca..91a7473034 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
@@ -29,4 +29,5 @@ trait SpecialofferRepo {
   def update: UpdateBuilder[SpecialofferFields, SpecialofferRow]
   def update(row: SpecialofferRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SpecialofferRow)(implicit c: Connection): SpecialofferRow
+  def upsertStreaming(unsaved: Iterator[SpecialofferRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
index 08a94e9b46..6b6190f44e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -174,4 +175,24 @@ class SpecialofferRepoImpl extends SpecialofferRepo {
       .executeInsert(SpecialofferRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SpecialofferRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table specialoffer_TEMP (like sales.specialoffer) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy specialoffer_TEMP("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SpecialofferRow.text, c): @nowarn
+    SQL"""insert into sales.specialoffer("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate")
+          select * from specialoffer_TEMP
+          on conflict ("specialofferid")
+          do update set
+            "description" = EXCLUDED."description",
+            "discountpct" = EXCLUDED."discountpct",
+            "type" = EXCLUDED."type",
+            "category" = EXCLUDED."category",
+            "startdate" = EXCLUDED."startdate",
+            "enddate" = EXCLUDED."enddate",
+            "minqty" = EXCLUDED."minqty",
+            "maxqty" = EXCLUDED."maxqty",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table specialoffer_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
index 7b2d8749c0..1e7ef7659d 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
@@ -87,4 +87,10 @@ class SpecialofferRepoMock(toRow: Function1[SpecialofferRowUnsaved, Specialoffer
     map.put(unsaved.specialofferid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SpecialofferRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.specialofferid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
index 3eb44c9bf3..9d3323479e 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
@@ -29,4 +29,5 @@ trait SpecialofferproductRepo {
   def update: UpdateBuilder[SpecialofferproductFields, SpecialofferproductRow]
   def update(row: SpecialofferproductRow)(implicit c: Connection): Boolean
   def upsert(unsaved: SpecialofferproductRow)(implicit c: Connection): SpecialofferproductRow
+  def upsertStreaming(unsaved: Iterator[SpecialofferproductRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
index 79b327f682..e07997e9b5 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
@@ -19,6 +19,7 @@ import anorm.SQL
 import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -141,4 +142,16 @@ class SpecialofferproductRepoImpl extends SpecialofferproductRepo {
       .executeInsert(SpecialofferproductRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[SpecialofferproductRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table specialofferproduct_TEMP (like sales.specialofferproduct) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy specialofferproduct_TEMP("specialofferid", "productid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SpecialofferproductRow.text, c): @nowarn
+    SQL"""insert into sales.specialofferproduct("specialofferid", "productid", "rowguid", "modifieddate")
+          select * from specialofferproduct_TEMP
+          on conflict ("specialofferid", "productid")
+          do update set
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table specialofferproduct_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
index 3b4b30e624..a91994ca6a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
@@ -87,4 +87,10 @@ class SpecialofferproductRepoMock(toRow: Function1[SpecialofferproductRowUnsaved
     map.put(unsaved.compositeId, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[SpecialofferproductRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.compositeId -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
index b8432187b9..a798f11e8a 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
@@ -30,4 +30,5 @@ trait StoreRepo {
   def update: UpdateBuilder[StoreFields, StoreRow]
   def update(row: StoreRow)(implicit c: Connection): Boolean
   def upsert(unsaved: StoreRow)(implicit c: Connection): StoreRow
+  def upsertStreaming(unsaved: Iterator[StoreRow], batchSize: Int = 10000)(implicit c: Connection): Int
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
index 574da19b89..9805a06f18 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
@@ -21,6 +21,7 @@ import anorm.SimpleSql
 import anorm.SqlStringInterpolation
 import anorm.ToStatement
 import java.sql.Connection
+import scala.annotation.nowarn
 import typo.dsl.DeleteBuilder
 import typo.dsl.SelectBuilder
 import typo.dsl.SelectBuilderSql
@@ -147,4 +148,19 @@ class StoreRepoImpl extends StoreRepo {
       .executeInsert(StoreRow.rowParser(1).single)
     
   }
+  override def upsertStreaming(unsaved: Iterator[StoreRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    SQL"create temporary table store_TEMP (like sales.store) on commit drop".execute(): @nowarn
+    streamingInsert(s"""copy store_TEMP("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(StoreRow.text, c): @nowarn
+    SQL"""insert into sales.store("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate")
+          select * from store_TEMP
+          on conflict ("businessentityid")
+          do update set
+            "name" = EXCLUDED."name",
+            "salespersonid" = EXCLUDED."salespersonid",
+            "demographics" = EXCLUDED."demographics",
+            "rowguid" = EXCLUDED."rowguid",
+            "modifieddate" = EXCLUDED."modifieddate"
+          ;
+          drop table store_TEMP;""".executeUpdate()
+  }
 }
diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
index 4a992b8b43..55d1e95960 100644
--- a/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
+++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
@@ -88,4 +88,10 @@ class StoreRepoMock(toRow: Function1[StoreRowUnsaved, StoreRow],
     map.put(unsaved.businessentityid, unsaved): @nowarn
     unsaved
   }
+  override def upsertStreaming(unsaved: Iterator[StoreRow], batchSize: Int = 10000)(implicit c: Connection): Int = {
+    unsaved.foreach { row =>
+      map += (row.businessentityid -> row)
+    }
+    unsaved.size
+  }
 }
diff --git a/typo-tester-anorm/src/scala/adventureworks/production/product/RepoTest.scala b/typo-tester-anorm/src/scala/adventureworks/production/product/RepoTest.scala
new file mode 100644
index 0000000000..57e3df0beb
--- /dev/null
+++ b/typo-tester-anorm/src/scala/adventureworks/production/product/RepoTest.scala
@@ -0,0 +1,30 @@
+package adventureworks.production.product
+
+import adventureworks.customtypes.*
+import adventureworks.production.unitmeasure.*
+import adventureworks.public.Name
+import adventureworks.{SnapshotTest, withConnection}
+import org.scalatest.Assertion
+
+import scala.annotation.nowarn
+
+class RepoTest extends SnapshotTest {
+  def runTest(unitmeasureRepo: UnitmeasureRepo): Assertion =
+    withConnection { implicit c =>
+      val um1 = unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg1"), name = Name("name1")))
+      val um2 = unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg2"), name = Name("name2")))
+      val um1a = um1.copy(name = Name("name1a"))
+      val um2a = um2.copy(name = Name("name2a"))
+      unitmeasureRepo.upsertStreaming(Iterator(um1a, um2a)): @nowarn
+      val all = unitmeasureRepo.selectAll
+      assert(List(um1a, um2a) == all.sortBy(_.name))
+    }
+
+  test("in-memory") {
+    runTest(new UnitmeasureRepoMock(_.toRow(TypoLocalDateTime.now)))
+  }
+
+  test("pg") {
+    runTest(new UnitmeasureRepoImpl)
+  }
+}
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
index a0ad086c78..1308f783f0 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
@@ -30,4 +30,5 @@ trait DepartmentRepo {
   def update: UpdateBuilder[DepartmentFields, DepartmentRow]
   def update(row: DepartmentRow): ConnectionIO[Boolean]
   def upsert(unsaved: DepartmentRow): ConnectionIO[DepartmentRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, DepartmentRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
index 1a287e7530..f32dcaa2f1 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
@@ -121,4 +121,19 @@ class DepartmentRepoImpl extends DepartmentRepo {
           returning "departmentid", "name", "groupname", "modifieddate"::text
        """.query(using DepartmentRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, DepartmentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table department_TEMP (like humanresources.department) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy department_TEMP("departmentid", "name", "groupname", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using DepartmentRow.text)
+      res <- sql"""insert into humanresources.department("departmentid", "name", "groupname", "modifieddate")
+                   select * from department_TEMP
+                   on conflict ("departmentid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "groupname" = EXCLUDED."groupname",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table department_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
index 49e4bbf5e5..946298e44c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
@@ -105,4 +105,14 @@ class DepartmentRepoMock(toRow: Function1[DepartmentRowUnsaved, DepartmentRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, DepartmentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.departmentid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
index 0a7187f89f..bd53ceadac 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
@@ -31,4 +31,5 @@ trait EmployeeRepo {
   def update: UpdateBuilder[EmployeeFields, EmployeeRow]
   def update(row: EmployeeRow): ConnectionIO[Boolean]
   def upsert(unsaved: EmployeeRow): ConnectionIO[EmployeeRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeeRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
index f92c807578..9338657c10 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
@@ -185,4 +185,30 @@ class EmployeeRepoImpl extends EmployeeRepo {
           returning "businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate"::text, "maritalstatus", "gender", "hiredate"::text, "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate"::text, "organizationnode"
        """.query(using EmployeeRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table employee_TEMP (like humanresources.employee) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy employee_TEMP("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode") from stdin""").copyIn(unsaved, batchSize)(using EmployeeRow.text)
+      res <- sql"""insert into humanresources.employee("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode")
+                   select * from employee_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "nationalidnumber" = EXCLUDED."nationalidnumber",
+                     "loginid" = EXCLUDED."loginid",
+                     "jobtitle" = EXCLUDED."jobtitle",
+                     "birthdate" = EXCLUDED."birthdate",
+                     "maritalstatus" = EXCLUDED."maritalstatus",
+                     "gender" = EXCLUDED."gender",
+                     "hiredate" = EXCLUDED."hiredate",
+                     "salariedflag" = EXCLUDED."salariedflag",
+                     "vacationhours" = EXCLUDED."vacationhours",
+                     "sickleavehours" = EXCLUDED."sickleavehours",
+                     "currentflag" = EXCLUDED."currentflag",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate",
+                     "organizationnode" = EXCLUDED."organizationnode"
+                   ;
+                   drop table employee_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
index 9a044c1ed1..0e8be94340 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
@@ -106,4 +106,14 @@ class EmployeeRepoMock(toRow: Function1[EmployeeRowUnsaved, EmployeeRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
index 3b99c7ec54..f731c35876 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
@@ -30,4 +30,5 @@ trait EmployeedepartmenthistoryRepo {
   def update: UpdateBuilder[EmployeedepartmenthistoryFields, EmployeedepartmenthistoryRow]
   def update(row: EmployeedepartmenthistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: EmployeedepartmenthistoryRow): ConnectionIO[EmployeedepartmenthistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
index 567b7c1be1..846a04a79f 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
@@ -141,4 +141,18 @@ class EmployeedepartmenthistoryRepoImpl extends EmployeedepartmenthistoryRepo {
           returning "businessentityid", "departmentid", "shiftid", "startdate"::text, "enddate"::text, "modifieddate"::text
        """.query(using EmployeedepartmenthistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table employeedepartmenthistory_TEMP (like humanresources.employeedepartmenthistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy employeedepartmenthistory_TEMP("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using EmployeedepartmenthistoryRow.text)
+      res <- sql"""insert into humanresources.employeedepartmenthistory("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate")
+                   select * from employeedepartmenthistory_TEMP
+                   on conflict ("businessentityid", "startdate", "departmentid", "shiftid")
+                   do update set
+                     "enddate" = EXCLUDED."enddate",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table employeedepartmenthistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
index ae958486dd..3726a1865a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
@@ -105,4 +105,14 @@ class EmployeedepartmenthistoryRepoMock(toRow: Function1[Employeedepartmenthisto
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
index 4da02bcb1e..3d3bdf56d0 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
@@ -30,4 +30,5 @@ trait EmployeepayhistoryRepo {
   def update: UpdateBuilder[EmployeepayhistoryFields, EmployeepayhistoryRow]
   def update(row: EmployeepayhistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: EmployeepayhistoryRow): ConnectionIO[EmployeepayhistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeepayhistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
index e4d294c94a..5f738b879b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
@@ -136,4 +136,19 @@ class EmployeepayhistoryRepoImpl extends EmployeepayhistoryRepo {
           returning "businessentityid", "ratechangedate"::text, "rate", "payfrequency", "modifieddate"::text
        """.query(using EmployeepayhistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeepayhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table employeepayhistory_TEMP (like humanresources.employeepayhistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy employeepayhistory_TEMP("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using EmployeepayhistoryRow.text)
+      res <- sql"""insert into humanresources.employeepayhistory("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate")
+                   select * from employeepayhistory_TEMP
+                   on conflict ("businessentityid", "ratechangedate")
+                   do update set
+                     "rate" = EXCLUDED."rate",
+                     "payfrequency" = EXCLUDED."payfrequency",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table employeepayhistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
index b00f33f632..263d4124ce 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
@@ -105,4 +105,14 @@ class EmployeepayhistoryRepoMock(toRow: Function1[EmployeepayhistoryRowUnsaved,
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmployeepayhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
index 2855a8944b..8eda1a535e 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
@@ -30,4 +30,5 @@ trait JobcandidateRepo {
   def update: UpdateBuilder[JobcandidateFields, JobcandidateRow]
   def update(row: JobcandidateRow): ConnectionIO[Boolean]
   def upsert(unsaved: JobcandidateRow): ConnectionIO[JobcandidateRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, JobcandidateRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
index 5284c26e6c..b5260e3ad9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
@@ -122,4 +122,19 @@ class JobcandidateRepoImpl extends JobcandidateRepo {
           returning "jobcandidateid", "businessentityid", "resume", "modifieddate"::text
        """.query(using JobcandidateRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, JobcandidateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table jobcandidate_TEMP (like humanresources.jobcandidate) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy jobcandidate_TEMP("jobcandidateid", "businessentityid", "resume", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using JobcandidateRow.text)
+      res <- sql"""insert into humanresources.jobcandidate("jobcandidateid", "businessentityid", "resume", "modifieddate")
+                   select * from jobcandidate_TEMP
+                   on conflict ("jobcandidateid")
+                   do update set
+                     "businessentityid" = EXCLUDED."businessentityid",
+                     "resume" = EXCLUDED."resume",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table jobcandidate_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
index 79e5ba231c..d133e00b8c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
@@ -105,4 +105,14 @@ class JobcandidateRepoMock(toRow: Function1[JobcandidateRowUnsaved, Jobcandidate
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, JobcandidateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.jobcandidateid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
index 36648c9c8c..819e6d4853 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
@@ -30,4 +30,5 @@ trait ShiftRepo {
   def update: UpdateBuilder[ShiftFields, ShiftRow]
   def update(row: ShiftRow): ConnectionIO[Boolean]
   def upsert(unsaved: ShiftRow): ConnectionIO[ShiftRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ShiftRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
index 57e5bfaf92..10a54d61c4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
@@ -126,4 +126,20 @@ class ShiftRepoImpl extends ShiftRepo {
           returning "shiftid", "name", "starttime"::text, "endtime"::text, "modifieddate"::text
        """.query(using ShiftRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShiftRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table shift_TEMP (like humanresources.shift) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy shift_TEMP("shiftid", "name", "starttime", "endtime", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ShiftRow.text)
+      res <- sql"""insert into humanresources.shift("shiftid", "name", "starttime", "endtime", "modifieddate")
+                   select * from shift_TEMP
+                   on conflict ("shiftid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "starttime" = EXCLUDED."starttime",
+                     "endtime" = EXCLUDED."endtime",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table shift_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
index 7fdca63f1f..4fc933e441 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
@@ -105,4 +105,14 @@ class ShiftRepoMock(toRow: Function1[ShiftRowUnsaved, ShiftRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShiftRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.shiftid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
new file mode 100644
index 0000000000..09a489e761
--- /dev/null
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
@@ -0,0 +1,34 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import doobie.postgres.Text
+import doobie.util.Get
+import doobie.util.Put
+import doobie.util.meta.Meta
+import io.circe.Decoder
+import io.circe.Encoder
+import typo.dsl.Bijection
+
+/** Domain `information_schema.cardinal_number`
+  * Constraint: CHECK ((VALUE >= 0))
+  */
+case class CardinalNumber(value: Int)
+object CardinalNumber {
+  implicit lazy val arrayGet: Get[Array[CardinalNumber]] = adventureworks.IntegerArrayMeta.get.map(_.map(CardinalNumber.apply))
+  implicit lazy val arrayPut: Put[Array[CardinalNumber]] = adventureworks.IntegerArrayMeta.put.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CardinalNumber, Int] = Bijection[CardinalNumber, Int](_.value)(CardinalNumber.apply)
+  implicit lazy val decoder: Decoder[CardinalNumber] = Decoder.decodeInt.map(CardinalNumber.apply)
+  implicit lazy val encoder: Encoder[CardinalNumber] = Encoder.encodeInt.contramap(_.value)
+  implicit lazy val get: Get[CardinalNumber] = Meta.IntMeta.get.map(CardinalNumber.apply)
+  implicit lazy val ordering: Ordering[CardinalNumber] = Ordering.by(_.value)
+  implicit lazy val put: Put[CardinalNumber] = Meta.IntMeta.put.contramap(_.value)
+  implicit lazy val text: Text[CardinalNumber] = new Text[CardinalNumber] {
+    override def unsafeEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
new file mode 100644
index 0000000000..b3e025d1c3
--- /dev/null
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
@@ -0,0 +1,34 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import doobie.postgres.Text
+import doobie.util.Get
+import doobie.util.Put
+import doobie.util.meta.Meta
+import io.circe.Decoder
+import io.circe.Encoder
+import typo.dsl.Bijection
+
+/** Domain `information_schema.character_data`
+  * No constraint
+  */
+case class CharacterData(value: String)
+object CharacterData {
+  implicit lazy val arrayGet: Get[Array[CharacterData]] = adventureworks.StringArrayMeta.get.map(_.map(CharacterData.apply))
+  implicit lazy val arrayPut: Put[Array[CharacterData]] = adventureworks.StringArrayMeta.put.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CharacterData, String] = Bijection[CharacterData, String](_.value)(CharacterData.apply)
+  implicit lazy val decoder: Decoder[CharacterData] = Decoder.decodeString.map(CharacterData.apply)
+  implicit lazy val encoder: Encoder[CharacterData] = Encoder.encodeString.contramap(_.value)
+  implicit lazy val get: Get[CharacterData] = Meta.StringMeta.get.map(CharacterData.apply)
+  implicit lazy val ordering: Ordering[CharacterData] = Ordering.by(_.value)
+  implicit lazy val put: Put[CharacterData] = Meta.StringMeta.put.contramap(_.value)
+  implicit lazy val text: Text[CharacterData] = new Text[CharacterData] {
+    override def unsafeEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
new file mode 100644
index 0000000000..ece5efcd6c
--- /dev/null
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
@@ -0,0 +1,34 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import doobie.postgres.Text
+import doobie.util.Get
+import doobie.util.Put
+import doobie.util.meta.Meta
+import io.circe.Decoder
+import io.circe.Encoder
+import typo.dsl.Bijection
+
+/** Domain `information_schema.sql_identifier`
+  * No constraint
+  */
+case class SqlIdentifier(value: String)
+object SqlIdentifier {
+  implicit lazy val arrayGet: Get[Array[SqlIdentifier]] = adventureworks.StringArrayMeta.get.map(_.map(SqlIdentifier.apply))
+  implicit lazy val arrayPut: Put[Array[SqlIdentifier]] = adventureworks.StringArrayMeta.put.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[SqlIdentifier, String] = Bijection[SqlIdentifier, String](_.value)(SqlIdentifier.apply)
+  implicit lazy val decoder: Decoder[SqlIdentifier] = Decoder.decodeString.map(SqlIdentifier.apply)
+  implicit lazy val encoder: Encoder[SqlIdentifier] = Encoder.encodeString.contramap(_.value)
+  implicit lazy val get: Get[SqlIdentifier] = Meta.StringMeta.get.map(SqlIdentifier.apply)
+  implicit lazy val ordering: Ordering[SqlIdentifier] = Ordering.by(_.value)
+  implicit lazy val put: Put[SqlIdentifier] = Meta.StringMeta.put.contramap(_.value)
+  implicit lazy val text: Text[SqlIdentifier] = new Text[SqlIdentifier] {
+    override def unsafeEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
new file mode 100644
index 0000000000..63904efc4a
--- /dev/null
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
@@ -0,0 +1,34 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import adventureworks.customtypes.TypoInstant
+import doobie.postgres.Text
+import doobie.util.Get
+import doobie.util.Put
+import io.circe.Decoder
+import io.circe.Encoder
+import typo.dsl.Bijection
+
+/** Domain `information_schema.time_stamp`
+  * No constraint
+  */
+case class TimeStamp(value: TypoInstant)
+object TimeStamp {
+  implicit lazy val arrayGet: Get[Array[TimeStamp]] = TypoInstant.arrayGet.map(_.map(TimeStamp.apply))
+  implicit lazy val arrayPut: Put[Array[TimeStamp]] = TypoInstant.arrayPut.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[TimeStamp, TypoInstant] = Bijection[TimeStamp, TypoInstant](_.value)(TimeStamp.apply)
+  implicit lazy val decoder: Decoder[TimeStamp] = TypoInstant.decoder.map(TimeStamp.apply)
+  implicit lazy val encoder: Encoder[TimeStamp] = TypoInstant.encoder.contramap(_.value)
+  implicit lazy val get: Get[TimeStamp] = TypoInstant.get.map(TimeStamp.apply)
+  implicit def ordering(implicit O0: Ordering[TypoInstant]): Ordering[TimeStamp] = Ordering.by(_.value)
+  implicit lazy val put: Put[TimeStamp] = TypoInstant.put.contramap(_.value)
+  implicit lazy val text: Text[TimeStamp] = new Text[TimeStamp] {
+    override def unsafeEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
new file mode 100644
index 0000000000..caa7bdddae
--- /dev/null
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
@@ -0,0 +1,34 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import doobie.postgres.Text
+import doobie.util.Get
+import doobie.util.Put
+import doobie.util.meta.Meta
+import io.circe.Decoder
+import io.circe.Encoder
+import typo.dsl.Bijection
+
+/** Domain `information_schema.yes_or_no`
+  * Constraint: CHECK (((VALUE)::text = ANY ((ARRAY['YES'::character varying, 'NO'::character varying])::text[])))
+  */
+case class YesOrNo(value: String)
+object YesOrNo {
+  implicit lazy val arrayGet: Get[Array[YesOrNo]] = adventureworks.StringArrayMeta.get.map(_.map(YesOrNo.apply))
+  implicit lazy val arrayPut: Put[Array[YesOrNo]] = adventureworks.StringArrayMeta.put.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[YesOrNo, String] = Bijection[YesOrNo, String](_.value)(YesOrNo.apply)
+  implicit lazy val decoder: Decoder[YesOrNo] = Decoder.decodeString.map(YesOrNo.apply)
+  implicit lazy val encoder: Encoder[YesOrNo] = Encoder.encodeString.contramap(_.value)
+  implicit lazy val get: Get[YesOrNo] = Meta.StringMeta.get.map(YesOrNo.apply)
+  implicit lazy val ordering: Ordering[YesOrNo] = Ordering.by(_.value)
+  implicit lazy val put: Put[YesOrNo] = Meta.StringMeta.put.contramap(_.value)
+  implicit lazy val text: Text[YesOrNo] = new Text[YesOrNo] {
+    override def unsafeEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
index 6489fe2c9b..04994c4964 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
@@ -30,4 +30,5 @@ trait AddressRepo {
   def update: UpdateBuilder[AddressFields, AddressRow]
   def update(row: AddressRow): ConnectionIO[Boolean]
   def upsert(unsaved: AddressRow): ConnectionIO[AddressRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, AddressRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
index 68ecf92e23..c587653106 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
@@ -147,4 +147,24 @@ class AddressRepoImpl extends AddressRepo {
           returning "addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate"::text
        """.query(using AddressRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, AddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table address_TEMP (like person.address) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy address_TEMP("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using AddressRow.text)
+      res <- sql"""insert into person.address("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate")
+                   select * from address_TEMP
+                   on conflict ("addressid")
+                   do update set
+                     "addressline1" = EXCLUDED."addressline1",
+                     "addressline2" = EXCLUDED."addressline2",
+                     "city" = EXCLUDED."city",
+                     "stateprovinceid" = EXCLUDED."stateprovinceid",
+                     "postalcode" = EXCLUDED."postalcode",
+                     "spatiallocation" = EXCLUDED."spatiallocation",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table address_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
index 2c7ccd842c..eae1772caf 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
@@ -105,4 +105,14 @@ class AddressRepoMock(toRow: Function1[AddressRowUnsaved, AddressRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, AddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.addressid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
index b1f569f9f1..9069bace3a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
@@ -30,4 +30,5 @@ trait AddresstypeRepo {
   def update: UpdateBuilder[AddresstypeFields, AddresstypeRow]
   def update(row: AddresstypeRow): ConnectionIO[Boolean]
   def upsert(unsaved: AddresstypeRow): ConnectionIO[AddresstypeRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, AddresstypeRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
index 6903106a03..f60d154415 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
@@ -125,4 +125,19 @@ class AddresstypeRepoImpl extends AddresstypeRepo {
           returning "addresstypeid", "name", "rowguid", "modifieddate"::text
        """.query(using AddresstypeRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, AddresstypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table addresstype_TEMP (like person.addresstype) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy addresstype_TEMP("addresstypeid", "name", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using AddresstypeRow.text)
+      res <- sql"""insert into person.addresstype("addresstypeid", "name", "rowguid", "modifieddate")
+                   select * from addresstype_TEMP
+                   on conflict ("addresstypeid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table addresstype_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
index dfac5baa3b..f853a05568 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
@@ -105,4 +105,14 @@ class AddresstypeRepoMock(toRow: Function1[AddresstypeRowUnsaved, AddresstypeRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, AddresstypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.addresstypeid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
index 6394b5241b..9f8b414672 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
@@ -30,4 +30,5 @@ trait BusinessentityRepo {
   def update: UpdateBuilder[BusinessentityFields, BusinessentityRow]
   def update(row: BusinessentityRow): ConnectionIO[Boolean]
   def upsert(unsaved: BusinessentityRow): ConnectionIO[BusinessentityRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
index f0efbba264..971d4e2ec5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
@@ -120,4 +120,18 @@ class BusinessentityRepoImpl extends BusinessentityRepo {
           returning "businessentityid", "rowguid", "modifieddate"::text
        """.query(using BusinessentityRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table businessentity_TEMP (like person.businessentity) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy businessentity_TEMP("businessentityid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using BusinessentityRow.text)
+      res <- sql"""insert into person.businessentity("businessentityid", "rowguid", "modifieddate")
+                   select * from businessentity_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table businessentity_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
index a17b71c53b..fef45e3895 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
@@ -105,4 +105,14 @@ class BusinessentityRepoMock(toRow: Function1[BusinessentityRowUnsaved, Business
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
index 1dca0ffc38..0808d8cc49 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
@@ -30,4 +30,5 @@ trait BusinessentityaddressRepo {
   def update: UpdateBuilder[BusinessentityaddressFields, BusinessentityaddressRow]
   def update(row: BusinessentityaddressRow): ConnectionIO[Boolean]
   def upsert(unsaved: BusinessentityaddressRow): ConnectionIO[BusinessentityaddressRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityaddressRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
index 6b5c39ede2..ab3fe95bff 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
@@ -140,4 +140,18 @@ class BusinessentityaddressRepoImpl extends BusinessentityaddressRepo {
           returning "businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate"::text
        """.query(using BusinessentityaddressRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityaddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table businessentityaddress_TEMP (like person.businessentityaddress) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy businessentityaddress_TEMP("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using BusinessentityaddressRow.text)
+      res <- sql"""insert into person.businessentityaddress("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate")
+                   select * from businessentityaddress_TEMP
+                   on conflict ("businessentityid", "addressid", "addresstypeid")
+                   do update set
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table businessentityaddress_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
index 23237f5438..c49d617d72 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
@@ -105,4 +105,14 @@ class BusinessentityaddressRepoMock(toRow: Function1[BusinessentityaddressRowUns
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentityaddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
index abffd5b6f6..8c9f236701 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
@@ -30,4 +30,5 @@ trait BusinessentitycontactRepo {
   def update: UpdateBuilder[BusinessentitycontactFields, BusinessentitycontactRow]
   def update(row: BusinessentitycontactRow): ConnectionIO[Boolean]
   def upsert(unsaved: BusinessentitycontactRow): ConnectionIO[BusinessentitycontactRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentitycontactRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
index 85342187b6..d352f909f4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
@@ -139,4 +139,18 @@ class BusinessentitycontactRepoImpl extends BusinessentitycontactRepo {
           returning "businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate"::text
        """.query(using BusinessentitycontactRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentitycontactRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table businessentitycontact_TEMP (like person.businessentitycontact) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy businessentitycontact_TEMP("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using BusinessentitycontactRow.text)
+      res <- sql"""insert into person.businessentitycontact("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate")
+                   select * from businessentitycontact_TEMP
+                   on conflict ("businessentityid", "personid", "contacttypeid")
+                   do update set
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table businessentitycontact_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
index 9bcc51a0e7..0fa8b2deb6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
@@ -105,4 +105,14 @@ class BusinessentitycontactRepoMock(toRow: Function1[BusinessentitycontactRowUns
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BusinessentitycontactRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
index 5d7e93a36d..2a41224a13 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
@@ -30,4 +30,5 @@ trait ContacttypeRepo {
   def update: UpdateBuilder[ContacttypeFields, ContacttypeRow]
   def update(row: ContacttypeRow): ConnectionIO[Boolean]
   def upsert(unsaved: ContacttypeRow): ConnectionIO[ContacttypeRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ContacttypeRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
index 9b70f69bb7..60de821c0a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
@@ -117,4 +117,18 @@ class ContacttypeRepoImpl extends ContacttypeRepo {
           returning "contacttypeid", "name", "modifieddate"::text
        """.query(using ContacttypeRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ContacttypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table contacttype_TEMP (like person.contacttype) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy contacttype_TEMP("contacttypeid", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ContacttypeRow.text)
+      res <- sql"""insert into person.contacttype("contacttypeid", "name", "modifieddate")
+                   select * from contacttype_TEMP
+                   on conflict ("contacttypeid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table contacttype_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
index 0e86ae9c9c..53241a5b8c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
@@ -105,4 +105,14 @@ class ContacttypeRepoMock(toRow: Function1[ContacttypeRowUnsaved, ContacttypeRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ContacttypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.contacttypeid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
index b4e96ced88..abd8ead291 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
@@ -30,4 +30,5 @@ trait CountryregionRepo {
   def update: UpdateBuilder[CountryregionFields, CountryregionRow]
   def update(row: CountryregionRow): ConnectionIO[Boolean]
   def upsert(unsaved: CountryregionRow): ConnectionIO[CountryregionRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregionRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
index 920daa6e36..84c837ad7a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
@@ -114,4 +114,18 @@ class CountryregionRepoImpl extends CountryregionRepo {
           returning "countryregioncode", "name", "modifieddate"::text
        """.query(using CountryregionRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregionRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table countryregion_TEMP (like person.countryregion) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy countryregion_TEMP("countryregioncode", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CountryregionRow.text)
+      res <- sql"""insert into person.countryregion("countryregioncode", "name", "modifieddate")
+                   select * from countryregion_TEMP
+                   on conflict ("countryregioncode")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table countryregion_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
index 8b6584f11c..31e0d5dd95 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
@@ -105,4 +105,14 @@ class CountryregionRepoMock(toRow: Function1[CountryregionRowUnsaved, Countryreg
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregionRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.countryregioncode -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
index d64e2df5c5..52ddb66fee 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
@@ -30,4 +30,5 @@ trait EmailaddressRepo {
   def update: UpdateBuilder[EmailaddressFields, EmailaddressRow]
   def update(row: EmailaddressRow): ConnectionIO[Boolean]
   def upsert(unsaved: EmailaddressRow): ConnectionIO[EmailaddressRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, EmailaddressRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
index 6052d1f2f0..48ec7902a2 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
@@ -142,4 +142,19 @@ class EmailaddressRepoImpl extends EmailaddressRepo {
           returning "businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate"::text
        """.query(using EmailaddressRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmailaddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table emailaddress_TEMP (like person.emailaddress) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy emailaddress_TEMP("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using EmailaddressRow.text)
+      res <- sql"""insert into person.emailaddress("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate")
+                   select * from emailaddress_TEMP
+                   on conflict ("businessentityid", "emailaddressid")
+                   do update set
+                     "emailaddress" = EXCLUDED."emailaddress",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table emailaddress_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
index d8ffa5e1bc..e2f8cda392 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
@@ -105,4 +105,14 @@ class EmailaddressRepoMock(toRow: Function1[EmailaddressRowUnsaved, Emailaddress
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, EmailaddressRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
index 3a5d28d899..2c129f5660 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
@@ -31,4 +31,5 @@ trait PasswordRepo {
   def update: UpdateBuilder[PasswordFields, PasswordRow]
   def update(row: PasswordRow): ConnectionIO[Boolean]
   def upsert(unsaved: PasswordRow): ConnectionIO[PasswordRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PasswordRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
index 97ae0612d0..2c4ebca001 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
@@ -127,4 +127,20 @@ class PasswordRepoImpl extends PasswordRepo {
           returning "businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate"::text
        """.query(using PasswordRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PasswordRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table password_TEMP (like person.password) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy password_TEMP("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PasswordRow.text)
+      res <- sql"""insert into person.password("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate")
+                   select * from password_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "passwordhash" = EXCLUDED."passwordhash",
+                     "passwordsalt" = EXCLUDED."passwordsalt",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table password_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
index 7958d68ec8..286c9ce5f3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
@@ -106,4 +106,14 @@ class PasswordRepoMock(toRow: Function1[PasswordRowUnsaved, PasswordRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PasswordRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
index 4fbf1b2a8a..42b314af76 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
@@ -31,4 +31,5 @@ trait PersonRepo {
   def update: UpdateBuilder[PersonFields, PersonRow]
   def update(row: PersonRow): ConnectionIO[Boolean]
   def upsert(unsaved: PersonRow): ConnectionIO[PersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
index 67c2319e89..cf73ffb3f5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
@@ -169,4 +169,28 @@ class PersonRepoImpl extends PersonRepo {
           returning "businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate"::text
        """.query(using PersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table person_TEMP (like person.person) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy person_TEMP("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PersonRow.text)
+      res <- sql"""insert into person.person("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate")
+                   select * from person_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "persontype" = EXCLUDED."persontype",
+                     "namestyle" = EXCLUDED."namestyle",
+                     "title" = EXCLUDED."title",
+                     "firstname" = EXCLUDED."firstname",
+                     "middlename" = EXCLUDED."middlename",
+                     "lastname" = EXCLUDED."lastname",
+                     "suffix" = EXCLUDED."suffix",
+                     "emailpromotion" = EXCLUDED."emailpromotion",
+                     "additionalcontactinfo" = EXCLUDED."additionalcontactinfo",
+                     "demographics" = EXCLUDED."demographics",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table person_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
index 6fb77b058f..bd29d39e1e 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
@@ -106,4 +106,14 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
index 0cecdafb0c..3422abc6ae 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
@@ -30,4 +30,5 @@ trait PersonphoneRepo {
   def update: UpdateBuilder[PersonphoneFields, PersonphoneRow]
   def update(row: PersonphoneRow): ConnectionIO[Boolean]
   def upsert(unsaved: PersonphoneRow): ConnectionIO[PersonphoneRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersonphoneRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
index a9fecce74e..abd9eca2d6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
@@ -132,4 +132,17 @@ class PersonphoneRepoImpl extends PersonphoneRepo {
           returning "businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate"::text
        """.query(using PersonphoneRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonphoneRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table personphone_TEMP (like person.personphone) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy personphone_TEMP("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PersonphoneRow.text)
+      res <- sql"""insert into person.personphone("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate")
+                   select * from personphone_TEMP
+                   on conflict ("businessentityid", "phonenumber", "phonenumbertypeid")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table personphone_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
index bb3bc4b6d9..bd19da42ba 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
@@ -105,4 +105,14 @@ class PersonphoneRepoMock(toRow: Function1[PersonphoneRowUnsaved, PersonphoneRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersonphoneRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
index 18f72dd853..bcff9b47c3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
@@ -30,4 +30,5 @@ trait PhonenumbertypeRepo {
   def update: UpdateBuilder[PhonenumbertypeFields, PhonenumbertypeRow]
   def update(row: PhonenumbertypeRow): ConnectionIO[Boolean]
   def upsert(unsaved: PhonenumbertypeRow): ConnectionIO[PhonenumbertypeRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PhonenumbertypeRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
index c7972999b1..879c170b5a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
@@ -117,4 +117,18 @@ class PhonenumbertypeRepoImpl extends PhonenumbertypeRepo {
           returning "phonenumbertypeid", "name", "modifieddate"::text
        """.query(using PhonenumbertypeRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PhonenumbertypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table phonenumbertype_TEMP (like person.phonenumbertype) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy phonenumbertype_TEMP("phonenumbertypeid", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PhonenumbertypeRow.text)
+      res <- sql"""insert into person.phonenumbertype("phonenumbertypeid", "name", "modifieddate")
+                   select * from phonenumbertype_TEMP
+                   on conflict ("phonenumbertypeid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table phonenumbertype_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
index 5253a2b2fa..ba3dc5cd23 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
@@ -105,4 +105,14 @@ class PhonenumbertypeRepoMock(toRow: Function1[PhonenumbertypeRowUnsaved, Phonen
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PhonenumbertypeRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.phonenumbertypeid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
index eeba397b3f..33aab9f44b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
@@ -30,4 +30,5 @@ trait StateprovinceRepo {
   def update: UpdateBuilder[StateprovinceFields, StateprovinceRow]
   def update(row: StateprovinceRow): ConnectionIO[Boolean]
   def upsert(unsaved: StateprovinceRow): ConnectionIO[StateprovinceRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, StateprovinceRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
index 7320523091..822554fc81 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
@@ -148,4 +148,23 @@ class StateprovinceRepoImpl extends StateprovinceRepo {
           returning "stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate"::text
        """.query(using StateprovinceRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, StateprovinceRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table stateprovince_TEMP (like person.stateprovince) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy stateprovince_TEMP("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using StateprovinceRow.text)
+      res <- sql"""insert into person.stateprovince("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate")
+                   select * from stateprovince_TEMP
+                   on conflict ("stateprovinceid")
+                   do update set
+                     "stateprovincecode" = EXCLUDED."stateprovincecode",
+                     "countryregioncode" = EXCLUDED."countryregioncode",
+                     "isonlystateprovinceflag" = EXCLUDED."isonlystateprovinceflag",
+                     "name" = EXCLUDED."name",
+                     "territoryid" = EXCLUDED."territoryid",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table stateprovince_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
index fac80aed17..63a20cfe0a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
@@ -105,4 +105,14 @@ class StateprovinceRepoMock(toRow: Function1[StateprovinceRowUnsaved, Stateprovi
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, StateprovinceRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.stateprovinceid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
index 89ee581832..51d2b50c02 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
@@ -30,4 +30,5 @@ trait BillofmaterialsRepo {
   def update: UpdateBuilder[BillofmaterialsFields, BillofmaterialsRow]
   def update(row: BillofmaterialsRow): ConnectionIO[Boolean]
   def upsert(unsaved: BillofmaterialsRow): ConnectionIO[BillofmaterialsRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, BillofmaterialsRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
index 01c65f7c3c..4bd16873d4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
@@ -150,4 +150,24 @@ class BillofmaterialsRepoImpl extends BillofmaterialsRepo {
           returning "billofmaterialsid", "productassemblyid", "componentid", "startdate"::text, "enddate"::text, "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate"::text
        """.query(using BillofmaterialsRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BillofmaterialsRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table billofmaterials_TEMP (like production.billofmaterials) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy billofmaterials_TEMP("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using BillofmaterialsRow.text)
+      res <- sql"""insert into production.billofmaterials("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate")
+                   select * from billofmaterials_TEMP
+                   on conflict ("billofmaterialsid")
+                   do update set
+                     "productassemblyid" = EXCLUDED."productassemblyid",
+                     "componentid" = EXCLUDED."componentid",
+                     "startdate" = EXCLUDED."startdate",
+                     "enddate" = EXCLUDED."enddate",
+                     "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+                     "bomlevel" = EXCLUDED."bomlevel",
+                     "perassemblyqty" = EXCLUDED."perassemblyqty",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table billofmaterials_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
index 5640ab96c8..3b39a83f33 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
@@ -105,4 +105,14 @@ class BillofmaterialsRepoMock(toRow: Function1[BillofmaterialsRowUnsaved, Billof
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, BillofmaterialsRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.billofmaterialsid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
index 58a1d85c3d..0c3e315ff5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
@@ -30,4 +30,5 @@ trait CultureRepo {
   def update: UpdateBuilder[CultureFields, CultureRow]
   def update(row: CultureRow): ConnectionIO[Boolean]
   def upsert(unsaved: CultureRow): ConnectionIO[CultureRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CultureRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
index a58da3339a..be2b5ec49f 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
@@ -114,4 +114,18 @@ class CultureRepoImpl extends CultureRepo {
           returning "cultureid", "name", "modifieddate"::text
        """.query(using CultureRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CultureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table culture_TEMP (like production.culture) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy culture_TEMP("cultureid", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CultureRow.text)
+      res <- sql"""insert into production.culture("cultureid", "name", "modifieddate")
+                   select * from culture_TEMP
+                   on conflict ("cultureid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table culture_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
index 52aaccb3dd..fbd6509582 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
@@ -105,4 +105,14 @@ class CultureRepoMock(toRow: Function1[CultureRowUnsaved, CultureRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CultureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.cultureid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
index 463a4d0879..324721c175 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
@@ -32,4 +32,5 @@ trait DocumentRepo {
   def update: UpdateBuilder[DocumentFields, DocumentRow]
   def update(row: DocumentRow): ConnectionIO[Boolean]
   def upsert(unsaved: DocumentRow): ConnectionIO[DocumentRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, DocumentRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
index 447c9fef23..169e21bdf8 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
@@ -177,4 +177,28 @@ class DocumentRepoImpl extends DocumentRepo {
           returning "title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate"::text, "documentnode"
        """.query(using DocumentRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, DocumentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table document_TEMP (like production.document) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy document_TEMP("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode") from stdin""").copyIn(unsaved, batchSize)(using DocumentRow.text)
+      res <- sql"""insert into production.document("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode")
+                   select * from document_TEMP
+                   on conflict ("documentnode")
+                   do update set
+                     "title" = EXCLUDED."title",
+                     "owner" = EXCLUDED."owner",
+                     "folderflag" = EXCLUDED."folderflag",
+                     "filename" = EXCLUDED."filename",
+                     "fileextension" = EXCLUDED."fileextension",
+                     "revision" = EXCLUDED."revision",
+                     "changenumber" = EXCLUDED."changenumber",
+                     "status" = EXCLUDED."status",
+                     "documentsummary" = EXCLUDED."documentsummary",
+                     "document" = EXCLUDED."document",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table document_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
index 270536c084..59a5552c6d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
@@ -109,4 +109,14 @@ class DocumentRepoMock(toRow: Function1[DocumentRowUnsaved, DocumentRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, DocumentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.documentnode -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
index 7e513c17c4..49921655e8 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
@@ -30,4 +30,5 @@ trait IllustrationRepo {
   def update: UpdateBuilder[IllustrationFields, IllustrationRow]
   def update(row: IllustrationRow): ConnectionIO[Boolean]
   def upsert(unsaved: IllustrationRow): ConnectionIO[IllustrationRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, IllustrationRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
index 488fb755b5..103cf36a6a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
@@ -117,4 +117,18 @@ class IllustrationRepoImpl extends IllustrationRepo {
           returning "illustrationid", "diagram", "modifieddate"::text
        """.query(using IllustrationRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, IllustrationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table illustration_TEMP (like production.illustration) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy illustration_TEMP("illustrationid", "diagram", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using IllustrationRow.text)
+      res <- sql"""insert into production.illustration("illustrationid", "diagram", "modifieddate")
+                   select * from illustration_TEMP
+                   on conflict ("illustrationid")
+                   do update set
+                     "diagram" = EXCLUDED."diagram",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table illustration_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
index 8925569c55..f04d2cd1a3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
@@ -105,4 +105,14 @@ class IllustrationRepoMock(toRow: Function1[IllustrationRowUnsaved, Illustration
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, IllustrationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.illustrationid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
index e86826bc17..25bc96af5c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
@@ -30,4 +30,5 @@ trait LocationRepo {
   def update: UpdateBuilder[LocationFields, LocationRow]
   def update(row: LocationRow): ConnectionIO[Boolean]
   def upsert(unsaved: LocationRow): ConnectionIO[LocationRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, LocationRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
index c1d8f5d8f8..068a5c3663 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
@@ -132,4 +132,20 @@ class LocationRepoImpl extends LocationRepo {
           returning "locationid", "name", "costrate", "availability", "modifieddate"::text
        """.query(using LocationRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, LocationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table location_TEMP (like production.location) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy location_TEMP("locationid", "name", "costrate", "availability", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using LocationRow.text)
+      res <- sql"""insert into production.location("locationid", "name", "costrate", "availability", "modifieddate")
+                   select * from location_TEMP
+                   on conflict ("locationid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "costrate" = EXCLUDED."costrate",
+                     "availability" = EXCLUDED."availability",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table location_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
index 7337b0d6e1..515b098412 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
@@ -105,4 +105,14 @@ class LocationRepoMock(toRow: Function1[LocationRowUnsaved, LocationRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, LocationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.locationid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
index af68a87206..1fb76f0363 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
@@ -30,4 +30,5 @@ trait ProductRepo {
   def update: UpdateBuilder[ProductFields, ProductRow]
   def update(row: ProductRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductRow): ConnectionIO[ProductRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
index 7e0ad5f73b..c839d8b352 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
@@ -221,4 +221,40 @@ class ProductRepoImpl extends ProductRepo {
           returning "productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate"::text, "sellenddate"::text, "discontinueddate"::text, "rowguid", "modifieddate"::text
        """.query(using ProductRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table product_TEMP (like production.product) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy product_TEMP("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductRow.text)
+      res <- sql"""insert into production.product("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate")
+                   select * from product_TEMP
+                   on conflict ("productid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "productnumber" = EXCLUDED."productnumber",
+                     "makeflag" = EXCLUDED."makeflag",
+                     "finishedgoodsflag" = EXCLUDED."finishedgoodsflag",
+                     "color" = EXCLUDED."color",
+                     "safetystocklevel" = EXCLUDED."safetystocklevel",
+                     "reorderpoint" = EXCLUDED."reorderpoint",
+                     "standardcost" = EXCLUDED."standardcost",
+                     "listprice" = EXCLUDED."listprice",
+                     "size" = EXCLUDED."size",
+                     "sizeunitmeasurecode" = EXCLUDED."sizeunitmeasurecode",
+                     "weightunitmeasurecode" = EXCLUDED."weightunitmeasurecode",
+                     "weight" = EXCLUDED."weight",
+                     "daystomanufacture" = EXCLUDED."daystomanufacture",
+                     "productline" = EXCLUDED."productline",
+                     "class" = EXCLUDED."class",
+                     "style" = EXCLUDED."style",
+                     "productsubcategoryid" = EXCLUDED."productsubcategoryid",
+                     "productmodelid" = EXCLUDED."productmodelid",
+                     "sellstartdate" = EXCLUDED."sellstartdate",
+                     "sellenddate" = EXCLUDED."sellenddate",
+                     "discontinueddate" = EXCLUDED."discontinueddate",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table product_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
index e60b5715b9..20dcc936fc 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
@@ -105,4 +105,14 @@ class ProductRepoMock(toRow: Function1[ProductRowUnsaved, ProductRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
index 87559d3054..4774d75bb2 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
@@ -30,4 +30,5 @@ trait ProductcategoryRepo {
   def update: UpdateBuilder[ProductcategoryFields, ProductcategoryRow]
   def update(row: ProductcategoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductcategoryRow): ConnectionIO[ProductcategoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcategoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
index 39545534f1..4c7719853a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
@@ -125,4 +125,19 @@ class ProductcategoryRepoImpl extends ProductcategoryRepo {
           returning "productcategoryid", "name", "rowguid", "modifieddate"::text
        """.query(using ProductcategoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcategoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productcategory_TEMP (like production.productcategory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productcategory_TEMP("productcategoryid", "name", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductcategoryRow.text)
+      res <- sql"""insert into production.productcategory("productcategoryid", "name", "rowguid", "modifieddate")
+                   select * from productcategory_TEMP
+                   on conflict ("productcategoryid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productcategory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
index ff0c576400..4edc8a8f58 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
@@ -105,4 +105,14 @@ class ProductcategoryRepoMock(toRow: Function1[ProductcategoryRowUnsaved, Produc
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcategoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productcategoryid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
index 151ea57fdd..cc32ddb9e5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
@@ -30,4 +30,5 @@ trait ProductcosthistoryRepo {
   def update: UpdateBuilder[ProductcosthistoryFields, ProductcosthistoryRow]
   def update(row: ProductcosthistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductcosthistoryRow): ConnectionIO[ProductcosthistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcosthistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
index 1f4673f642..71dbfeb07a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
@@ -135,4 +135,19 @@ class ProductcosthistoryRepoImpl extends ProductcosthistoryRepo {
           returning "productid", "startdate"::text, "enddate"::text, "standardcost", "modifieddate"::text
        """.query(using ProductcosthistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcosthistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productcosthistory_TEMP (like production.productcosthistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productcosthistory_TEMP("productid", "startdate", "enddate", "standardcost", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductcosthistoryRow.text)
+      res <- sql"""insert into production.productcosthistory("productid", "startdate", "enddate", "standardcost", "modifieddate")
+                   select * from productcosthistory_TEMP
+                   on conflict ("productid", "startdate")
+                   do update set
+                     "enddate" = EXCLUDED."enddate",
+                     "standardcost" = EXCLUDED."standardcost",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productcosthistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
index c92ee66eb4..29c125fba5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
@@ -105,4 +105,14 @@ class ProductcosthistoryRepoMock(toRow: Function1[ProductcosthistoryRowUnsaved,
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductcosthistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
index 9447f002c1..0620357eb3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
@@ -30,4 +30,5 @@ trait ProductdescriptionRepo {
   def update: UpdateBuilder[ProductdescriptionFields, ProductdescriptionRow]
   def update(row: ProductdescriptionRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductdescriptionRow): ConnectionIO[ProductdescriptionRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdescriptionRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
index f5e5f931cf..5e4f20908a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
@@ -125,4 +125,19 @@ class ProductdescriptionRepoImpl extends ProductdescriptionRepo {
           returning "productdescriptionid", "description", "rowguid", "modifieddate"::text
        """.query(using ProductdescriptionRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdescriptionRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productdescription_TEMP (like production.productdescription) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productdescription_TEMP("productdescriptionid", "description", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductdescriptionRow.text)
+      res <- sql"""insert into production.productdescription("productdescriptionid", "description", "rowguid", "modifieddate")
+                   select * from productdescription_TEMP
+                   on conflict ("productdescriptionid")
+                   do update set
+                     "description" = EXCLUDED."description",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productdescription_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
index c91b85a7e3..a48f51ea5b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
@@ -105,4 +105,14 @@ class ProductdescriptionRepoMock(toRow: Function1[ProductdescriptionRowUnsaved,
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdescriptionRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productdescriptionid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
index 415d1b3438..d109aa49b9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
@@ -30,4 +30,5 @@ trait ProductdocumentRepo {
   def update: UpdateBuilder[ProductdocumentFields, ProductdocumentRow]
   def update(row: ProductdocumentRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductdocumentRow): ConnectionIO[ProductdocumentRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdocumentRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
index df2cda2f90..526359c017 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
@@ -130,4 +130,17 @@ class ProductdocumentRepoImpl extends ProductdocumentRepo {
           returning "productid", "modifieddate"::text, "documentnode"
        """.query(using ProductdocumentRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdocumentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productdocument_TEMP (like production.productdocument) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productdocument_TEMP("productid", "modifieddate", "documentnode") from stdin""").copyIn(unsaved, batchSize)(using ProductdocumentRow.text)
+      res <- sql"""insert into production.productdocument("productid", "modifieddate", "documentnode")
+                   select * from productdocument_TEMP
+                   on conflict ("productid", "documentnode")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productdocument_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
index 9d8fbc0213..fccdabfa3c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
@@ -105,4 +105,14 @@ class ProductdocumentRepoMock(toRow: Function1[ProductdocumentRowUnsaved, Produc
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductdocumentRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
index 6500d9122b..e536356bf5 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
@@ -30,4 +30,5 @@ trait ProductinventoryRepo {
   def update: UpdateBuilder[ProductinventoryFields, ProductinventoryRow]
   def update(row: ProductinventoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductinventoryRow): ConnectionIO[ProductinventoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductinventoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
index 72c2db629e..f6761f1edf 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
@@ -152,4 +152,21 @@ class ProductinventoryRepoImpl extends ProductinventoryRepo {
           returning "productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate"::text
        """.query(using ProductinventoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductinventoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productinventory_TEMP (like production.productinventory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productinventory_TEMP("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductinventoryRow.text)
+      res <- sql"""insert into production.productinventory("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate")
+                   select * from productinventory_TEMP
+                   on conflict ("productid", "locationid")
+                   do update set
+                     "shelf" = EXCLUDED."shelf",
+                     "bin" = EXCLUDED."bin",
+                     "quantity" = EXCLUDED."quantity",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productinventory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
index 9c06fc15d6..42b3a5c52c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
@@ -105,4 +105,14 @@ class ProductinventoryRepoMock(toRow: Function1[ProductinventoryRowUnsaved, Prod
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductinventoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
index c0ae6041ae..6e090de5f1 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
@@ -30,4 +30,5 @@ trait ProductlistpricehistoryRepo {
   def update: UpdateBuilder[ProductlistpricehistoryFields, ProductlistpricehistoryRow]
   def update(row: ProductlistpricehistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductlistpricehistoryRow): ConnectionIO[ProductlistpricehistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductlistpricehistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
index 8db559386e..0c523ce210 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
@@ -135,4 +135,19 @@ class ProductlistpricehistoryRepoImpl extends ProductlistpricehistoryRepo {
           returning "productid", "startdate"::text, "enddate"::text, "listprice", "modifieddate"::text
        """.query(using ProductlistpricehistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductlistpricehistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productlistpricehistory_TEMP (like production.productlistpricehistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productlistpricehistory_TEMP("productid", "startdate", "enddate", "listprice", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductlistpricehistoryRow.text)
+      res <- sql"""insert into production.productlistpricehistory("productid", "startdate", "enddate", "listprice", "modifieddate")
+                   select * from productlistpricehistory_TEMP
+                   on conflict ("productid", "startdate")
+                   do update set
+                     "enddate" = EXCLUDED."enddate",
+                     "listprice" = EXCLUDED."listprice",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productlistpricehistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
index d56124d38d..a5bf0f85ba 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
@@ -105,4 +105,14 @@ class ProductlistpricehistoryRepoMock(toRow: Function1[ProductlistpricehistoryRo
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductlistpricehistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
index 5b87a5c973..d208761b69 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
@@ -30,4 +30,5 @@ trait ProductmodelRepo {
   def update: UpdateBuilder[ProductmodelFields, ProductmodelRow]
   def update(row: ProductmodelRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductmodelRow): ConnectionIO[ProductmodelRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
index ffce7940fa..f045e63b41 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
@@ -134,4 +134,21 @@ class ProductmodelRepoImpl extends ProductmodelRepo {
           returning "productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate"::text
        """.query(using ProductmodelRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productmodel_TEMP (like production.productmodel) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productmodel_TEMP("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductmodelRow.text)
+      res <- sql"""insert into production.productmodel("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate")
+                   select * from productmodel_TEMP
+                   on conflict ("productmodelid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "catalogdescription" = EXCLUDED."catalogdescription",
+                     "instructions" = EXCLUDED."instructions",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productmodel_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
index f27941dc84..6b008f17a1 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
@@ -105,4 +105,14 @@ class ProductmodelRepoMock(toRow: Function1[ProductmodelRowUnsaved, Productmodel
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productmodelid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
index eacb7fec25..eb020ea53d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
@@ -30,4 +30,5 @@ trait ProductmodelillustrationRepo {
   def update: UpdateBuilder[ProductmodelillustrationFields, ProductmodelillustrationRow]
   def update(row: ProductmodelillustrationRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductmodelillustrationRow): ConnectionIO[ProductmodelillustrationRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelillustrationRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
index e70731460a..8fd1cf1e28 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
@@ -127,4 +127,17 @@ class ProductmodelillustrationRepoImpl extends ProductmodelillustrationRepo {
           returning "productmodelid", "illustrationid", "modifieddate"::text
        """.query(using ProductmodelillustrationRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelillustrationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productmodelillustration_TEMP (like production.productmodelillustration) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productmodelillustration_TEMP("productmodelid", "illustrationid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductmodelillustrationRow.text)
+      res <- sql"""insert into production.productmodelillustration("productmodelid", "illustrationid", "modifieddate")
+                   select * from productmodelillustration_TEMP
+                   on conflict ("productmodelid", "illustrationid")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productmodelillustration_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
index 4454e0bfd2..9132f28acd 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
@@ -105,4 +105,14 @@ class ProductmodelillustrationRepoMock(toRow: Function1[Productmodelillustration
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelillustrationRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
index 49c91cc708..972b7c3ed6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
@@ -30,4 +30,5 @@ trait ProductmodelproductdescriptioncultureRepo {
   def update: UpdateBuilder[ProductmodelproductdescriptioncultureFields, ProductmodelproductdescriptioncultureRow]
   def update(row: ProductmodelproductdescriptioncultureRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductmodelproductdescriptioncultureRow): ConnectionIO[ProductmodelproductdescriptioncultureRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
index 943dbfa152..e266e51a23 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
@@ -132,4 +132,17 @@ class ProductmodelproductdescriptioncultureRepoImpl extends Productmodelproductd
           returning "productmodelid", "productdescriptionid", "cultureid", "modifieddate"::text
        """.query(using ProductmodelproductdescriptioncultureRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productmodelproductdescriptionculture_TEMP (like production.productmodelproductdescriptionculture) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productmodelproductdescriptionculture_TEMP("productmodelid", "productdescriptionid", "cultureid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductmodelproductdescriptioncultureRow.text)
+      res <- sql"""insert into production.productmodelproductdescriptionculture("productmodelid", "productdescriptionid", "cultureid", "modifieddate")
+                   select * from productmodelproductdescriptionculture_TEMP
+                   on conflict ("productmodelid", "productdescriptionid", "cultureid")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productmodelproductdescriptionculture_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
index 6774728e3e..5282ce770b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
@@ -105,4 +105,14 @@ class ProductmodelproductdescriptioncultureRepoMock(toRow: Function1[Productmode
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
index eb2dd313d7..e83895ba1f 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
@@ -30,4 +30,5 @@ trait ProductphotoRepo {
   def update: UpdateBuilder[ProductphotoFields, ProductphotoRow]
   def update(row: ProductphotoRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductphotoRow): ConnectionIO[ProductphotoRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductphotoRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
index fb10e15b04..97b14c04b4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
@@ -130,4 +130,21 @@ class ProductphotoRepoImpl extends ProductphotoRepo {
           returning "productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate"::text
        """.query(using ProductphotoRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductphotoRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productphoto_TEMP (like production.productphoto) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productphoto_TEMP("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductphotoRow.text)
+      res <- sql"""insert into production.productphoto("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate")
+                   select * from productphoto_TEMP
+                   on conflict ("productphotoid")
+                   do update set
+                     "thumbnailphoto" = EXCLUDED."thumbnailphoto",
+                     "thumbnailphotofilename" = EXCLUDED."thumbnailphotofilename",
+                     "largephoto" = EXCLUDED."largephoto",
+                     "largephotofilename" = EXCLUDED."largephotofilename",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productphoto_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
index 5c1f278516..3e8b23d730 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
@@ -105,4 +105,14 @@ class ProductphotoRepoMock(toRow: Function1[ProductphotoRowUnsaved, Productphoto
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductphotoRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productphotoid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
index b57a106ec4..25d7298a67 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
@@ -30,4 +30,5 @@ trait ProductproductphotoRepo {
   def update: UpdateBuilder[ProductproductphotoFields, ProductproductphotoRow]
   def update(row: ProductproductphotoRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductproductphotoRow): ConnectionIO[ProductproductphotoRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductproductphotoRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
index 57a57afaf1..8244177e61 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
@@ -135,4 +135,18 @@ class ProductproductphotoRepoImpl extends ProductproductphotoRepo {
           returning "productid", "productphotoid", "primary", "modifieddate"::text
        """.query(using ProductproductphotoRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductproductphotoRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productproductphoto_TEMP (like production.productproductphoto) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productproductphoto_TEMP("productid", "productphotoid", "primary", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductproductphotoRow.text)
+      res <- sql"""insert into production.productproductphoto("productid", "productphotoid", "primary", "modifieddate")
+                   select * from productproductphoto_TEMP
+                   on conflict ("productid", "productphotoid")
+                   do update set
+                     "primary" = EXCLUDED."primary",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productproductphoto_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
index d16a4b9bb5..0e26d8c853 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
@@ -105,4 +105,14 @@ class ProductproductphotoRepoMock(toRow: Function1[ProductproductphotoRowUnsaved
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductproductphotoRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
index 2fc839da12..7edd4c8c1a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
@@ -30,4 +30,5 @@ trait ProductreviewRepo {
   def update: UpdateBuilder[ProductreviewFields, ProductreviewRow]
   def update(row: ProductreviewRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductreviewRow): ConnectionIO[ProductreviewRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductreviewRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
index 9bb72aa514..93037c90ed 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
@@ -142,4 +142,23 @@ class ProductreviewRepoImpl extends ProductreviewRepo {
           returning "productreviewid", "productid", "reviewername", "reviewdate"::text, "emailaddress", "rating", "comments", "modifieddate"::text
        """.query(using ProductreviewRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductreviewRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productreview_TEMP (like production.productreview) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productreview_TEMP("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductreviewRow.text)
+      res <- sql"""insert into production.productreview("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate")
+                   select * from productreview_TEMP
+                   on conflict ("productreviewid")
+                   do update set
+                     "productid" = EXCLUDED."productid",
+                     "reviewername" = EXCLUDED."reviewername",
+                     "reviewdate" = EXCLUDED."reviewdate",
+                     "emailaddress" = EXCLUDED."emailaddress",
+                     "rating" = EXCLUDED."rating",
+                     "comments" = EXCLUDED."comments",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productreview_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
index 46a33caf89..ac133574f3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
@@ -105,4 +105,14 @@ class ProductreviewRepoMock(toRow: Function1[ProductreviewRowUnsaved, Productrev
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductreviewRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productreviewid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
index c5381c27ab..ff0383b32a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
@@ -30,4 +30,5 @@ trait ProductsubcategoryRepo {
   def update: UpdateBuilder[ProductsubcategoryFields, ProductsubcategoryRow]
   def update(row: ProductsubcategoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductsubcategoryRow): ConnectionIO[ProductsubcategoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductsubcategoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
index 895d5a4b96..92c262fae1 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
@@ -130,4 +130,20 @@ class ProductsubcategoryRepoImpl extends ProductsubcategoryRepo {
           returning "productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate"::text
        """.query(using ProductsubcategoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductsubcategoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productsubcategory_TEMP (like production.productsubcategory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productsubcategory_TEMP("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductsubcategoryRow.text)
+      res <- sql"""insert into production.productsubcategory("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate")
+                   select * from productsubcategory_TEMP
+                   on conflict ("productsubcategoryid")
+                   do update set
+                     "productcategoryid" = EXCLUDED."productcategoryid",
+                     "name" = EXCLUDED."name",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productsubcategory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
index d3bf0c6055..beb10d4200 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
@@ -105,4 +105,14 @@ class ProductsubcategoryRepoMock(toRow: Function1[ProductsubcategoryRowUnsaved,
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductsubcategoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.productsubcategoryid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
index 63e63855f0..0ad42a5941 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
@@ -30,4 +30,5 @@ trait ScrapreasonRepo {
   def update: UpdateBuilder[ScrapreasonFields, ScrapreasonRow]
   def update(row: ScrapreasonRow): ConnectionIO[Boolean]
   def upsert(unsaved: ScrapreasonRow): ConnectionIO[ScrapreasonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ScrapreasonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
index 08dd8d1f57..b6b3fa4553 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
@@ -117,4 +117,18 @@ class ScrapreasonRepoImpl extends ScrapreasonRepo {
           returning "scrapreasonid", "name", "modifieddate"::text
        """.query(using ScrapreasonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ScrapreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table scrapreason_TEMP (like production.scrapreason) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy scrapreason_TEMP("scrapreasonid", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ScrapreasonRow.text)
+      res <- sql"""insert into production.scrapreason("scrapreasonid", "name", "modifieddate")
+                   select * from scrapreason_TEMP
+                   on conflict ("scrapreasonid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table scrapreason_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
index 327f41aae4..34f0096876 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
@@ -105,4 +105,14 @@ class ScrapreasonRepoMock(toRow: Function1[ScrapreasonRowUnsaved, ScrapreasonRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ScrapreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.scrapreasonid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
index 1a2dd68217..a3e7f84588 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
@@ -30,4 +30,5 @@ trait TransactionhistoryRepo {
   def update: UpdateBuilder[TransactionhistoryFields, TransactionhistoryRow]
   def update(row: TransactionhistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: TransactionhistoryRow): ConnectionIO[TransactionhistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
index 83252db021..eb1c0bd4df 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
@@ -148,4 +148,24 @@ class TransactionhistoryRepoImpl extends TransactionhistoryRepo {
           returning "transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate"::text, "transactiontype", "quantity", "actualcost", "modifieddate"::text
        """.query(using TransactionhistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table transactionhistory_TEMP (like production.transactionhistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy transactionhistory_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using TransactionhistoryRow.text)
+      res <- sql"""insert into production.transactionhistory("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+                   select * from transactionhistory_TEMP
+                   on conflict ("transactionid")
+                   do update set
+                     "productid" = EXCLUDED."productid",
+                     "referenceorderid" = EXCLUDED."referenceorderid",
+                     "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+                     "transactiondate" = EXCLUDED."transactiondate",
+                     "transactiontype" = EXCLUDED."transactiontype",
+                     "quantity" = EXCLUDED."quantity",
+                     "actualcost" = EXCLUDED."actualcost",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table transactionhistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
index ed72c28afa..25c6b32068 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
@@ -105,4 +105,14 @@ class TransactionhistoryRepoMock(toRow: Function1[TransactionhistoryRowUnsaved,
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.transactionid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
index 13eac4daa4..d803343250 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
@@ -30,4 +30,5 @@ trait TransactionhistoryarchiveRepo {
   def update: UpdateBuilder[TransactionhistoryarchiveFields, TransactionhistoryarchiveRow]
   def update(row: TransactionhistoryarchiveRow): ConnectionIO[Boolean]
   def upsert(unsaved: TransactionhistoryarchiveRow): ConnectionIO[TransactionhistoryarchiveRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryarchiveRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
index c79c17c4f2..b0088934c0 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
@@ -144,4 +144,24 @@ class TransactionhistoryarchiveRepoImpl extends TransactionhistoryarchiveRepo {
           returning "transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate"::text, "transactiontype", "quantity", "actualcost", "modifieddate"::text
        """.query(using TransactionhistoryarchiveRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryarchiveRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table transactionhistoryarchive_TEMP (like production.transactionhistoryarchive) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy transactionhistoryarchive_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using TransactionhistoryarchiveRow.text)
+      res <- sql"""insert into production.transactionhistoryarchive("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+                   select * from transactionhistoryarchive_TEMP
+                   on conflict ("transactionid")
+                   do update set
+                     "productid" = EXCLUDED."productid",
+                     "referenceorderid" = EXCLUDED."referenceorderid",
+                     "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+                     "transactiondate" = EXCLUDED."transactiondate",
+                     "transactiontype" = EXCLUDED."transactiontype",
+                     "quantity" = EXCLUDED."quantity",
+                     "actualcost" = EXCLUDED."actualcost",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table transactionhistoryarchive_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
index 3114db3487..4b3f4dc451 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
@@ -105,4 +105,14 @@ class TransactionhistoryarchiveRepoMock(toRow: Function1[Transactionhistoryarchi
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, TransactionhistoryarchiveRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.transactionid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
index fc98c1f282..ac7cf90978 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
@@ -30,4 +30,5 @@ trait UnitmeasureRepo {
   def update: UpdateBuilder[UnitmeasureFields, UnitmeasureRow]
   def update(row: UnitmeasureRow): ConnectionIO[Boolean]
   def upsert(unsaved: UnitmeasureRow): ConnectionIO[UnitmeasureRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, UnitmeasureRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
index 4ac62d7c78..1e96ea68f6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
@@ -114,4 +114,18 @@ class UnitmeasureRepoImpl extends UnitmeasureRepo {
           returning "unitmeasurecode", "name", "modifieddate"::text
        """.query(using UnitmeasureRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, UnitmeasureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table unitmeasure_TEMP (like production.unitmeasure) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy unitmeasure_TEMP("unitmeasurecode", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using UnitmeasureRow.text)
+      res <- sql"""insert into production.unitmeasure("unitmeasurecode", "name", "modifieddate")
+                   select * from unitmeasure_TEMP
+                   on conflict ("unitmeasurecode")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table unitmeasure_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
index 9d6ff9e629..e05a28fad4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
@@ -105,4 +105,14 @@ class UnitmeasureRepoMock(toRow: Function1[UnitmeasureRowUnsaved, UnitmeasureRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, UnitmeasureRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.unitmeasurecode -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
index 1a92eb4ba9..40e9645096 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
@@ -30,4 +30,5 @@ trait WorkorderRepo {
   def update: UpdateBuilder[WorkorderFields, WorkorderRow]
   def update(row: WorkorderRow): ConnectionIO[Boolean]
   def upsert(unsaved: WorkorderRow): ConnectionIO[WorkorderRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
index 81dd795484..231f88e351 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
@@ -144,4 +144,24 @@ class WorkorderRepoImpl extends WorkorderRepo {
           returning "workorderid", "productid", "orderqty", "scrappedqty", "startdate"::text, "enddate"::text, "duedate"::text, "scrapreasonid", "modifieddate"::text
        """.query(using WorkorderRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table workorder_TEMP (like production.workorder) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy workorder_TEMP("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using WorkorderRow.text)
+      res <- sql"""insert into production.workorder("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate")
+                   select * from workorder_TEMP
+                   on conflict ("workorderid")
+                   do update set
+                     "productid" = EXCLUDED."productid",
+                     "orderqty" = EXCLUDED."orderqty",
+                     "scrappedqty" = EXCLUDED."scrappedqty",
+                     "startdate" = EXCLUDED."startdate",
+                     "enddate" = EXCLUDED."enddate",
+                     "duedate" = EXCLUDED."duedate",
+                     "scrapreasonid" = EXCLUDED."scrapreasonid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table workorder_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
index 98318108e5..eeeb8f842f 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
@@ -105,4 +105,14 @@ class WorkorderRepoMock(toRow: Function1[WorkorderRowUnsaved, WorkorderRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.workorderid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
index 57e3d06fbf..552c547651 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
@@ -30,4 +30,5 @@ trait WorkorderroutingRepo {
   def update: UpdateBuilder[WorkorderroutingFields, WorkorderroutingRow]
   def update(row: WorkorderroutingRow): ConnectionIO[Boolean]
   def upsert(unsaved: WorkorderroutingRow): ConnectionIO[WorkorderroutingRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderroutingRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
index 938e836f6d..fe1248bef3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
@@ -165,4 +165,25 @@ class WorkorderroutingRepoImpl extends WorkorderroutingRepo {
           returning "workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate"::text, "scheduledenddate"::text, "actualstartdate"::text, "actualenddate"::text, "actualresourcehrs", "plannedcost", "actualcost", "modifieddate"::text
        """.query(using WorkorderroutingRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderroutingRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table workorderrouting_TEMP (like production.workorderrouting) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy workorderrouting_TEMP("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using WorkorderroutingRow.text)
+      res <- sql"""insert into production.workorderrouting("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate")
+                   select * from workorderrouting_TEMP
+                   on conflict ("workorderid", "productid", "operationsequence")
+                   do update set
+                     "locationid" = EXCLUDED."locationid",
+                     "scheduledstartdate" = EXCLUDED."scheduledstartdate",
+                     "scheduledenddate" = EXCLUDED."scheduledenddate",
+                     "actualstartdate" = EXCLUDED."actualstartdate",
+                     "actualenddate" = EXCLUDED."actualenddate",
+                     "actualresourcehrs" = EXCLUDED."actualresourcehrs",
+                     "plannedcost" = EXCLUDED."plannedcost",
+                     "actualcost" = EXCLUDED."actualcost",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table workorderrouting_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
index f695135c50..093e8d7b5a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
@@ -105,4 +105,14 @@ class WorkorderroutingRepoMock(toRow: Function1[WorkorderroutingRowUnsaved, Work
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, WorkorderroutingRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
index 2f8a4a5a82..fbefb37399 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
@@ -27,4 +27,5 @@ trait FlaffRepo {
   def update: UpdateBuilder[FlaffFields, FlaffRow]
   def update(row: FlaffRow): ConnectionIO[Boolean]
   def upsert(unsaved: FlaffRow): ConnectionIO[FlaffRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, FlaffRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
index 83b99eb18b..c67ab397c6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
@@ -101,4 +101,17 @@ class FlaffRepoImpl extends FlaffRepo {
           returning "code", "another_code", "some_number", "specifier", "parentspecifier"
        """.query(using FlaffRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FlaffRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table flaff_TEMP (like public.flaff) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy flaff_TEMP("code", "another_code", "some_number", "specifier", "parentspecifier") from stdin""").copyIn(unsaved, batchSize)(using FlaffRow.text)
+      res <- sql"""insert into public.flaff("code", "another_code", "some_number", "specifier", "parentspecifier")
+                   select * from flaff_TEMP
+                   on conflict ("code", "another_code", "some_number", "specifier")
+                   do update set
+                     "parentspecifier" = EXCLUDED."parentspecifier"
+                   ;
+                   drop table flaff_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
index 3ecac6119f..1d411e8164 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
@@ -89,4 +89,14 @@ class FlaffRepoMock(map: scala.collection.mutable.Map[FlaffId, FlaffRow] = scala
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, FlaffRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
index 126c7aaa51..ed845ce5cf 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
@@ -30,4 +30,5 @@ trait IdentityTestRepo {
   def update: UpdateBuilder[IdentityTestFields, IdentityTestRow]
   def update(row: IdentityTestRow): ConnectionIO[Boolean]
   def upsert(unsaved: IdentityTestRow): ConnectionIO[IdentityTestRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, IdentityTestRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
index c54ae45a2c..474a538df3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
@@ -112,4 +112,18 @@ class IdentityTestRepoImpl extends IdentityTestRepo {
           returning "always_generated", "default_generated", "name"
        """.query(using IdentityTestRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, IdentityTestRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table identity-test_TEMP (like public.identity-test) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy identity-test_TEMP("always_generated", "default_generated", "name") from stdin""").copyIn(unsaved, batchSize)(using IdentityTestRow.text)
+      res <- sql"""insert into public.identity-test("always_generated", "default_generated", "name")
+                   select * from identity-test_TEMP
+                   on conflict ("name")
+                   do update set
+                     "always_generated" = EXCLUDED."always_generated",
+                     "default_generated" = EXCLUDED."default_generated"
+                   ;
+                   drop table identity-test_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
index 3635a9fc61..b820bfa1fa 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
@@ -105,4 +105,14 @@ class IdentityTestRepoMock(toRow: Function1[IdentityTestRowUnsaved, IdentityTest
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, IdentityTestRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.name -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
index d7f095e13a..8eb18b7a5e 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
@@ -32,4 +32,5 @@ trait UsersRepo {
   def update: UpdateBuilder[UsersFields, UsersRow]
   def update(row: UsersRow): ConnectionIO[Boolean]
   def upsert(unsaved: UsersRow): ConnectionIO[UsersRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, UsersRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
index 7df717b98c..64f3487b1c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
@@ -137,4 +137,22 @@ class UsersRepoImpl extends UsersRepo {
           returning "user_id", "name", "last_name", "email"::text, "password", "created_at"::text, "verified_on"::text
        """.query(using UsersRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, UsersRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table users_TEMP (like public.users) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy users_TEMP("user_id", "name", "last_name", "email", "password", "created_at", "verified_on") from stdin""").copyIn(unsaved, batchSize)(using UsersRow.text)
+      res <- sql"""insert into public.users("user_id", "name", "last_name", "email", "password", "created_at", "verified_on")
+                   select * from users_TEMP
+                   on conflict ("user_id")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "last_name" = EXCLUDED."last_name",
+                     "email" = EXCLUDED."email",
+                     "password" = EXCLUDED."password",
+                     "created_at" = EXCLUDED."created_at",
+                     "verified_on" = EXCLUDED."verified_on"
+                   ;
+                   drop table users_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
index 17c513c080..3a867bd9ca 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
@@ -109,4 +109,14 @@ class UsersRepoMock(toRow: Function1[UsersRowUnsaved, UsersRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, UsersRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.userId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
index 9fe44954c7..82d1c2ba25 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
@@ -30,4 +30,5 @@ trait ProductvendorRepo {
   def update: UpdateBuilder[ProductvendorFields, ProductvendorRow]
   def update(row: ProductvendorRow): ConnectionIO[Boolean]
   def upsert(unsaved: ProductvendorRow): ConnectionIO[ProductvendorRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ProductvendorRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
index b72c441973..6195bc3d59 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
@@ -161,4 +161,25 @@ class ProductvendorRepoImpl extends ProductvendorRepo {
           returning "productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate"::text, "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate"::text
        """.query(using ProductvendorRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductvendorRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table productvendor_TEMP (like purchasing.productvendor) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy productvendor_TEMP("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ProductvendorRow.text)
+      res <- sql"""insert into purchasing.productvendor("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate")
+                   select * from productvendor_TEMP
+                   on conflict ("productid", "businessentityid")
+                   do update set
+                     "averageleadtime" = EXCLUDED."averageleadtime",
+                     "standardprice" = EXCLUDED."standardprice",
+                     "lastreceiptcost" = EXCLUDED."lastreceiptcost",
+                     "lastreceiptdate" = EXCLUDED."lastreceiptdate",
+                     "minorderqty" = EXCLUDED."minorderqty",
+                     "maxorderqty" = EXCLUDED."maxorderqty",
+                     "onorderqty" = EXCLUDED."onorderqty",
+                     "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table productvendor_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
index 1a0511bf90..c13143cc4c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
@@ -105,4 +105,14 @@ class ProductvendorRepoMock(toRow: Function1[ProductvendorRowUnsaved, Productven
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ProductvendorRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
index 9d98ca58bd..774cc3b0c7 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
@@ -30,4 +30,5 @@ trait PurchaseorderheaderRepo {
   def update: UpdateBuilder[PurchaseorderheaderFields, PurchaseorderheaderRow]
   def update(row: PurchaseorderheaderRow): ConnectionIO[Boolean]
   def upsert(unsaved: PurchaseorderheaderRow): ConnectionIO[PurchaseorderheaderRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PurchaseorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
index 2231f92f45..2189b21840 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
@@ -174,4 +174,27 @@ class PurchaseorderheaderRepoImpl extends PurchaseorderheaderRepo {
           returning "purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate"::text, "shipdate"::text, "subtotal", "taxamt", "freight", "modifieddate"::text
        """.query(using PurchaseorderheaderRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PurchaseorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table purchaseorderheader_TEMP (like purchasing.purchaseorderheader) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy purchaseorderheader_TEMP("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PurchaseorderheaderRow.text)
+      res <- sql"""insert into purchasing.purchaseorderheader("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate")
+                   select * from purchaseorderheader_TEMP
+                   on conflict ("purchaseorderid")
+                   do update set
+                     "revisionnumber" = EXCLUDED."revisionnumber",
+                     "status" = EXCLUDED."status",
+                     "employeeid" = EXCLUDED."employeeid",
+                     "vendorid" = EXCLUDED."vendorid",
+                     "shipmethodid" = EXCLUDED."shipmethodid",
+                     "orderdate" = EXCLUDED."orderdate",
+                     "shipdate" = EXCLUDED."shipdate",
+                     "subtotal" = EXCLUDED."subtotal",
+                     "taxamt" = EXCLUDED."taxamt",
+                     "freight" = EXCLUDED."freight",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table purchaseorderheader_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
index 554a88c920..4ffe107af9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
@@ -105,4 +105,14 @@ class PurchaseorderheaderRepoMock(toRow: Function1[PurchaseorderheaderRowUnsaved
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PurchaseorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.purchaseorderid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
index 1e0e982125..279e3447b6 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
@@ -30,4 +30,5 @@ trait ShipmethodRepo {
   def update: UpdateBuilder[ShipmethodFields, ShipmethodRow]
   def update(row: ShipmethodRow): ConnectionIO[Boolean]
   def upsert(unsaved: ShipmethodRow): ConnectionIO[ShipmethodRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ShipmethodRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
index 65c02c86cb..a991a4d1dc 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
@@ -140,4 +140,21 @@ class ShipmethodRepoImpl extends ShipmethodRepo {
           returning "shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate"::text
        """.query(using ShipmethodRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShipmethodRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table shipmethod_TEMP (like purchasing.shipmethod) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy shipmethod_TEMP("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ShipmethodRow.text)
+      res <- sql"""insert into purchasing.shipmethod("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate")
+                   select * from shipmethod_TEMP
+                   on conflict ("shipmethodid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "shipbase" = EXCLUDED."shipbase",
+                     "shiprate" = EXCLUDED."shiprate",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table shipmethod_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
index a9772608db..4413c49043 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
@@ -105,4 +105,14 @@ class ShipmethodRepoMock(toRow: Function1[ShipmethodRowUnsaved, ShipmethodRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShipmethodRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.shipmethodid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
index 00bd84cf6f..8bcae200a0 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
@@ -31,4 +31,5 @@ trait VendorRepo {
   def update: UpdateBuilder[VendorFields, VendorRow]
   def update(row: VendorRow): ConnectionIO[Boolean]
   def upsert(unsaved: VendorRow): ConnectionIO[VendorRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, VendorRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
index 2b2288dc69..a9bf1520fe 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
@@ -145,4 +145,23 @@ class VendorRepoImpl extends VendorRepo {
           returning "businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate"::text
        """.query(using VendorRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, VendorRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table vendor_TEMP (like purchasing.vendor) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy vendor_TEMP("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using VendorRow.text)
+      res <- sql"""insert into purchasing.vendor("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate")
+                   select * from vendor_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "accountnumber" = EXCLUDED."accountnumber",
+                     "name" = EXCLUDED."name",
+                     "creditrating" = EXCLUDED."creditrating",
+                     "preferredvendorstatus" = EXCLUDED."preferredvendorstatus",
+                     "activeflag" = EXCLUDED."activeflag",
+                     "purchasingwebserviceurl" = EXCLUDED."purchasingwebserviceurl",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table vendor_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
index 2f573a7a05..2a340b8f41 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
@@ -106,4 +106,14 @@ class VendorRepoMock(toRow: Function1[VendorRowUnsaved, VendorRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, VendorRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
index 06424c6222..756f03c3c9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
@@ -30,4 +30,5 @@ trait CountryregioncurrencyRepo {
   def update: UpdateBuilder[CountryregioncurrencyFields, CountryregioncurrencyRow]
   def update(row: CountryregioncurrencyRow): ConnectionIO[Boolean]
   def upsert(unsaved: CountryregioncurrencyRow): ConnectionIO[CountryregioncurrencyRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregioncurrencyRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
index 87e4e74af4..330333d1bc 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
@@ -127,4 +127,17 @@ class CountryregioncurrencyRepoImpl extends CountryregioncurrencyRepo {
           returning "countryregioncode", "currencycode", "modifieddate"::text
        """.query(using CountryregioncurrencyRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregioncurrencyRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table countryregioncurrency_TEMP (like sales.countryregioncurrency) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy countryregioncurrency_TEMP("countryregioncode", "currencycode", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CountryregioncurrencyRow.text)
+      res <- sql"""insert into sales.countryregioncurrency("countryregioncode", "currencycode", "modifieddate")
+                   select * from countryregioncurrency_TEMP
+                   on conflict ("countryregioncode", "currencycode")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table countryregioncurrency_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
index 3076e5a2d6..7157fb14ed 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
@@ -105,4 +105,14 @@ class CountryregioncurrencyRepoMock(toRow: Function1[CountryregioncurrencyRowUns
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CountryregioncurrencyRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
index a9f293d7af..4ffedb0bcd 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
@@ -32,4 +32,5 @@ trait CreditcardRepo {
   def update: UpdateBuilder[CreditcardFields, CreditcardRow]
   def update(row: CreditcardRow): ConnectionIO[Boolean]
   def upsert(unsaved: CreditcardRow): ConnectionIO[CreditcardRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CreditcardRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
index 1dc0c0d389..e9a1bb6ba4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
@@ -132,4 +132,21 @@ class CreditcardRepoImpl extends CreditcardRepo {
           returning "creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate"::text
        """.query(using CreditcardRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CreditcardRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table creditcard_TEMP (like sales.creditcard) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy creditcard_TEMP("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CreditcardRow.text)
+      res <- sql"""insert into sales.creditcard("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate")
+                   select * from creditcard_TEMP
+                   on conflict ("creditcardid")
+                   do update set
+                     "cardtype" = EXCLUDED."cardtype",
+                     "cardnumber" = EXCLUDED."cardnumber",
+                     "expmonth" = EXCLUDED."expmonth",
+                     "expyear" = EXCLUDED."expyear",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table creditcard_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
index 64fab3b9ae..6840584f36 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
@@ -107,4 +107,14 @@ class CreditcardRepoMock(toRow: Function1[CreditcardRowUnsaved, CreditcardRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CreditcardRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.creditcardid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
index f9c279e711..61213212f4 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
@@ -30,4 +30,5 @@ trait CurrencyRepo {
   def update: UpdateBuilder[CurrencyFields, CurrencyRow]
   def update(row: CurrencyRow): ConnectionIO[Boolean]
   def upsert(unsaved: CurrencyRow): ConnectionIO[CurrencyRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
index 54c8e8d0c3..b427cfc8ec 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
@@ -114,4 +114,18 @@ class CurrencyRepoImpl extends CurrencyRepo {
           returning "currencycode", "name", "modifieddate"::text
        """.query(using CurrencyRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table currency_TEMP (like sales.currency) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy currency_TEMP("currencycode", "name", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CurrencyRow.text)
+      res <- sql"""insert into sales.currency("currencycode", "name", "modifieddate")
+                   select * from currency_TEMP
+                   on conflict ("currencycode")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table currency_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
index eb3d43fa12..672c753ba3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
@@ -105,4 +105,14 @@ class CurrencyRepoMock(toRow: Function1[CurrencyRowUnsaved, CurrencyRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.currencycode -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
index 22153e1ecb..26875c4e5d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
@@ -30,4 +30,5 @@ trait CurrencyrateRepo {
   def update: UpdateBuilder[CurrencyrateFields, CurrencyrateRow]
   def update(row: CurrencyrateRow): ConnectionIO[Boolean]
   def upsert(unsaved: CurrencyrateRow): ConnectionIO[CurrencyrateRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyrateRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
index 1e30d60652..04025cf86d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
@@ -134,4 +134,22 @@ class CurrencyrateRepoImpl extends CurrencyrateRepo {
           returning "currencyrateid", "currencyratedate"::text, "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate"::text
        """.query(using CurrencyrateRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyrateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table currencyrate_TEMP (like sales.currencyrate) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy currencyrate_TEMP("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CurrencyrateRow.text)
+      res <- sql"""insert into sales.currencyrate("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate")
+                   select * from currencyrate_TEMP
+                   on conflict ("currencyrateid")
+                   do update set
+                     "currencyratedate" = EXCLUDED."currencyratedate",
+                     "fromcurrencycode" = EXCLUDED."fromcurrencycode",
+                     "tocurrencycode" = EXCLUDED."tocurrencycode",
+                     "averagerate" = EXCLUDED."averagerate",
+                     "endofdayrate" = EXCLUDED."endofdayrate",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table currencyrate_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
index b40d4aede6..6299a85796 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
@@ -105,4 +105,14 @@ class CurrencyrateRepoMock(toRow: Function1[CurrencyrateRowUnsaved, Currencyrate
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CurrencyrateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.currencyrateid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
index dac21df469..a066983b6b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
@@ -30,4 +30,5 @@ trait CustomerRepo {
   def update: UpdateBuilder[CustomerFields, CustomerRow]
   def update(row: CustomerRow): ConnectionIO[Boolean]
   def upsert(unsaved: CustomerRow): ConnectionIO[CustomerRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, CustomerRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
index 5c18b33cce..07662b6077 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
@@ -134,4 +134,21 @@ class CustomerRepoImpl extends CustomerRepo {
           returning "customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate"::text
        """.query(using CustomerRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CustomerRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table customer_TEMP (like sales.customer) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy customer_TEMP("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using CustomerRow.text)
+      res <- sql"""insert into sales.customer("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate")
+                   select * from customer_TEMP
+                   on conflict ("customerid")
+                   do update set
+                     "personid" = EXCLUDED."personid",
+                     "storeid" = EXCLUDED."storeid",
+                     "territoryid" = EXCLUDED."territoryid",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table customer_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
index bd608e1289..b590576b78 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
@@ -105,4 +105,14 @@ class CustomerRepoMock(toRow: Function1[CustomerRowUnsaved, CustomerRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, CustomerRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.customerid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
index de08af799e..f6b92cea67 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
@@ -32,4 +32,5 @@ trait PersoncreditcardRepo {
   def update: UpdateBuilder[PersoncreditcardFields, PersoncreditcardRow]
   def update(row: PersoncreditcardRow): ConnectionIO[Boolean]
   def upsert(unsaved: PersoncreditcardRow): ConnectionIO[PersoncreditcardRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, PersoncreditcardRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
index 4fe9f85a06..d4a636f9cb 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
@@ -128,4 +128,17 @@ class PersoncreditcardRepoImpl extends PersoncreditcardRepo {
           returning "businessentityid", "creditcardid", "modifieddate"::text
        """.query(using PersoncreditcardRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersoncreditcardRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table personcreditcard_TEMP (like sales.personcreditcard) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy personcreditcard_TEMP("businessentityid", "creditcardid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using PersoncreditcardRow.text)
+      res <- sql"""insert into sales.personcreditcard("businessentityid", "creditcardid", "modifieddate")
+                   select * from personcreditcard_TEMP
+                   on conflict ("businessentityid", "creditcardid")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table personcreditcard_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
index 6e43d0bccf..b0ba5efb33 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
@@ -107,4 +107,14 @@ class PersoncreditcardRepoMock(toRow: Function1[PersoncreditcardRowUnsaved, Pers
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, PersoncreditcardRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
index 6487ee6453..b07744857b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
@@ -30,4 +30,5 @@ trait SalesorderdetailRepo {
   def update: UpdateBuilder[SalesorderdetailFields, SalesorderdetailRow]
   def update(row: SalesorderdetailRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesorderdetailRow): ConnectionIO[SalesorderdetailRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderdetailRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
index 6412a597c4..1ae10ccd75 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
@@ -168,4 +168,24 @@ class SalesorderdetailRepoImpl extends SalesorderdetailRepo {
           returning "salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate"::text
        """.query(using SalesorderdetailRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderdetailRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesorderdetail_TEMP (like sales.salesorderdetail) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesorderdetail_TEMP("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesorderdetailRow.text)
+      res <- sql"""insert into sales.salesorderdetail("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate")
+                   select * from salesorderdetail_TEMP
+                   on conflict ("salesorderid", "salesorderdetailid")
+                   do update set
+                     "carriertrackingnumber" = EXCLUDED."carriertrackingnumber",
+                     "orderqty" = EXCLUDED."orderqty",
+                     "productid" = EXCLUDED."productid",
+                     "specialofferid" = EXCLUDED."specialofferid",
+                     "unitprice" = EXCLUDED."unitprice",
+                     "unitpricediscount" = EXCLUDED."unitpricediscount",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesorderdetail_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
index 54cae19efc..449928c1c1 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
@@ -105,4 +105,14 @@ class SalesorderdetailRepoMock(toRow: Function1[SalesorderdetailRowUnsaved, Sale
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderdetailRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
index 1b3c94bdca..edf2b2e13d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
@@ -30,4 +30,5 @@ trait SalesorderheaderRepo {
   def update: UpdateBuilder[SalesorderheaderFields, SalesorderheaderRow]
   def update(row: SalesorderheaderRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesorderheaderRow): ConnectionIO[SalesorderheaderRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
index 8849fb8e6d..1b5776349a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
@@ -241,4 +241,40 @@ class SalesorderheaderRepoImpl extends SalesorderheaderRepo {
           returning "salesorderid", "revisionnumber", "orderdate"::text, "duedate"::text, "shipdate"::text, "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate"::text
        """.query(using SalesorderheaderRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesorderheader_TEMP (like sales.salesorderheader) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesorderheader_TEMP("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesorderheaderRow.text)
+      res <- sql"""insert into sales.salesorderheader("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate")
+                   select * from salesorderheader_TEMP
+                   on conflict ("salesorderid")
+                   do update set
+                     "revisionnumber" = EXCLUDED."revisionnumber",
+                     "orderdate" = EXCLUDED."orderdate",
+                     "duedate" = EXCLUDED."duedate",
+                     "shipdate" = EXCLUDED."shipdate",
+                     "status" = EXCLUDED."status",
+                     "onlineorderflag" = EXCLUDED."onlineorderflag",
+                     "purchaseordernumber" = EXCLUDED."purchaseordernumber",
+                     "accountnumber" = EXCLUDED."accountnumber",
+                     "customerid" = EXCLUDED."customerid",
+                     "salespersonid" = EXCLUDED."salespersonid",
+                     "territoryid" = EXCLUDED."territoryid",
+                     "billtoaddressid" = EXCLUDED."billtoaddressid",
+                     "shiptoaddressid" = EXCLUDED."shiptoaddressid",
+                     "shipmethodid" = EXCLUDED."shipmethodid",
+                     "creditcardid" = EXCLUDED."creditcardid",
+                     "creditcardapprovalcode" = EXCLUDED."creditcardapprovalcode",
+                     "currencyrateid" = EXCLUDED."currencyrateid",
+                     "subtotal" = EXCLUDED."subtotal",
+                     "taxamt" = EXCLUDED."taxamt",
+                     "freight" = EXCLUDED."freight",
+                     "totaldue" = EXCLUDED."totaldue",
+                     "comment" = EXCLUDED."comment",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesorderheader_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
index 5fb9337641..d81a6808ac 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
@@ -105,4 +105,14 @@ class SalesorderheaderRepoMock(toRow: Function1[SalesorderheaderRowUnsaved, Sale
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheaderRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.salesorderid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
index 8864be3256..403aeea04e 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
@@ -30,4 +30,5 @@ trait SalesorderheadersalesreasonRepo {
   def update: UpdateBuilder[SalesorderheadersalesreasonFields, SalesorderheadersalesreasonRow]
   def update(row: SalesorderheadersalesreasonRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesorderheadersalesreasonRow): ConnectionIO[SalesorderheadersalesreasonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
index 52dcdb1049..861a4c50dc 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
@@ -127,4 +127,17 @@ class SalesorderheadersalesreasonRepoImpl extends SalesorderheadersalesreasonRep
           returning "salesorderid", "salesreasonid", "modifieddate"::text
        """.query(using SalesorderheadersalesreasonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesorderheadersalesreason_TEMP (like sales.salesorderheadersalesreason) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesorderheadersalesreason_TEMP("salesorderid", "salesreasonid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesorderheadersalesreasonRow.text)
+      res <- sql"""insert into sales.salesorderheadersalesreason("salesorderid", "salesreasonid", "modifieddate")
+                   select * from salesorderheadersalesreason_TEMP
+                   on conflict ("salesorderid", "salesreasonid")
+                   do update set
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesorderheadersalesreason_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
index ad6c685410..c8db6710cd 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
@@ -105,4 +105,14 @@ class SalesorderheadersalesreasonRepoMock(toRow: Function1[Salesorderheadersales
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
index 341a512333..93510dd536 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
@@ -31,4 +31,5 @@ trait SalespersonRepo {
   def update: UpdateBuilder[SalespersonFields, SalespersonRow]
   def update(row: SalespersonRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalespersonRow): ConnectionIO[SalespersonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
index 4f75c59481..2a48c3e55a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
@@ -156,4 +156,24 @@ class SalespersonRepoImpl extends SalespersonRepo {
           returning "businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate"::text
        """.query(using SalespersonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesperson_TEMP (like sales.salesperson) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesperson_TEMP("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalespersonRow.text)
+      res <- sql"""insert into sales.salesperson("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate")
+                   select * from salesperson_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "territoryid" = EXCLUDED."territoryid",
+                     "salesquota" = EXCLUDED."salesquota",
+                     "bonus" = EXCLUDED."bonus",
+                     "commissionpct" = EXCLUDED."commissionpct",
+                     "salesytd" = EXCLUDED."salesytd",
+                     "saleslastyear" = EXCLUDED."saleslastyear",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesperson_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
index e75ed30d60..d0f0785900 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
@@ -106,4 +106,14 @@ class SalespersonRepoMock(toRow: Function1[SalespersonRowUnsaved, SalespersonRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
index 79628947da..d5ae05c04c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
@@ -30,4 +30,5 @@ trait SalespersonquotahistoryRepo {
   def update: UpdateBuilder[SalespersonquotahistoryFields, SalespersonquotahistoryRow]
   def update(row: SalespersonquotahistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalespersonquotahistoryRow): ConnectionIO[SalespersonquotahistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonquotahistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
index a7d71b7910..96185b81ce 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
@@ -139,4 +139,19 @@ class SalespersonquotahistoryRepoImpl extends SalespersonquotahistoryRepo {
           returning "businessentityid", "quotadate"::text, "salesquota", "rowguid", "modifieddate"::text
        """.query(using SalespersonquotahistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonquotahistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salespersonquotahistory_TEMP (like sales.salespersonquotahistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salespersonquotahistory_TEMP("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalespersonquotahistoryRow.text)
+      res <- sql"""insert into sales.salespersonquotahistory("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate")
+                   select * from salespersonquotahistory_TEMP
+                   on conflict ("businessentityid", "quotadate")
+                   do update set
+                     "salesquota" = EXCLUDED."salesquota",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salespersonquotahistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
index 98fe9ed526..1a9a0141f9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
@@ -105,4 +105,14 @@ class SalespersonquotahistoryRepoMock(toRow: Function1[SalespersonquotahistoryRo
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalespersonquotahistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
index 8a2230c8ac..e858f0790c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
@@ -30,4 +30,5 @@ trait SalesreasonRepo {
   def update: UpdateBuilder[SalesreasonFields, SalesreasonRow]
   def update(row: SalesreasonRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesreasonRow): ConnectionIO[SalesreasonRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
index 17475479b2..65316aface 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
@@ -121,4 +121,19 @@ class SalesreasonRepoImpl extends SalesreasonRepo {
           returning "salesreasonid", "name", "reasontype", "modifieddate"::text
        """.query(using SalesreasonRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesreason_TEMP (like sales.salesreason) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesreason_TEMP("salesreasonid", "name", "reasontype", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesreasonRow.text)
+      res <- sql"""insert into sales.salesreason("salesreasonid", "name", "reasontype", "modifieddate")
+                   select * from salesreason_TEMP
+                   on conflict ("salesreasonid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "reasontype" = EXCLUDED."reasontype",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesreason_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
index a064554838..329690b8cc 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
@@ -105,4 +105,14 @@ class SalesreasonRepoMock(toRow: Function1[SalesreasonRowUnsaved, SalesreasonRow
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesreasonRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.salesreasonid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
index 52e375556f..65a194fe78 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
@@ -30,4 +30,5 @@ trait SalestaxrateRepo {
   def update: UpdateBuilder[SalestaxrateFields, SalestaxrateRow]
   def update(row: SalestaxrateRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalestaxrateRow): ConnectionIO[SalestaxrateRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalestaxrateRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
index cf414d28ac..ff5fdbb4de 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
@@ -143,4 +143,22 @@ class SalestaxrateRepoImpl extends SalestaxrateRepo {
           returning "salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate"::text
        """.query(using SalestaxrateRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalestaxrateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salestaxrate_TEMP (like sales.salestaxrate) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salestaxrate_TEMP("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalestaxrateRow.text)
+      res <- sql"""insert into sales.salestaxrate("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate")
+                   select * from salestaxrate_TEMP
+                   on conflict ("salestaxrateid")
+                   do update set
+                     "stateprovinceid" = EXCLUDED."stateprovinceid",
+                     "taxtype" = EXCLUDED."taxtype",
+                     "taxrate" = EXCLUDED."taxrate",
+                     "name" = EXCLUDED."name",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salestaxrate_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
index ab6ff6bfda..9552a7dae7 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
@@ -105,4 +105,14 @@ class SalestaxrateRepoMock(toRow: Function1[SalestaxrateRowUnsaved, Salestaxrate
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalestaxrateRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.salestaxrateid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
index 4d6976a24d..0870a9298d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
@@ -30,4 +30,5 @@ trait SalesterritoryRepo {
   def update: UpdateBuilder[SalesterritoryFields, SalesterritoryRow]
   def update(row: SalesterritoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesterritoryRow): ConnectionIO[SalesterritoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
index ca9268c0e4..f84db2db30 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
@@ -163,4 +163,25 @@ class SalesterritoryRepoImpl extends SalesterritoryRepo {
           returning "territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate"::text
        """.query(using SalesterritoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesterritory_TEMP (like sales.salesterritory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesterritory_TEMP("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesterritoryRow.text)
+      res <- sql"""insert into sales.salesterritory("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate")
+                   select * from salesterritory_TEMP
+                   on conflict ("territoryid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "countryregioncode" = EXCLUDED."countryregioncode",
+                     "group" = EXCLUDED."group",
+                     "salesytd" = EXCLUDED."salesytd",
+                     "saleslastyear" = EXCLUDED."saleslastyear",
+                     "costytd" = EXCLUDED."costytd",
+                     "costlastyear" = EXCLUDED."costlastyear",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesterritory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
index f00de79f98..413f69b7af 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
@@ -105,4 +105,14 @@ class SalesterritoryRepoMock(toRow: Function1[SalesterritoryRowUnsaved, Salester
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.territoryid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
index 5d987ea579..bac7c6c09c 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
@@ -30,4 +30,5 @@ trait SalesterritoryhistoryRepo {
   def update: UpdateBuilder[SalesterritoryhistoryFields, SalesterritoryhistoryRow]
   def update(row: SalesterritoryhistoryRow): ConnectionIO[Boolean]
   def upsert(unsaved: SalesterritoryhistoryRow): ConnectionIO[SalesterritoryhistoryRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryhistoryRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
index acfda57883..9f3714149d 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
@@ -143,4 +143,19 @@ class SalesterritoryhistoryRepoImpl extends SalesterritoryhistoryRepo {
           returning "businessentityid", "territoryid", "startdate"::text, "enddate"::text, "rowguid", "modifieddate"::text
        """.query(using SalesterritoryhistoryRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table salesterritoryhistory_TEMP (like sales.salesterritoryhistory) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy salesterritoryhistory_TEMP("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SalesterritoryhistoryRow.text)
+      res <- sql"""insert into sales.salesterritoryhistory("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate")
+                   select * from salesterritoryhistory_TEMP
+                   on conflict ("businessentityid", "startdate", "territoryid")
+                   do update set
+                     "enddate" = EXCLUDED."enddate",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table salesterritoryhistory_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
index 6d53b74a01..b6fdde4feb 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
@@ -105,4 +105,14 @@ class SalesterritoryhistoryRepoMock(toRow: Function1[SalesterritoryhistoryRowUns
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SalesterritoryhistoryRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
index baeb0de874..bf4fd31230 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
@@ -30,4 +30,5 @@ trait ShoppingcartitemRepo {
   def update: UpdateBuilder[ShoppingcartitemFields, ShoppingcartitemRow]
   def update(row: ShoppingcartitemRow): ConnectionIO[Boolean]
   def upsert(unsaved: ShoppingcartitemRow): ConnectionIO[ShoppingcartitemRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, ShoppingcartitemRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
index a97979b8b9..afaf8c785a 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
@@ -136,4 +136,21 @@ class ShoppingcartitemRepoImpl extends ShoppingcartitemRepo {
           returning "shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated"::text, "modifieddate"::text
        """.query(using ShoppingcartitemRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShoppingcartitemRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table shoppingcartitem_TEMP (like sales.shoppingcartitem) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy shoppingcartitem_TEMP("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using ShoppingcartitemRow.text)
+      res <- sql"""insert into sales.shoppingcartitem("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate")
+                   select * from shoppingcartitem_TEMP
+                   on conflict ("shoppingcartitemid")
+                   do update set
+                     "shoppingcartid" = EXCLUDED."shoppingcartid",
+                     "quantity" = EXCLUDED."quantity",
+                     "productid" = EXCLUDED."productid",
+                     "datecreated" = EXCLUDED."datecreated",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table shoppingcartitem_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
index 836e569270..45d0a87227 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
@@ -105,4 +105,14 @@ class ShoppingcartitemRepoMock(toRow: Function1[ShoppingcartitemRowUnsaved, Shop
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, ShoppingcartitemRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.shoppingcartitemid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
index b82db537e3..cfc49e071b 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
@@ -30,4 +30,5 @@ trait SpecialofferRepo {
   def update: UpdateBuilder[SpecialofferFields, SpecialofferRow]
   def update(row: SpecialofferRow): ConnectionIO[Boolean]
   def upsert(unsaved: SpecialofferRow): ConnectionIO[SpecialofferRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
index 581558fc84..98ccc20777 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
@@ -159,4 +159,26 @@ class SpecialofferRepoImpl extends SpecialofferRepo {
           returning "specialofferid", "description", "discountpct", "type", "category", "startdate"::text, "enddate"::text, "minqty", "maxqty", "rowguid", "modifieddate"::text
        """.query(using SpecialofferRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table specialoffer_TEMP (like sales.specialoffer) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy specialoffer_TEMP("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SpecialofferRow.text)
+      res <- sql"""insert into sales.specialoffer("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate")
+                   select * from specialoffer_TEMP
+                   on conflict ("specialofferid")
+                   do update set
+                     "description" = EXCLUDED."description",
+                     "discountpct" = EXCLUDED."discountpct",
+                     "type" = EXCLUDED."type",
+                     "category" = EXCLUDED."category",
+                     "startdate" = EXCLUDED."startdate",
+                     "enddate" = EXCLUDED."enddate",
+                     "minqty" = EXCLUDED."minqty",
+                     "maxqty" = EXCLUDED."maxqty",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table specialoffer_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
index 94c9454314..f228776956 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
@@ -105,4 +105,14 @@ class SpecialofferRepoMock(toRow: Function1[SpecialofferRowUnsaved, Specialoffer
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.specialofferid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
index ee69f3980a..54b0389dd3 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
@@ -30,4 +30,5 @@ trait SpecialofferproductRepo {
   def update: UpdateBuilder[SpecialofferproductFields, SpecialofferproductRow]
   def update(row: SpecialofferproductRow): ConnectionIO[Boolean]
   def upsert(unsaved: SpecialofferproductRow): ConnectionIO[SpecialofferproductRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferproductRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
index d2f8afaca8..705642ca65 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
@@ -135,4 +135,18 @@ class SpecialofferproductRepoImpl extends SpecialofferproductRepo {
           returning "specialofferid", "productid", "rowguid", "modifieddate"::text
        """.query(using SpecialofferproductRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferproductRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table specialofferproduct_TEMP (like sales.specialofferproduct) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy specialofferproduct_TEMP("specialofferid", "productid", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using SpecialofferproductRow.text)
+      res <- sql"""insert into sales.specialofferproduct("specialofferid", "productid", "rowguid", "modifieddate")
+                   select * from specialofferproduct_TEMP
+                   on conflict ("specialofferid", "productid")
+                   do update set
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table specialofferproduct_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
index 80f3069eb3..5daf746817 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
@@ -105,4 +105,14 @@ class SpecialofferproductRepoMock(toRow: Function1[SpecialofferproductRowUnsaved
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, SpecialofferproductRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.compositeId -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
index 756b16f640..452cf64676 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
@@ -31,4 +31,5 @@ trait StoreRepo {
   def update: UpdateBuilder[StoreFields, StoreRow]
   def update(row: StoreRow): ConnectionIO[Boolean]
   def upsert(unsaved: StoreRow): ConnectionIO[StoreRow]
+  def upsertStreaming(unsaved: Stream[ConnectionIO, StoreRow], batchSize: Int = 10000): ConnectionIO[Int]
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
index 6f22544a27..d0167cb3c9 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
@@ -132,4 +132,21 @@ class StoreRepoImpl extends StoreRepo {
           returning "businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate"::text
        """.query(using StoreRow.read).unique
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, StoreRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    for {
+      _ <- sql"create temporary table store_TEMP (like sales.store) on commit drop".update.run
+      _ <- new FragmentOps(sql"""copy store_TEMP("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate") from stdin""").copyIn(unsaved, batchSize)(using StoreRow.text)
+      res <- sql"""insert into sales.store("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate")
+                   select * from store_TEMP
+                   on conflict ("businessentityid")
+                   do update set
+                     "name" = EXCLUDED."name",
+                     "salespersonid" = EXCLUDED."salespersonid",
+                     "demographics" = EXCLUDED."demographics",
+                     "rowguid" = EXCLUDED."rowguid",
+                     "modifieddate" = EXCLUDED."modifieddate"
+                   ;
+                   drop table store_TEMP;""".update.run
+    } yield res
+  }
 }
diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
index 4ab86e04d6..0f9a0c4106 100644
--- a/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
+++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
@@ -106,4 +106,14 @@ class StoreRepoMock(toRow: Function1[StoreRowUnsaved, StoreRow],
       unsaved
     }
   }
+  override def upsertStreaming(unsaved: Stream[ConnectionIO, StoreRow], batchSize: Int = 10000): ConnectionIO[Int] = {
+    unsaved.compile.toList.map { rows =>
+      var num = 0
+      rows.foreach { row =>
+        map += (row.businessentityid -> row)
+        num += 1
+      }
+      num
+    }
+  }
 }
diff --git a/typo-tester-doobie/src/scala/adventureworks/production/product/RepoTest.scala b/typo-tester-doobie/src/scala/adventureworks/production/product/RepoTest.scala
new file mode 100644
index 0000000000..32a10a59a4
--- /dev/null
+++ b/typo-tester-doobie/src/scala/adventureworks/production/product/RepoTest.scala
@@ -0,0 +1,29 @@
+package adventureworks.production.product
+
+import adventureworks.customtypes.*
+import adventureworks.production.unitmeasure.*
+import adventureworks.public.Name
+import adventureworks.{SnapshotTest, withConnection}
+import org.scalatest.Assertion
+
+class RepoTest extends SnapshotTest {
+  def runTest(unitmeasureRepo: UnitmeasureRepo): Assertion =
+    withConnection {
+      for {
+        um1 <- unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg1"), name = Name("name1")))
+        um2 <- unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg2"), name = Name("name2")))
+        um1a = um1.copy(name = Name("name1a"))
+        um2a = um2.copy(name = Name("name2a"))
+        _ <- unitmeasureRepo.upsertStreaming(fs2.Stream(um1a, um2a))
+        all <- unitmeasureRepo.selectAll.compile.toList
+      } yield assert(List(um1a, um2a) == all.sortBy(_.name))
+    }
+
+  test("in-memory") {
+    runTest(new UnitmeasureRepoMock(_.toRow(TypoLocalDateTime.now)))
+  }
+
+  test("pg") {
+    runTest(new UnitmeasureRepoImpl)
+  }
+}
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
index df273e5148..fb49cceba8 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepo.scala
@@ -32,4 +32,5 @@ trait DepartmentRepo {
   def update: UpdateBuilder[DepartmentFields, DepartmentRow]
   def update(row: DepartmentRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: DepartmentRow): ZIO[ZConnection, Throwable, UpdateResult[DepartmentRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DepartmentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
index 58d12700aa..55623f4a55 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoImpl.scala
@@ -115,4 +115,18 @@ class DepartmentRepoImpl extends DepartmentRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "departmentid", "name", "groupname", "modifieddate"::text""".insertReturning(using DepartmentRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DepartmentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table department_TEMP (like humanresources.department) on commit drop".execute
+    val copied = streamingInsert(s"""copy department_TEMP("departmentid", "name", "groupname", "modifieddate") from stdin""", batchSize, unsaved)(DepartmentRow.text)
+    val merged = sql"""insert into humanresources.department("departmentid", "name", "groupname", "modifieddate")
+                       select * from department_TEMP
+                       on conflict ("departmentid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "groupname" = EXCLUDED."groupname",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table department_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
index 6cae265935..18199d3764 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/department/DepartmentRepoMock.scala
@@ -104,4 +104,12 @@ class DepartmentRepoMock(toRow: Function1[DepartmentRowUnsaved, DepartmentRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DepartmentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.departmentid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
index 10c985d53b..99087c7f9c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepo.scala
@@ -33,4 +33,5 @@ trait EmployeeRepo {
   def update: UpdateBuilder[EmployeeFields, EmployeeRow]
   def update(row: EmployeeRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: EmployeeRow): ZIO[ZConnection, Throwable, UpdateResult[EmployeeRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
index c89d7b34f0..cc5aa146fc 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoImpl.scala
@@ -179,4 +179,29 @@ class EmployeeRepoImpl extends EmployeeRepo {
             "organizationnode" = EXCLUDED."organizationnode"
           returning "businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate"::text, "maritalstatus", "gender", "hiredate"::text, "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate"::text, "organizationnode"""".insertReturning(using EmployeeRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table employee_TEMP (like humanresources.employee) on commit drop".execute
+    val copied = streamingInsert(s"""copy employee_TEMP("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode") from stdin""", batchSize, unsaved)(EmployeeRow.text)
+    val merged = sql"""insert into humanresources.employee("businessentityid", "nationalidnumber", "loginid", "jobtitle", "birthdate", "maritalstatus", "gender", "hiredate", "salariedflag", "vacationhours", "sickleavehours", "currentflag", "rowguid", "modifieddate", "organizationnode")
+                       select * from employee_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "nationalidnumber" = EXCLUDED."nationalidnumber",
+                         "loginid" = EXCLUDED."loginid",
+                         "jobtitle" = EXCLUDED."jobtitle",
+                         "birthdate" = EXCLUDED."birthdate",
+                         "maritalstatus" = EXCLUDED."maritalstatus",
+                         "gender" = EXCLUDED."gender",
+                         "hiredate" = EXCLUDED."hiredate",
+                         "salariedflag" = EXCLUDED."salariedflag",
+                         "vacationhours" = EXCLUDED."vacationhours",
+                         "sickleavehours" = EXCLUDED."sickleavehours",
+                         "currentflag" = EXCLUDED."currentflag",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate",
+                         "organizationnode" = EXCLUDED."organizationnode"
+                       ;
+                       drop table employee_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
index 2ba6e9ec16..f301c56d17 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employee/EmployeeRepoMock.scala
@@ -105,4 +105,12 @@ class EmployeeRepoMock(toRow: Function1[EmployeeRowUnsaved, EmployeeRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
index 11c6bd2c2e..ecfb6edebc 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepo.scala
@@ -32,4 +32,5 @@ trait EmployeedepartmenthistoryRepo {
   def update: UpdateBuilder[EmployeedepartmenthistoryFields, EmployeedepartmenthistoryRow]
   def update(row: EmployeedepartmenthistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: EmployeedepartmenthistoryRow): ZIO[ZConnection, Throwable, UpdateResult[EmployeedepartmenthistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
index 1d659a7a79..b557861b6c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoImpl.scala
@@ -136,4 +136,17 @@ class EmployeedepartmenthistoryRepoImpl extends EmployeedepartmenthistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "departmentid", "shiftid", "startdate"::text, "enddate"::text, "modifieddate"::text""".insertReturning(using EmployeedepartmenthistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table employeedepartmenthistory_TEMP (like humanresources.employeedepartmenthistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy employeedepartmenthistory_TEMP("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate") from stdin""", batchSize, unsaved)(EmployeedepartmenthistoryRow.text)
+    val merged = sql"""insert into humanresources.employeedepartmenthistory("businessentityid", "departmentid", "shiftid", "startdate", "enddate", "modifieddate")
+                       select * from employeedepartmenthistory_TEMP
+                       on conflict ("businessentityid", "startdate", "departmentid", "shiftid")
+                       do update set
+                         "enddate" = EXCLUDED."enddate",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table employeedepartmenthistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
index 22d4573729..d6cd998e2f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeedepartmenthistory/EmployeedepartmenthistoryRepoMock.scala
@@ -104,4 +104,12 @@ class EmployeedepartmenthistoryRepoMock(toRow: Function1[Employeedepartmenthisto
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeedepartmenthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
index a2ebfdd44e..f17d99e236 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepo.scala
@@ -32,4 +32,5 @@ trait EmployeepayhistoryRepo {
   def update: UpdateBuilder[EmployeepayhistoryFields, EmployeepayhistoryRow]
   def update(row: EmployeepayhistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: EmployeepayhistoryRow): ZIO[ZConnection, Throwable, UpdateResult[EmployeepayhistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeepayhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
index aa095755eb..dc5261748e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoImpl.scala
@@ -130,4 +130,18 @@ class EmployeepayhistoryRepoImpl extends EmployeepayhistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "ratechangedate"::text, "rate", "payfrequency", "modifieddate"::text""".insertReturning(using EmployeepayhistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeepayhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table employeepayhistory_TEMP (like humanresources.employeepayhistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy employeepayhistory_TEMP("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate") from stdin""", batchSize, unsaved)(EmployeepayhistoryRow.text)
+    val merged = sql"""insert into humanresources.employeepayhistory("businessentityid", "ratechangedate", "rate", "payfrequency", "modifieddate")
+                       select * from employeepayhistory_TEMP
+                       on conflict ("businessentityid", "ratechangedate")
+                       do update set
+                         "rate" = EXCLUDED."rate",
+                         "payfrequency" = EXCLUDED."payfrequency",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table employeepayhistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
index beb692a78c..e426ef301d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/employeepayhistory/EmployeepayhistoryRepoMock.scala
@@ -104,4 +104,12 @@ class EmployeepayhistoryRepoMock(toRow: Function1[EmployeepayhistoryRowUnsaved,
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmployeepayhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
index d5e2d8f49d..5c0db8d2c9 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepo.scala
@@ -32,4 +32,5 @@ trait JobcandidateRepo {
   def update: UpdateBuilder[JobcandidateFields, JobcandidateRow]
   def update(row: JobcandidateRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: JobcandidateRow): ZIO[ZConnection, Throwable, UpdateResult[JobcandidateRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, JobcandidateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
index df014bfa1a..2ce094fedf 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoImpl.scala
@@ -117,4 +117,18 @@ class JobcandidateRepoImpl extends JobcandidateRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "jobcandidateid", "businessentityid", "resume", "modifieddate"::text""".insertReturning(using JobcandidateRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, JobcandidateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table jobcandidate_TEMP (like humanresources.jobcandidate) on commit drop".execute
+    val copied = streamingInsert(s"""copy jobcandidate_TEMP("jobcandidateid", "businessentityid", "resume", "modifieddate") from stdin""", batchSize, unsaved)(JobcandidateRow.text)
+    val merged = sql"""insert into humanresources.jobcandidate("jobcandidateid", "businessentityid", "resume", "modifieddate")
+                       select * from jobcandidate_TEMP
+                       on conflict ("jobcandidateid")
+                       do update set
+                         "businessentityid" = EXCLUDED."businessentityid",
+                         "resume" = EXCLUDED."resume",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table jobcandidate_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
index a4bd10df6b..dbd3f3f7c1 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/jobcandidate/JobcandidateRepoMock.scala
@@ -104,4 +104,12 @@ class JobcandidateRepoMock(toRow: Function1[JobcandidateRowUnsaved, Jobcandidate
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, JobcandidateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.jobcandidateid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
index 466ee97664..5d59d1ca40 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepo.scala
@@ -32,4 +32,5 @@ trait ShiftRepo {
   def update: UpdateBuilder[ShiftFields, ShiftRow]
   def update(row: ShiftRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ShiftRow): ZIO[ZConnection, Throwable, UpdateResult[ShiftRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShiftRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
index b96732646f..d86296cc48 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoImpl.scala
@@ -120,4 +120,19 @@ class ShiftRepoImpl extends ShiftRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "shiftid", "name", "starttime"::text, "endtime"::text, "modifieddate"::text""".insertReturning(using ShiftRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShiftRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table shift_TEMP (like humanresources.shift) on commit drop".execute
+    val copied = streamingInsert(s"""copy shift_TEMP("shiftid", "name", "starttime", "endtime", "modifieddate") from stdin""", batchSize, unsaved)(ShiftRow.text)
+    val merged = sql"""insert into humanresources.shift("shiftid", "name", "starttime", "endtime", "modifieddate")
+                       select * from shift_TEMP
+                       on conflict ("shiftid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "starttime" = EXCLUDED."starttime",
+                         "endtime" = EXCLUDED."endtime",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table shift_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
index 254878ca39..e83929883a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/shift/ShiftRepoMock.scala
@@ -104,4 +104,12 @@ class ShiftRepoMock(toRow: Function1[ShiftRowUnsaved, ShiftRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShiftRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.shiftid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
new file mode 100644
index 0000000000..41146ea388
--- /dev/null
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CardinalNumber.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import java.sql.Types
+import typo.dsl.Bijection
+import typo.dsl.PGType
+import zio.jdbc.JdbcDecoder
+import zio.jdbc.JdbcEncoder
+import zio.jdbc.SqlFragment.Setter
+import zio.json.JsonDecoder
+import zio.json.JsonEncoder
+
+/** Domain `information_schema.cardinal_number`
+  * Constraint: CHECK ((VALUE >= 0))
+  */
+case class CardinalNumber(value: Int)
+object CardinalNumber {
+  implicit lazy val arrayJdbcDecoder: JdbcDecoder[Array[CardinalNumber]] = adventureworks.IntArrayDecoder.map(_.map(CardinalNumber.apply))
+  implicit lazy val arrayJdbcEncoder: JdbcEncoder[Array[CardinalNumber]] = adventureworks.IntArrayEncoder.contramap(_.map(_.value))
+  implicit lazy val arraySetter: Setter[Array[CardinalNumber]] = adventureworks.IntArraySetter.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CardinalNumber, Int] = Bijection[CardinalNumber, Int](_.value)(CardinalNumber.apply)
+  implicit lazy val jdbcDecoder: JdbcDecoder[CardinalNumber] = JdbcDecoder.intDecoder.map(CardinalNumber.apply)
+  implicit lazy val jdbcEncoder: JdbcEncoder[CardinalNumber] = JdbcEncoder.intEncoder.contramap(_.value)
+  implicit lazy val jsonDecoder: JsonDecoder[CardinalNumber] = JsonDecoder.int.map(CardinalNumber.apply)
+  implicit lazy val jsonEncoder: JsonEncoder[CardinalNumber] = JsonEncoder.int.contramap(_.value)
+  implicit lazy val ordering: Ordering[CardinalNumber] = Ordering.by(_.value)
+  implicit lazy val pgType: PGType[CardinalNumber] = PGType.instance(""""information_schema"."cardinal_number"""", Types.OTHER)
+  implicit lazy val setter: Setter[CardinalNumber] = Setter.intSetter.contramap(_.value)
+  implicit lazy val text: Text[CardinalNumber] = new Text[CardinalNumber] {
+    override def unsafeEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CardinalNumber, sb: StringBuilder) = Text.intInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
new file mode 100644
index 0000000000..f067aa4bda
--- /dev/null
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/CharacterData.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import java.sql.Types
+import typo.dsl.Bijection
+import typo.dsl.PGType
+import zio.jdbc.JdbcDecoder
+import zio.jdbc.JdbcEncoder
+import zio.jdbc.SqlFragment.Setter
+import zio.json.JsonDecoder
+import zio.json.JsonEncoder
+
+/** Domain `information_schema.character_data`
+  * No constraint
+  */
+case class CharacterData(value: String)
+object CharacterData {
+  implicit lazy val arrayJdbcDecoder: JdbcDecoder[Array[CharacterData]] = adventureworks.StringArrayDecoder.map(_.map(CharacterData.apply))
+  implicit lazy val arrayJdbcEncoder: JdbcEncoder[Array[CharacterData]] = adventureworks.StringArrayEncoder.contramap(_.map(_.value))
+  implicit lazy val arraySetter: Setter[Array[CharacterData]] = adventureworks.StringArraySetter.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[CharacterData, String] = Bijection[CharacterData, String](_.value)(CharacterData.apply)
+  implicit lazy val jdbcDecoder: JdbcDecoder[CharacterData] = JdbcDecoder.stringDecoder.map(CharacterData.apply)
+  implicit lazy val jdbcEncoder: JdbcEncoder[CharacterData] = JdbcEncoder.stringEncoder.contramap(_.value)
+  implicit lazy val jsonDecoder: JsonDecoder[CharacterData] = JsonDecoder.string.map(CharacterData.apply)
+  implicit lazy val jsonEncoder: JsonEncoder[CharacterData] = JsonEncoder.string.contramap(_.value)
+  implicit lazy val ordering: Ordering[CharacterData] = Ordering.by(_.value)
+  implicit lazy val pgType: PGType[CharacterData] = PGType.instance(""""information_schema"."character_data"""", Types.OTHER)
+  implicit lazy val setter: Setter[CharacterData] = Setter.stringSetter.contramap(_.value)
+  implicit lazy val text: Text[CharacterData] = new Text[CharacterData] {
+    override def unsafeEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: CharacterData, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
new file mode 100644
index 0000000000..652adfa158
--- /dev/null
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/SqlIdentifier.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import java.sql.Types
+import typo.dsl.Bijection
+import typo.dsl.PGType
+import zio.jdbc.JdbcDecoder
+import zio.jdbc.JdbcEncoder
+import zio.jdbc.SqlFragment.Setter
+import zio.json.JsonDecoder
+import zio.json.JsonEncoder
+
+/** Domain `information_schema.sql_identifier`
+  * No constraint
+  */
+case class SqlIdentifier(value: String)
+object SqlIdentifier {
+  implicit lazy val arrayJdbcDecoder: JdbcDecoder[Array[SqlIdentifier]] = adventureworks.StringArrayDecoder.map(_.map(SqlIdentifier.apply))
+  implicit lazy val arrayJdbcEncoder: JdbcEncoder[Array[SqlIdentifier]] = adventureworks.StringArrayEncoder.contramap(_.map(_.value))
+  implicit lazy val arraySetter: Setter[Array[SqlIdentifier]] = adventureworks.StringArraySetter.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[SqlIdentifier, String] = Bijection[SqlIdentifier, String](_.value)(SqlIdentifier.apply)
+  implicit lazy val jdbcDecoder: JdbcDecoder[SqlIdentifier] = JdbcDecoder.stringDecoder.map(SqlIdentifier.apply)
+  implicit lazy val jdbcEncoder: JdbcEncoder[SqlIdentifier] = JdbcEncoder.stringEncoder.contramap(_.value)
+  implicit lazy val jsonDecoder: JsonDecoder[SqlIdentifier] = JsonDecoder.string.map(SqlIdentifier.apply)
+  implicit lazy val jsonEncoder: JsonEncoder[SqlIdentifier] = JsonEncoder.string.contramap(_.value)
+  implicit lazy val ordering: Ordering[SqlIdentifier] = Ordering.by(_.value)
+  implicit lazy val pgType: PGType[SqlIdentifier] = PGType.instance(""""information_schema"."sql_identifier"""", Types.OTHER)
+  implicit lazy val setter: Setter[SqlIdentifier] = Setter.stringSetter.contramap(_.value)
+  implicit lazy val text: Text[SqlIdentifier] = new Text[SqlIdentifier] {
+    override def unsafeEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: SqlIdentifier, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
new file mode 100644
index 0000000000..0a53c42520
--- /dev/null
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/TimeStamp.scala
@@ -0,0 +1,39 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import adventureworks.customtypes.TypoInstant
+import java.sql.Types
+import typo.dsl.Bijection
+import typo.dsl.PGType
+import zio.jdbc.JdbcDecoder
+import zio.jdbc.JdbcEncoder
+import zio.jdbc.SqlFragment.Setter
+import zio.json.JsonDecoder
+import zio.json.JsonEncoder
+
+/** Domain `information_schema.time_stamp`
+  * No constraint
+  */
+case class TimeStamp(value: TypoInstant)
+object TimeStamp {
+  implicit lazy val arrayJdbcDecoder: JdbcDecoder[Array[TimeStamp]] = JdbcDecoder[Array[TypoInstant]].map(_.map(TimeStamp.apply))
+  implicit lazy val arrayJdbcEncoder: JdbcEncoder[Array[TimeStamp]] = JdbcEncoder[Array[TypoInstant]].contramap(_.map(_.value))
+  implicit lazy val arraySetter: Setter[Array[TimeStamp]] = TypoInstant.arraySetter.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[TimeStamp, TypoInstant] = Bijection[TimeStamp, TypoInstant](_.value)(TimeStamp.apply)
+  implicit lazy val jdbcDecoder: JdbcDecoder[TimeStamp] = TypoInstant.jdbcDecoder.map(TimeStamp.apply)
+  implicit lazy val jdbcEncoder: JdbcEncoder[TimeStamp] = TypoInstant.jdbcEncoder.contramap(_.value)
+  implicit lazy val jsonDecoder: JsonDecoder[TimeStamp] = TypoInstant.jsonDecoder.map(TimeStamp.apply)
+  implicit lazy val jsonEncoder: JsonEncoder[TimeStamp] = TypoInstant.jsonEncoder.contramap(_.value)
+  implicit def ordering(implicit O0: Ordering[TypoInstant]): Ordering[TimeStamp] = Ordering.by(_.value)
+  implicit lazy val pgType: PGType[TimeStamp] = PGType.instance(""""information_schema"."time_stamp"""", Types.OTHER)
+  implicit lazy val setter: Setter[TimeStamp] = TypoInstant.setter.contramap(_.value)
+  implicit lazy val text: Text[TimeStamp] = new Text[TimeStamp] {
+    override def unsafeEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: TimeStamp, sb: StringBuilder) = TypoInstant.text.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
new file mode 100644
index 0000000000..97578ef7a6
--- /dev/null
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/information_schema/YesOrNo.scala
@@ -0,0 +1,38 @@
+/**
+ * File has been automatically generated by `typo`.
+ *
+ * IF YOU CHANGE THIS FILE YOUR CHANGES WILL BE OVERWRITTEN.
+ */
+package adventureworks
+package information_schema
+
+import java.sql.Types
+import typo.dsl.Bijection
+import typo.dsl.PGType
+import zio.jdbc.JdbcDecoder
+import zio.jdbc.JdbcEncoder
+import zio.jdbc.SqlFragment.Setter
+import zio.json.JsonDecoder
+import zio.json.JsonEncoder
+
+/** Domain `information_schema.yes_or_no`
+  * Constraint: CHECK (((VALUE)::text = ANY ((ARRAY['YES'::character varying, 'NO'::character varying])::text[])))
+  */
+case class YesOrNo(value: String)
+object YesOrNo {
+  implicit lazy val arrayJdbcDecoder: JdbcDecoder[Array[YesOrNo]] = adventureworks.StringArrayDecoder.map(_.map(YesOrNo.apply))
+  implicit lazy val arrayJdbcEncoder: JdbcEncoder[Array[YesOrNo]] = adventureworks.StringArrayEncoder.contramap(_.map(_.value))
+  implicit lazy val arraySetter: Setter[Array[YesOrNo]] = adventureworks.StringArraySetter.contramap(_.map(_.value))
+  implicit lazy val bijection: Bijection[YesOrNo, String] = Bijection[YesOrNo, String](_.value)(YesOrNo.apply)
+  implicit lazy val jdbcDecoder: JdbcDecoder[YesOrNo] = JdbcDecoder.stringDecoder.map(YesOrNo.apply)
+  implicit lazy val jdbcEncoder: JdbcEncoder[YesOrNo] = JdbcEncoder.stringEncoder.contramap(_.value)
+  implicit lazy val jsonDecoder: JsonDecoder[YesOrNo] = JsonDecoder.string.map(YesOrNo.apply)
+  implicit lazy val jsonEncoder: JsonEncoder[YesOrNo] = JsonEncoder.string.contramap(_.value)
+  implicit lazy val ordering: Ordering[YesOrNo] = Ordering.by(_.value)
+  implicit lazy val pgType: PGType[YesOrNo] = PGType.instance(""""information_schema"."yes_or_no"""", Types.OTHER)
+  implicit lazy val setter: Setter[YesOrNo] = Setter.stringSetter.contramap(_.value)
+  implicit lazy val text: Text[YesOrNo] = new Text[YesOrNo] {
+    override def unsafeEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeEncode(v.value, sb)
+    override def unsafeArrayEncode(v: YesOrNo, sb: StringBuilder) = Text.stringInstance.unsafeArrayEncode(v.value, sb)
+  }
+}
\ No newline at end of file
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
index 21e9897060..a15e7ecae5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepo.scala
@@ -32,4 +32,5 @@ trait AddressRepo {
   def update: UpdateBuilder[AddressFields, AddressRow]
   def update(row: AddressRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: AddressRow): ZIO[ZConnection, Throwable, UpdateResult[AddressRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
index 100b2fa2a2..4a80b1ff00 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoImpl.scala
@@ -141,4 +141,23 @@ class AddressRepoImpl extends AddressRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate"::text""".insertReturning(using AddressRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table address_TEMP (like person.address) on commit drop".execute
+    val copied = streamingInsert(s"""copy address_TEMP("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(AddressRow.text)
+    val merged = sql"""insert into person.address("addressid", "addressline1", "addressline2", "city", "stateprovinceid", "postalcode", "spatiallocation", "rowguid", "modifieddate")
+                       select * from address_TEMP
+                       on conflict ("addressid")
+                       do update set
+                         "addressline1" = EXCLUDED."addressline1",
+                         "addressline2" = EXCLUDED."addressline2",
+                         "city" = EXCLUDED."city",
+                         "stateprovinceid" = EXCLUDED."stateprovinceid",
+                         "postalcode" = EXCLUDED."postalcode",
+                         "spatiallocation" = EXCLUDED."spatiallocation",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table address_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
index ea74ea3f2f..01a9e80bc7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/address/AddressRepoMock.scala
@@ -104,4 +104,12 @@ class AddressRepoMock(toRow: Function1[AddressRowUnsaved, AddressRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.addressid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
index 970a1ee967..7036a613ea 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepo.scala
@@ -32,4 +32,5 @@ trait AddresstypeRepo {
   def update: UpdateBuilder[AddresstypeFields, AddresstypeRow]
   def update(row: AddresstypeRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: AddresstypeRow): ZIO[ZConnection, Throwable, UpdateResult[AddresstypeRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddresstypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
index 6be1ed7a79..2621887f0e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoImpl.scala
@@ -119,4 +119,18 @@ class AddresstypeRepoImpl extends AddresstypeRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "addresstypeid", "name", "rowguid", "modifieddate"::text""".insertReturning(using AddresstypeRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddresstypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table addresstype_TEMP (like person.addresstype) on commit drop".execute
+    val copied = streamingInsert(s"""copy addresstype_TEMP("addresstypeid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(AddresstypeRow.text)
+    val merged = sql"""insert into person.addresstype("addresstypeid", "name", "rowguid", "modifieddate")
+                       select * from addresstype_TEMP
+                       on conflict ("addresstypeid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table addresstype_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
index 3d136ee015..a9f60526a2 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/addresstype/AddresstypeRepoMock.scala
@@ -104,4 +104,12 @@ class AddresstypeRepoMock(toRow: Function1[AddresstypeRowUnsaved, AddresstypeRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, AddresstypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.addresstypeid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
index 8d5723e576..237f0a345a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepo.scala
@@ -32,4 +32,5 @@ trait BusinessentityRepo {
   def update: UpdateBuilder[BusinessentityFields, BusinessentityRow]
   def update(row: BusinessentityRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: BusinessentityRow): ZIO[ZConnection, Throwable, UpdateResult[BusinessentityRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
index a909211f57..97eaf2fab9 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoImpl.scala
@@ -114,4 +114,17 @@ class BusinessentityRepoImpl extends BusinessentityRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "rowguid", "modifieddate"::text""".insertReturning(using BusinessentityRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table businessentity_TEMP (like person.businessentity) on commit drop".execute
+    val copied = streamingInsert(s"""copy businessentity_TEMP("businessentityid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentityRow.text)
+    val merged = sql"""insert into person.businessentity("businessentityid", "rowguid", "modifieddate")
+                       select * from businessentity_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table businessentity_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
index a67ee9642f..cfe0d8e4c9 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentity/BusinessentityRepoMock.scala
@@ -104,4 +104,12 @@ class BusinessentityRepoMock(toRow: Function1[BusinessentityRowUnsaved, Business
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
index de1c702ff3..3f904684d3 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepo.scala
@@ -32,4 +32,5 @@ trait BusinessentityaddressRepo {
   def update: UpdateBuilder[BusinessentityaddressFields, BusinessentityaddressRow]
   def update(row: BusinessentityaddressRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: BusinessentityaddressRow): ZIO[ZConnection, Throwable, UpdateResult[BusinessentityaddressRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
index 9d54f614f0..ac2ac776dc 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoImpl.scala
@@ -134,4 +134,17 @@ class BusinessentityaddressRepoImpl extends BusinessentityaddressRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate"::text""".insertReturning(using BusinessentityaddressRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table businessentityaddress_TEMP (like person.businessentityaddress) on commit drop".execute
+    val copied = streamingInsert(s"""copy businessentityaddress_TEMP("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentityaddressRow.text)
+    val merged = sql"""insert into person.businessentityaddress("businessentityid", "addressid", "addresstypeid", "rowguid", "modifieddate")
+                       select * from businessentityaddress_TEMP
+                       on conflict ("businessentityid", "addressid", "addresstypeid")
+                       do update set
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table businessentityaddress_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
index 63abb1c795..b6c2878a49 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentityaddress/BusinessentityaddressRepoMock.scala
@@ -104,4 +104,12 @@ class BusinessentityaddressRepoMock(toRow: Function1[BusinessentityaddressRowUns
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentityaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
index c4cef12533..ab1d58a52c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepo.scala
@@ -32,4 +32,5 @@ trait BusinessentitycontactRepo {
   def update: UpdateBuilder[BusinessentitycontactFields, BusinessentitycontactRow]
   def update(row: BusinessentitycontactRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: BusinessentitycontactRow): ZIO[ZConnection, Throwable, UpdateResult[BusinessentitycontactRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentitycontactRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
index e74810ffea..5d60a4b42a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoImpl.scala
@@ -133,4 +133,17 @@ class BusinessentitycontactRepoImpl extends BusinessentitycontactRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate"::text""".insertReturning(using BusinessentitycontactRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentitycontactRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table businessentitycontact_TEMP (like person.businessentitycontact) on commit drop".execute
+    val copied = streamingInsert(s"""copy businessentitycontact_TEMP("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(BusinessentitycontactRow.text)
+    val merged = sql"""insert into person.businessentitycontact("businessentityid", "personid", "contacttypeid", "rowguid", "modifieddate")
+                       select * from businessentitycontact_TEMP
+                       on conflict ("businessentityid", "personid", "contacttypeid")
+                       do update set
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table businessentitycontact_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
index cee9eed9ad..a86d01ad51 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/businessentitycontact/BusinessentitycontactRepoMock.scala
@@ -104,4 +104,12 @@ class BusinessentitycontactRepoMock(toRow: Function1[BusinessentitycontactRowUns
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BusinessentitycontactRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
index 6cefc84874..8d282dc0df 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepo.scala
@@ -32,4 +32,5 @@ trait ContacttypeRepo {
   def update: UpdateBuilder[ContacttypeFields, ContacttypeRow]
   def update(row: ContacttypeRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ContacttypeRow): ZIO[ZConnection, Throwable, UpdateResult[ContacttypeRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ContacttypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
index a8d9879bc5..c459a5aa44 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoImpl.scala
@@ -111,4 +111,17 @@ class ContacttypeRepoImpl extends ContacttypeRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "contacttypeid", "name", "modifieddate"::text""".insertReturning(using ContacttypeRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ContacttypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table contacttype_TEMP (like person.contacttype) on commit drop".execute
+    val copied = streamingInsert(s"""copy contacttype_TEMP("contacttypeid", "name", "modifieddate") from stdin""", batchSize, unsaved)(ContacttypeRow.text)
+    val merged = sql"""insert into person.contacttype("contacttypeid", "name", "modifieddate")
+                       select * from contacttype_TEMP
+                       on conflict ("contacttypeid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table contacttype_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
index f440033b12..036b388d25 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/contacttype/ContacttypeRepoMock.scala
@@ -104,4 +104,12 @@ class ContacttypeRepoMock(toRow: Function1[ContacttypeRowUnsaved, ContacttypeRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ContacttypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.contacttypeid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
index ba9ccc582d..d7766f15bd 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepo.scala
@@ -32,4 +32,5 @@ trait CountryregionRepo {
   def update: UpdateBuilder[CountryregionFields, CountryregionRow]
   def update(row: CountryregionRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CountryregionRow): ZIO[ZConnection, Throwable, UpdateResult[CountryregionRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
index 81f25e3a94..2c7a3015e3 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoImpl.scala
@@ -108,4 +108,17 @@ class CountryregionRepoImpl extends CountryregionRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "countryregioncode", "name", "modifieddate"::text""".insertReturning(using CountryregionRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table countryregion_TEMP (like person.countryregion) on commit drop".execute
+    val copied = streamingInsert(s"""copy countryregion_TEMP("countryregioncode", "name", "modifieddate") from stdin""", batchSize, unsaved)(CountryregionRow.text)
+    val merged = sql"""insert into person.countryregion("countryregioncode", "name", "modifieddate")
+                       select * from countryregion_TEMP
+                       on conflict ("countryregioncode")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table countryregion_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
index cdc5ee6f96..e2930d9d11 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/countryregion/CountryregionRepoMock.scala
@@ -104,4 +104,12 @@ class CountryregionRepoMock(toRow: Function1[CountryregionRowUnsaved, Countryreg
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.countryregioncode -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
index f25412f969..d34709c4e2 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepo.scala
@@ -32,4 +32,5 @@ trait EmailaddressRepo {
   def update: UpdateBuilder[EmailaddressFields, EmailaddressRow]
   def update(row: EmailaddressRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: EmailaddressRow): ZIO[ZConnection, Throwable, UpdateResult[EmailaddressRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmailaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
index 7bf819ab3e..03a11fec9a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoImpl.scala
@@ -136,4 +136,18 @@ class EmailaddressRepoImpl extends EmailaddressRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate"::text""".insertReturning(using EmailaddressRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmailaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table emailaddress_TEMP (like person.emailaddress) on commit drop".execute
+    val copied = streamingInsert(s"""copy emailaddress_TEMP("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(EmailaddressRow.text)
+    val merged = sql"""insert into person.emailaddress("businessentityid", "emailaddressid", "emailaddress", "rowguid", "modifieddate")
+                       select * from emailaddress_TEMP
+                       on conflict ("businessentityid", "emailaddressid")
+                       do update set
+                         "emailaddress" = EXCLUDED."emailaddress",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table emailaddress_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
index 41445281d7..2c1ba49b2e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/emailaddress/EmailaddressRepoMock.scala
@@ -104,4 +104,12 @@ class EmailaddressRepoMock(toRow: Function1[EmailaddressRowUnsaved, Emailaddress
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, EmailaddressRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
index 447152fff6..0bd4f572cb 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepo.scala
@@ -33,4 +33,5 @@ trait PasswordRepo {
   def update: UpdateBuilder[PasswordFields, PasswordRow]
   def update(row: PasswordRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PasswordRow): ZIO[ZConnection, Throwable, UpdateResult[PasswordRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PasswordRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
index aaeaf9d06a..03b75383bb 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoImpl.scala
@@ -121,4 +121,19 @@ class PasswordRepoImpl extends PasswordRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate"::text""".insertReturning(using PasswordRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PasswordRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table password_TEMP (like person.password) on commit drop".execute
+    val copied = streamingInsert(s"""copy password_TEMP("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(PasswordRow.text)
+    val merged = sql"""insert into person.password("businessentityid", "passwordhash", "passwordsalt", "rowguid", "modifieddate")
+                       select * from password_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "passwordhash" = EXCLUDED."passwordhash",
+                         "passwordsalt" = EXCLUDED."passwordsalt",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table password_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
index 46915294ca..ba82a3507c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/password/PasswordRepoMock.scala
@@ -105,4 +105,12 @@ class PasswordRepoMock(toRow: Function1[PasswordRowUnsaved, PasswordRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PasswordRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
index e431bc1f12..0a608054e1 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepo.scala
@@ -33,4 +33,5 @@ trait PersonRepo {
   def update: UpdateBuilder[PersonFields, PersonRow]
   def update(row: PersonRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonRow): ZIO[ZConnection, Throwable, UpdateResult[PersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
index 1b594c84d9..c7642c8302 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoImpl.scala
@@ -163,4 +163,27 @@ class PersonRepoImpl extends PersonRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate"::text""".insertReturning(using PersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table person_TEMP (like person.person) on commit drop".execute
+    val copied = streamingInsert(s"""copy person_TEMP("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(PersonRow.text)
+    val merged = sql"""insert into person.person("businessentityid", "persontype", "namestyle", "title", "firstname", "middlename", "lastname", "suffix", "emailpromotion", "additionalcontactinfo", "demographics", "rowguid", "modifieddate")
+                       select * from person_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "persontype" = EXCLUDED."persontype",
+                         "namestyle" = EXCLUDED."namestyle",
+                         "title" = EXCLUDED."title",
+                         "firstname" = EXCLUDED."firstname",
+                         "middlename" = EXCLUDED."middlename",
+                         "lastname" = EXCLUDED."lastname",
+                         "suffix" = EXCLUDED."suffix",
+                         "emailpromotion" = EXCLUDED."emailpromotion",
+                         "additionalcontactinfo" = EXCLUDED."additionalcontactinfo",
+                         "demographics" = EXCLUDED."demographics",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table person_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
index 5a3c9cec23..921f4968e4 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/person/PersonRepoMock.scala
@@ -105,4 +105,12 @@ class PersonRepoMock(toRow: Function1[PersonRowUnsaved, PersonRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
index bc04cd72a3..3da4f3c93b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepo.scala
@@ -32,4 +32,5 @@ trait PersonphoneRepo {
   def update: UpdateBuilder[PersonphoneFields, PersonphoneRow]
   def update(row: PersonphoneRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersonphoneRow): ZIO[ZConnection, Throwable, UpdateResult[PersonphoneRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonphoneRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
index 8abf56aada..b313174ca0 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoImpl.scala
@@ -126,4 +126,16 @@ class PersonphoneRepoImpl extends PersonphoneRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate"::text""".insertReturning(using PersonphoneRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonphoneRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table personphone_TEMP (like person.personphone) on commit drop".execute
+    val copied = streamingInsert(s"""copy personphone_TEMP("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate") from stdin""", batchSize, unsaved)(PersonphoneRow.text)
+    val merged = sql"""insert into person.personphone("businessentityid", "phonenumber", "phonenumbertypeid", "modifieddate")
+                       select * from personphone_TEMP
+                       on conflict ("businessentityid", "phonenumber", "phonenumbertypeid")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table personphone_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
index fccc49d199..6e1c38a46f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/personphone/PersonphoneRepoMock.scala
@@ -104,4 +104,12 @@ class PersonphoneRepoMock(toRow: Function1[PersonphoneRowUnsaved, PersonphoneRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersonphoneRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
index 426ed087e7..2196aeb7dd 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepo.scala
@@ -32,4 +32,5 @@ trait PhonenumbertypeRepo {
   def update: UpdateBuilder[PhonenumbertypeFields, PhonenumbertypeRow]
   def update(row: PhonenumbertypeRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PhonenumbertypeRow): ZIO[ZConnection, Throwable, UpdateResult[PhonenumbertypeRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PhonenumbertypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
index 63efd0a14d..4d4741dcba 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoImpl.scala
@@ -111,4 +111,17 @@ class PhonenumbertypeRepoImpl extends PhonenumbertypeRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "phonenumbertypeid", "name", "modifieddate"::text""".insertReturning(using PhonenumbertypeRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PhonenumbertypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table phonenumbertype_TEMP (like person.phonenumbertype) on commit drop".execute
+    val copied = streamingInsert(s"""copy phonenumbertype_TEMP("phonenumbertypeid", "name", "modifieddate") from stdin""", batchSize, unsaved)(PhonenumbertypeRow.text)
+    val merged = sql"""insert into person.phonenumbertype("phonenumbertypeid", "name", "modifieddate")
+                       select * from phonenumbertype_TEMP
+                       on conflict ("phonenumbertypeid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table phonenumbertype_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
index dbe7dc7f10..7f8a116491 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/phonenumbertype/PhonenumbertypeRepoMock.scala
@@ -104,4 +104,12 @@ class PhonenumbertypeRepoMock(toRow: Function1[PhonenumbertypeRowUnsaved, Phonen
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PhonenumbertypeRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.phonenumbertypeid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
index 5e3a26c693..58ea17d7c2 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepo.scala
@@ -32,4 +32,5 @@ trait StateprovinceRepo {
   def update: UpdateBuilder[StateprovinceFields, StateprovinceRow]
   def update(row: StateprovinceRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: StateprovinceRow): ZIO[ZConnection, Throwable, UpdateResult[StateprovinceRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StateprovinceRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
index fc885ba9ab..81eff2fc1b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoImpl.scala
@@ -142,4 +142,22 @@ class StateprovinceRepoImpl extends StateprovinceRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate"::text""".insertReturning(using StateprovinceRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StateprovinceRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table stateprovince_TEMP (like person.stateprovince) on commit drop".execute
+    val copied = streamingInsert(s"""copy stateprovince_TEMP("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(StateprovinceRow.text)
+    val merged = sql"""insert into person.stateprovince("stateprovinceid", "stateprovincecode", "countryregioncode", "isonlystateprovinceflag", "name", "territoryid", "rowguid", "modifieddate")
+                       select * from stateprovince_TEMP
+                       on conflict ("stateprovinceid")
+                       do update set
+                         "stateprovincecode" = EXCLUDED."stateprovincecode",
+                         "countryregioncode" = EXCLUDED."countryregioncode",
+                         "isonlystateprovinceflag" = EXCLUDED."isonlystateprovinceflag",
+                         "name" = EXCLUDED."name",
+                         "territoryid" = EXCLUDED."territoryid",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table stateprovince_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
index e7d43ae06a..17f0f57206 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/person/stateprovince/StateprovinceRepoMock.scala
@@ -104,4 +104,12 @@ class StateprovinceRepoMock(toRow: Function1[StateprovinceRowUnsaved, Stateprovi
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StateprovinceRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.stateprovinceid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
index 312892a6e3..ccc7018cb5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepo.scala
@@ -32,4 +32,5 @@ trait BillofmaterialsRepo {
   def update: UpdateBuilder[BillofmaterialsFields, BillofmaterialsRow]
   def update(row: BillofmaterialsRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: BillofmaterialsRow): ZIO[ZConnection, Throwable, UpdateResult[BillofmaterialsRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BillofmaterialsRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
index fd1c7f2c09..cc9a1d139f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoImpl.scala
@@ -144,4 +144,23 @@ class BillofmaterialsRepoImpl extends BillofmaterialsRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "billofmaterialsid", "productassemblyid", "componentid", "startdate"::text, "enddate"::text, "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate"::text""".insertReturning(using BillofmaterialsRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BillofmaterialsRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table billofmaterials_TEMP (like production.billofmaterials) on commit drop".execute
+    val copied = streamingInsert(s"""copy billofmaterials_TEMP("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate") from stdin""", batchSize, unsaved)(BillofmaterialsRow.text)
+    val merged = sql"""insert into production.billofmaterials("billofmaterialsid", "productassemblyid", "componentid", "startdate", "enddate", "unitmeasurecode", "bomlevel", "perassemblyqty", "modifieddate")
+                       select * from billofmaterials_TEMP
+                       on conflict ("billofmaterialsid")
+                       do update set
+                         "productassemblyid" = EXCLUDED."productassemblyid",
+                         "componentid" = EXCLUDED."componentid",
+                         "startdate" = EXCLUDED."startdate",
+                         "enddate" = EXCLUDED."enddate",
+                         "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+                         "bomlevel" = EXCLUDED."bomlevel",
+                         "perassemblyqty" = EXCLUDED."perassemblyqty",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table billofmaterials_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
index bd10bc5be2..88feb1307f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/billofmaterials/BillofmaterialsRepoMock.scala
@@ -104,4 +104,12 @@ class BillofmaterialsRepoMock(toRow: Function1[BillofmaterialsRowUnsaved, Billof
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, BillofmaterialsRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.billofmaterialsid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
index 03712c55c1..9f76fbf99f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepo.scala
@@ -32,4 +32,5 @@ trait CultureRepo {
   def update: UpdateBuilder[CultureFields, CultureRow]
   def update(row: CultureRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CultureRow): ZIO[ZConnection, Throwable, UpdateResult[CultureRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
index 76057147d3..4ac43707c4 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoImpl.scala
@@ -108,4 +108,17 @@ class CultureRepoImpl extends CultureRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "cultureid", "name", "modifieddate"::text""".insertReturning(using CultureRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table culture_TEMP (like production.culture) on commit drop".execute
+    val copied = streamingInsert(s"""copy culture_TEMP("cultureid", "name", "modifieddate") from stdin""", batchSize, unsaved)(CultureRow.text)
+    val merged = sql"""insert into production.culture("cultureid", "name", "modifieddate")
+                       select * from culture_TEMP
+                       on conflict ("cultureid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table culture_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
index cdeaa55e05..87b4c17161 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/culture/CultureRepoMock.scala
@@ -104,4 +104,12 @@ class CultureRepoMock(toRow: Function1[CultureRowUnsaved, CultureRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.cultureid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
index f99a29423a..371dba65f7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepo.scala
@@ -34,4 +34,5 @@ trait DocumentRepo {
   def update: UpdateBuilder[DocumentFields, DocumentRow]
   def update(row: DocumentRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: DocumentRow): ZIO[ZConnection, Throwable, UpdateResult[DocumentRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
index 639c1bf316..71d56c046a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoImpl.scala
@@ -171,4 +171,27 @@ class DocumentRepoImpl extends DocumentRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate"::text, "documentnode"""".insertReturning(using DocumentRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table document_TEMP (like production.document) on commit drop".execute
+    val copied = streamingInsert(s"""copy document_TEMP("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode") from stdin""", batchSize, unsaved)(DocumentRow.text)
+    val merged = sql"""insert into production.document("title", "owner", "folderflag", "filename", "fileextension", "revision", "changenumber", "status", "documentsummary", "document", "rowguid", "modifieddate", "documentnode")
+                       select * from document_TEMP
+                       on conflict ("documentnode")
+                       do update set
+                         "title" = EXCLUDED."title",
+                         "owner" = EXCLUDED."owner",
+                         "folderflag" = EXCLUDED."folderflag",
+                         "filename" = EXCLUDED."filename",
+                         "fileextension" = EXCLUDED."fileextension",
+                         "revision" = EXCLUDED."revision",
+                         "changenumber" = EXCLUDED."changenumber",
+                         "status" = EXCLUDED."status",
+                         "documentsummary" = EXCLUDED."documentsummary",
+                         "document" = EXCLUDED."document",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table document_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
index d8dbf79792..d50c24b15d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/document/DocumentRepoMock.scala
@@ -108,4 +108,12 @@ class DocumentRepoMock(toRow: Function1[DocumentRowUnsaved, DocumentRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, DocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.documentnode -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
index 1ff081c4c2..4ef1a3bfb4 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepo.scala
@@ -32,4 +32,5 @@ trait IllustrationRepo {
   def update: UpdateBuilder[IllustrationFields, IllustrationRow]
   def update(row: IllustrationRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: IllustrationRow): ZIO[ZConnection, Throwable, UpdateResult[IllustrationRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IllustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
index 73c8dc570a..496c98c49a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoImpl.scala
@@ -112,4 +112,17 @@ class IllustrationRepoImpl extends IllustrationRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "illustrationid", "diagram", "modifieddate"::text""".insertReturning(using IllustrationRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IllustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table illustration_TEMP (like production.illustration) on commit drop".execute
+    val copied = streamingInsert(s"""copy illustration_TEMP("illustrationid", "diagram", "modifieddate") from stdin""", batchSize, unsaved)(IllustrationRow.text)
+    val merged = sql"""insert into production.illustration("illustrationid", "diagram", "modifieddate")
+                       select * from illustration_TEMP
+                       on conflict ("illustrationid")
+                       do update set
+                         "diagram" = EXCLUDED."diagram",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table illustration_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
index 466b5da4c0..466507f8e7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/illustration/IllustrationRepoMock.scala
@@ -104,4 +104,12 @@ class IllustrationRepoMock(toRow: Function1[IllustrationRowUnsaved, Illustration
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IllustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.illustrationid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
index 2ba616034a..e2a41f0b77 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepo.scala
@@ -32,4 +32,5 @@ trait LocationRepo {
   def update: UpdateBuilder[LocationFields, LocationRow]
   def update(row: LocationRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: LocationRow): ZIO[ZConnection, Throwable, UpdateResult[LocationRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, LocationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
index 628c9d6baf..d28d4861ad 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoImpl.scala
@@ -126,4 +126,19 @@ class LocationRepoImpl extends LocationRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "locationid", "name", "costrate", "availability", "modifieddate"::text""".insertReturning(using LocationRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, LocationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table location_TEMP (like production.location) on commit drop".execute
+    val copied = streamingInsert(s"""copy location_TEMP("locationid", "name", "costrate", "availability", "modifieddate") from stdin""", batchSize, unsaved)(LocationRow.text)
+    val merged = sql"""insert into production.location("locationid", "name", "costrate", "availability", "modifieddate")
+                       select * from location_TEMP
+                       on conflict ("locationid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "costrate" = EXCLUDED."costrate",
+                         "availability" = EXCLUDED."availability",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table location_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
index 22c1f0e7f4..0f63e0d7be 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/location/LocationRepoMock.scala
@@ -104,4 +104,12 @@ class LocationRepoMock(toRow: Function1[LocationRowUnsaved, LocationRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, LocationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.locationid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
index 0eca703668..14bdeabf08 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepo.scala
@@ -32,4 +32,5 @@ trait ProductRepo {
   def update: UpdateBuilder[ProductFields, ProductRow]
   def update(row: ProductRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductRow): ZIO[ZConnection, Throwable, UpdateResult[ProductRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
index 72b2f4373a..51e72dff38 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoImpl.scala
@@ -215,4 +215,39 @@ class ProductRepoImpl extends ProductRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate"::text, "sellenddate"::text, "discontinueddate"::text, "rowguid", "modifieddate"::text""".insertReturning(using ProductRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table product_TEMP (like production.product) on commit drop".execute
+    val copied = streamingInsert(s"""copy product_TEMP("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductRow.text)
+    val merged = sql"""insert into production.product("productid", "name", "productnumber", "makeflag", "finishedgoodsflag", "color", "safetystocklevel", "reorderpoint", "standardcost", "listprice", "size", "sizeunitmeasurecode", "weightunitmeasurecode", "weight", "daystomanufacture", "productline", "class", "style", "productsubcategoryid", "productmodelid", "sellstartdate", "sellenddate", "discontinueddate", "rowguid", "modifieddate")
+                       select * from product_TEMP
+                       on conflict ("productid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "productnumber" = EXCLUDED."productnumber",
+                         "makeflag" = EXCLUDED."makeflag",
+                         "finishedgoodsflag" = EXCLUDED."finishedgoodsflag",
+                         "color" = EXCLUDED."color",
+                         "safetystocklevel" = EXCLUDED."safetystocklevel",
+                         "reorderpoint" = EXCLUDED."reorderpoint",
+                         "standardcost" = EXCLUDED."standardcost",
+                         "listprice" = EXCLUDED."listprice",
+                         "size" = EXCLUDED."size",
+                         "sizeunitmeasurecode" = EXCLUDED."sizeunitmeasurecode",
+                         "weightunitmeasurecode" = EXCLUDED."weightunitmeasurecode",
+                         "weight" = EXCLUDED."weight",
+                         "daystomanufacture" = EXCLUDED."daystomanufacture",
+                         "productline" = EXCLUDED."productline",
+                         "class" = EXCLUDED."class",
+                         "style" = EXCLUDED."style",
+                         "productsubcategoryid" = EXCLUDED."productsubcategoryid",
+                         "productmodelid" = EXCLUDED."productmodelid",
+                         "sellstartdate" = EXCLUDED."sellstartdate",
+                         "sellenddate" = EXCLUDED."sellenddate",
+                         "discontinueddate" = EXCLUDED."discontinueddate",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table product_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
index 20bfccfedf..8d032dab82 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/product/ProductRepoMock.scala
@@ -104,4 +104,12 @@ class ProductRepoMock(toRow: Function1[ProductRowUnsaved, ProductRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
index 0d84445fa4..cb79578fac 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepo.scala
@@ -32,4 +32,5 @@ trait ProductcategoryRepo {
   def update: UpdateBuilder[ProductcategoryFields, ProductcategoryRow]
   def update(row: ProductcategoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductcategoryRow): ZIO[ZConnection, Throwable, UpdateResult[ProductcategoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
index 3b9e1baa61..d288adfb7d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoImpl.scala
@@ -119,4 +119,18 @@ class ProductcategoryRepoImpl extends ProductcategoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productcategoryid", "name", "rowguid", "modifieddate"::text""".insertReturning(using ProductcategoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productcategory_TEMP (like production.productcategory) on commit drop".execute
+    val copied = streamingInsert(s"""copy productcategory_TEMP("productcategoryid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductcategoryRow.text)
+    val merged = sql"""insert into production.productcategory("productcategoryid", "name", "rowguid", "modifieddate")
+                       select * from productcategory_TEMP
+                       on conflict ("productcategoryid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productcategory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
index 96c228625d..b2c564f92e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcategory/ProductcategoryRepoMock.scala
@@ -104,4 +104,12 @@ class ProductcategoryRepoMock(toRow: Function1[ProductcategoryRowUnsaved, Produc
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productcategoryid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
index 0bf6ecf398..498851dcff 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepo.scala
@@ -32,4 +32,5 @@ trait ProductcosthistoryRepo {
   def update: UpdateBuilder[ProductcosthistoryFields, ProductcosthistoryRow]
   def update(row: ProductcosthistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductcosthistoryRow): ZIO[ZConnection, Throwable, UpdateResult[ProductcosthistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcosthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
index ce95305ed7..8c9efa33a1 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoImpl.scala
@@ -129,4 +129,18 @@ class ProductcosthistoryRepoImpl extends ProductcosthistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "startdate"::text, "enddate"::text, "standardcost", "modifieddate"::text""".insertReturning(using ProductcosthistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcosthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productcosthistory_TEMP (like production.productcosthistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy productcosthistory_TEMP("productid", "startdate", "enddate", "standardcost", "modifieddate") from stdin""", batchSize, unsaved)(ProductcosthistoryRow.text)
+    val merged = sql"""insert into production.productcosthistory("productid", "startdate", "enddate", "standardcost", "modifieddate")
+                       select * from productcosthistory_TEMP
+                       on conflict ("productid", "startdate")
+                       do update set
+                         "enddate" = EXCLUDED."enddate",
+                         "standardcost" = EXCLUDED."standardcost",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productcosthistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
index 65553c54ec..931e576ba7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productcosthistory/ProductcosthistoryRepoMock.scala
@@ -104,4 +104,12 @@ class ProductcosthistoryRepoMock(toRow: Function1[ProductcosthistoryRowUnsaved,
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductcosthistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
index cfe85d2fe8..a7463d909b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepo.scala
@@ -32,4 +32,5 @@ trait ProductdescriptionRepo {
   def update: UpdateBuilder[ProductdescriptionFields, ProductdescriptionRow]
   def update(row: ProductdescriptionRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductdescriptionRow): ZIO[ZConnection, Throwable, UpdateResult[ProductdescriptionRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdescriptionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
index 56b7f8af4e..9aefc6977e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoImpl.scala
@@ -119,4 +119,18 @@ class ProductdescriptionRepoImpl extends ProductdescriptionRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productdescriptionid", "description", "rowguid", "modifieddate"::text""".insertReturning(using ProductdescriptionRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdescriptionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productdescription_TEMP (like production.productdescription) on commit drop".execute
+    val copied = streamingInsert(s"""copy productdescription_TEMP("productdescriptionid", "description", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductdescriptionRow.text)
+    val merged = sql"""insert into production.productdescription("productdescriptionid", "description", "rowguid", "modifieddate")
+                       select * from productdescription_TEMP
+                       on conflict ("productdescriptionid")
+                       do update set
+                         "description" = EXCLUDED."description",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productdescription_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
index 27856e11a6..ca45bc8c6d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdescription/ProductdescriptionRepoMock.scala
@@ -104,4 +104,12 @@ class ProductdescriptionRepoMock(toRow: Function1[ProductdescriptionRowUnsaved,
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdescriptionRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productdescriptionid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
index a8d933b97f..40cb9aff61 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepo.scala
@@ -32,4 +32,5 @@ trait ProductdocumentRepo {
   def update: UpdateBuilder[ProductdocumentFields, ProductdocumentRow]
   def update(row: ProductdocumentRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductdocumentRow): ZIO[ZConnection, Throwable, UpdateResult[ProductdocumentRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
index d74c080212..63001e1079 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoImpl.scala
@@ -124,4 +124,16 @@ class ProductdocumentRepoImpl extends ProductdocumentRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "modifieddate"::text, "documentnode"""".insertReturning(using ProductdocumentRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productdocument_TEMP (like production.productdocument) on commit drop".execute
+    val copied = streamingInsert(s"""copy productdocument_TEMP("productid", "modifieddate", "documentnode") from stdin""", batchSize, unsaved)(ProductdocumentRow.text)
+    val merged = sql"""insert into production.productdocument("productid", "modifieddate", "documentnode")
+                       select * from productdocument_TEMP
+                       on conflict ("productid", "documentnode")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productdocument_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
index 167ca48baa..c812b6b31e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productdocument/ProductdocumentRepoMock.scala
@@ -104,4 +104,12 @@ class ProductdocumentRepoMock(toRow: Function1[ProductdocumentRowUnsaved, Produc
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductdocumentRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
index 52e9c1d122..4ed9b0904e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepo.scala
@@ -32,4 +32,5 @@ trait ProductinventoryRepo {
   def update: UpdateBuilder[ProductinventoryFields, ProductinventoryRow]
   def update(row: ProductinventoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductinventoryRow): ZIO[ZConnection, Throwable, UpdateResult[ProductinventoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductinventoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
index 682c8d6a10..354b211b06 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoImpl.scala
@@ -146,4 +146,20 @@ class ProductinventoryRepoImpl extends ProductinventoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate"::text""".insertReturning(using ProductinventoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductinventoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productinventory_TEMP (like production.productinventory) on commit drop".execute
+    val copied = streamingInsert(s"""copy productinventory_TEMP("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductinventoryRow.text)
+    val merged = sql"""insert into production.productinventory("productid", "locationid", "shelf", "bin", "quantity", "rowguid", "modifieddate")
+                       select * from productinventory_TEMP
+                       on conflict ("productid", "locationid")
+                       do update set
+                         "shelf" = EXCLUDED."shelf",
+                         "bin" = EXCLUDED."bin",
+                         "quantity" = EXCLUDED."quantity",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productinventory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
index 0bb6ad34b7..21ea61cc2b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productinventory/ProductinventoryRepoMock.scala
@@ -104,4 +104,12 @@ class ProductinventoryRepoMock(toRow: Function1[ProductinventoryRowUnsaved, Prod
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductinventoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
index 401a222fbc..ac470b4395 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepo.scala
@@ -32,4 +32,5 @@ trait ProductlistpricehistoryRepo {
   def update: UpdateBuilder[ProductlistpricehistoryFields, ProductlistpricehistoryRow]
   def update(row: ProductlistpricehistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductlistpricehistoryRow): ZIO[ZConnection, Throwable, UpdateResult[ProductlistpricehistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductlistpricehistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
index 789102f7aa..16d9167c52 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoImpl.scala
@@ -129,4 +129,18 @@ class ProductlistpricehistoryRepoImpl extends ProductlistpricehistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "startdate"::text, "enddate"::text, "listprice", "modifieddate"::text""".insertReturning(using ProductlistpricehistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductlistpricehistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productlistpricehistory_TEMP (like production.productlistpricehistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy productlistpricehistory_TEMP("productid", "startdate", "enddate", "listprice", "modifieddate") from stdin""", batchSize, unsaved)(ProductlistpricehistoryRow.text)
+    val merged = sql"""insert into production.productlistpricehistory("productid", "startdate", "enddate", "listprice", "modifieddate")
+                       select * from productlistpricehistory_TEMP
+                       on conflict ("productid", "startdate")
+                       do update set
+                         "enddate" = EXCLUDED."enddate",
+                         "listprice" = EXCLUDED."listprice",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productlistpricehistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
index 23082bf8b4..e7606ea537 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productlistpricehistory/ProductlistpricehistoryRepoMock.scala
@@ -104,4 +104,12 @@ class ProductlistpricehistoryRepoMock(toRow: Function1[ProductlistpricehistoryRo
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductlistpricehistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
index f83f9f199a..3addeac683 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepo.scala
@@ -32,4 +32,5 @@ trait ProductmodelRepo {
   def update: UpdateBuilder[ProductmodelFields, ProductmodelRow]
   def update(row: ProductmodelRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductmodelRow): ZIO[ZConnection, Throwable, UpdateResult[ProductmodelRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
index bfb8c9bb40..1456ec7a40 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoImpl.scala
@@ -129,4 +129,20 @@ class ProductmodelRepoImpl extends ProductmodelRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate"::text""".insertReturning(using ProductmodelRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productmodel_TEMP (like production.productmodel) on commit drop".execute
+    val copied = streamingInsert(s"""copy productmodel_TEMP("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelRow.text)
+    val merged = sql"""insert into production.productmodel("productmodelid", "name", "catalogdescription", "instructions", "rowguid", "modifieddate")
+                       select * from productmodel_TEMP
+                       on conflict ("productmodelid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "catalogdescription" = EXCLUDED."catalogdescription",
+                         "instructions" = EXCLUDED."instructions",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productmodel_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
index fe929b5210..e6aee728e6 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodel/ProductmodelRepoMock.scala
@@ -104,4 +104,12 @@ class ProductmodelRepoMock(toRow: Function1[ProductmodelRowUnsaved, Productmodel
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productmodelid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
index d02bfe0c07..f14b0dc99b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepo.scala
@@ -32,4 +32,5 @@ trait ProductmodelillustrationRepo {
   def update: UpdateBuilder[ProductmodelillustrationFields, ProductmodelillustrationRow]
   def update(row: ProductmodelillustrationRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductmodelillustrationRow): ZIO[ZConnection, Throwable, UpdateResult[ProductmodelillustrationRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelillustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
index 8ef3057fd0..ea0ba7c4b7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoImpl.scala
@@ -121,4 +121,16 @@ class ProductmodelillustrationRepoImpl extends ProductmodelillustrationRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productmodelid", "illustrationid", "modifieddate"::text""".insertReturning(using ProductmodelillustrationRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelillustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productmodelillustration_TEMP (like production.productmodelillustration) on commit drop".execute
+    val copied = streamingInsert(s"""copy productmodelillustration_TEMP("productmodelid", "illustrationid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelillustrationRow.text)
+    val merged = sql"""insert into production.productmodelillustration("productmodelid", "illustrationid", "modifieddate")
+                       select * from productmodelillustration_TEMP
+                       on conflict ("productmodelid", "illustrationid")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productmodelillustration_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
index fa0976c0a9..9cae2eab3d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelillustration/ProductmodelillustrationRepoMock.scala
@@ -104,4 +104,12 @@ class ProductmodelillustrationRepoMock(toRow: Function1[Productmodelillustration
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelillustrationRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
index 9e7af612db..ab93be7a01 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepo.scala
@@ -32,4 +32,5 @@ trait ProductmodelproductdescriptioncultureRepo {
   def update: UpdateBuilder[ProductmodelproductdescriptioncultureFields, ProductmodelproductdescriptioncultureRow]
   def update(row: ProductmodelproductdescriptioncultureRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductmodelproductdescriptioncultureRow): ZIO[ZConnection, Throwable, UpdateResult[ProductmodelproductdescriptioncultureRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
index 46d1c7b410..7246f234a7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoImpl.scala
@@ -126,4 +126,16 @@ class ProductmodelproductdescriptioncultureRepoImpl extends Productmodelproductd
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productmodelid", "productdescriptionid", "cultureid", "modifieddate"::text""".insertReturning(using ProductmodelproductdescriptioncultureRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productmodelproductdescriptionculture_TEMP (like production.productmodelproductdescriptionculture) on commit drop".execute
+    val copied = streamingInsert(s"""copy productmodelproductdescriptionculture_TEMP("productmodelid", "productdescriptionid", "cultureid", "modifieddate") from stdin""", batchSize, unsaved)(ProductmodelproductdescriptioncultureRow.text)
+    val merged = sql"""insert into production.productmodelproductdescriptionculture("productmodelid", "productdescriptionid", "cultureid", "modifieddate")
+                       select * from productmodelproductdescriptionculture_TEMP
+                       on conflict ("productmodelid", "productdescriptionid", "cultureid")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productmodelproductdescriptionculture_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
index 19545e0df1..7883577df5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productmodelproductdescriptionculture/ProductmodelproductdescriptioncultureRepoMock.scala
@@ -104,4 +104,12 @@ class ProductmodelproductdescriptioncultureRepoMock(toRow: Function1[Productmode
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductmodelproductdescriptioncultureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
index 493c164ac9..728a44a585 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepo.scala
@@ -32,4 +32,5 @@ trait ProductphotoRepo {
   def update: UpdateBuilder[ProductphotoFields, ProductphotoRow]
   def update(row: ProductphotoRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductphotoRow): ZIO[ZConnection, Throwable, UpdateResult[ProductphotoRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
index aaababbdb0..4a5dcd6aeb 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoImpl.scala
@@ -124,4 +124,20 @@ class ProductphotoRepoImpl extends ProductphotoRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate"::text""".insertReturning(using ProductphotoRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productphoto_TEMP (like production.productphoto) on commit drop".execute
+    val copied = streamingInsert(s"""copy productphoto_TEMP("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate") from stdin""", batchSize, unsaved)(ProductphotoRow.text)
+    val merged = sql"""insert into production.productphoto("productphotoid", "thumbnailphoto", "thumbnailphotofilename", "largephoto", "largephotofilename", "modifieddate")
+                       select * from productphoto_TEMP
+                       on conflict ("productphotoid")
+                       do update set
+                         "thumbnailphoto" = EXCLUDED."thumbnailphoto",
+                         "thumbnailphotofilename" = EXCLUDED."thumbnailphotofilename",
+                         "largephoto" = EXCLUDED."largephoto",
+                         "largephotofilename" = EXCLUDED."largephotofilename",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productphoto_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
index cbcbffd667..9a902b613a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productphoto/ProductphotoRepoMock.scala
@@ -104,4 +104,12 @@ class ProductphotoRepoMock(toRow: Function1[ProductphotoRowUnsaved, Productphoto
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productphotoid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
index eb8617e15f..bd7318fa87 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepo.scala
@@ -32,4 +32,5 @@ trait ProductproductphotoRepo {
   def update: UpdateBuilder[ProductproductphotoFields, ProductproductphotoRow]
   def update(row: ProductproductphotoRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductproductphotoRow): ZIO[ZConnection, Throwable, UpdateResult[ProductproductphotoRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductproductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
index 9094ad004d..692eefe74a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoImpl.scala
@@ -129,4 +129,17 @@ class ProductproductphotoRepoImpl extends ProductproductphotoRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "productphotoid", "primary", "modifieddate"::text""".insertReturning(using ProductproductphotoRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductproductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productproductphoto_TEMP (like production.productproductphoto) on commit drop".execute
+    val copied = streamingInsert(s"""copy productproductphoto_TEMP("productid", "productphotoid", "primary", "modifieddate") from stdin""", batchSize, unsaved)(ProductproductphotoRow.text)
+    val merged = sql"""insert into production.productproductphoto("productid", "productphotoid", "primary", "modifieddate")
+                       select * from productproductphoto_TEMP
+                       on conflict ("productid", "productphotoid")
+                       do update set
+                         "primary" = EXCLUDED."primary",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productproductphoto_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
index 984227a4c8..44aed582f5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productproductphoto/ProductproductphotoRepoMock.scala
@@ -104,4 +104,12 @@ class ProductproductphotoRepoMock(toRow: Function1[ProductproductphotoRowUnsaved
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductproductphotoRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
index d6f45cb205..0ba09bb109 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepo.scala
@@ -32,4 +32,5 @@ trait ProductreviewRepo {
   def update: UpdateBuilder[ProductreviewFields, ProductreviewRow]
   def update(row: ProductreviewRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductreviewRow): ZIO[ZConnection, Throwable, UpdateResult[ProductreviewRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductreviewRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
index d2ae45bed7..6d514f984d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoImpl.scala
@@ -136,4 +136,22 @@ class ProductreviewRepoImpl extends ProductreviewRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productreviewid", "productid", "reviewername", "reviewdate"::text, "emailaddress", "rating", "comments", "modifieddate"::text""".insertReturning(using ProductreviewRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductreviewRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productreview_TEMP (like production.productreview) on commit drop".execute
+    val copied = streamingInsert(s"""copy productreview_TEMP("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate") from stdin""", batchSize, unsaved)(ProductreviewRow.text)
+    val merged = sql"""insert into production.productreview("productreviewid", "productid", "reviewername", "reviewdate", "emailaddress", "rating", "comments", "modifieddate")
+                       select * from productreview_TEMP
+                       on conflict ("productreviewid")
+                       do update set
+                         "productid" = EXCLUDED."productid",
+                         "reviewername" = EXCLUDED."reviewername",
+                         "reviewdate" = EXCLUDED."reviewdate",
+                         "emailaddress" = EXCLUDED."emailaddress",
+                         "rating" = EXCLUDED."rating",
+                         "comments" = EXCLUDED."comments",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productreview_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
index 791c10e64f..1a44283185 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productreview/ProductreviewRepoMock.scala
@@ -104,4 +104,12 @@ class ProductreviewRepoMock(toRow: Function1[ProductreviewRowUnsaved, Productrev
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductreviewRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productreviewid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
index b0d3f39526..00c66fa235 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepo.scala
@@ -32,4 +32,5 @@ trait ProductsubcategoryRepo {
   def update: UpdateBuilder[ProductsubcategoryFields, ProductsubcategoryRow]
   def update(row: ProductsubcategoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductsubcategoryRow): ZIO[ZConnection, Throwable, UpdateResult[ProductsubcategoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductsubcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
index 0cf7c59751..471f0885f7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoImpl.scala
@@ -124,4 +124,19 @@ class ProductsubcategoryRepoImpl extends ProductsubcategoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate"::text""".insertReturning(using ProductsubcategoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductsubcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productsubcategory_TEMP (like production.productsubcategory) on commit drop".execute
+    val copied = streamingInsert(s"""copy productsubcategory_TEMP("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ProductsubcategoryRow.text)
+    val merged = sql"""insert into production.productsubcategory("productsubcategoryid", "productcategoryid", "name", "rowguid", "modifieddate")
+                       select * from productsubcategory_TEMP
+                       on conflict ("productsubcategoryid")
+                       do update set
+                         "productcategoryid" = EXCLUDED."productcategoryid",
+                         "name" = EXCLUDED."name",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productsubcategory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
index e34b3f74be..e477787622 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/productsubcategory/ProductsubcategoryRepoMock.scala
@@ -104,4 +104,12 @@ class ProductsubcategoryRepoMock(toRow: Function1[ProductsubcategoryRowUnsaved,
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductsubcategoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.productsubcategoryid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
index 591e1f6f01..31ce6f9f76 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepo.scala
@@ -32,4 +32,5 @@ trait ScrapreasonRepo {
   def update: UpdateBuilder[ScrapreasonFields, ScrapreasonRow]
   def update(row: ScrapreasonRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ScrapreasonRow): ZIO[ZConnection, Throwable, UpdateResult[ScrapreasonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ScrapreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
index 13c70d4bb6..b2e51c0614 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoImpl.scala
@@ -111,4 +111,17 @@ class ScrapreasonRepoImpl extends ScrapreasonRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "scrapreasonid", "name", "modifieddate"::text""".insertReturning(using ScrapreasonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ScrapreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table scrapreason_TEMP (like production.scrapreason) on commit drop".execute
+    val copied = streamingInsert(s"""copy scrapreason_TEMP("scrapreasonid", "name", "modifieddate") from stdin""", batchSize, unsaved)(ScrapreasonRow.text)
+    val merged = sql"""insert into production.scrapreason("scrapreasonid", "name", "modifieddate")
+                       select * from scrapreason_TEMP
+                       on conflict ("scrapreasonid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table scrapreason_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
index bd35f68e10..cc0896fa21 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/scrapreason/ScrapreasonRepoMock.scala
@@ -104,4 +104,12 @@ class ScrapreasonRepoMock(toRow: Function1[ScrapreasonRowUnsaved, ScrapreasonRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ScrapreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.scrapreasonid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
index 5fd64695fa..a566e12dad 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepo.scala
@@ -32,4 +32,5 @@ trait TransactionhistoryRepo {
   def update: UpdateBuilder[TransactionhistoryFields, TransactionhistoryRow]
   def update(row: TransactionhistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: TransactionhistoryRow): ZIO[ZConnection, Throwable, UpdateResult[TransactionhistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
index fc3444f3db..d483943891 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoImpl.scala
@@ -142,4 +142,23 @@ class TransactionhistoryRepoImpl extends TransactionhistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate"::text, "transactiontype", "quantity", "actualcost", "modifieddate"::text""".insertReturning(using TransactionhistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table transactionhistory_TEMP (like production.transactionhistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy transactionhistory_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(TransactionhistoryRow.text)
+    val merged = sql"""insert into production.transactionhistory("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+                       select * from transactionhistory_TEMP
+                       on conflict ("transactionid")
+                       do update set
+                         "productid" = EXCLUDED."productid",
+                         "referenceorderid" = EXCLUDED."referenceorderid",
+                         "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+                         "transactiondate" = EXCLUDED."transactiondate",
+                         "transactiontype" = EXCLUDED."transactiontype",
+                         "quantity" = EXCLUDED."quantity",
+                         "actualcost" = EXCLUDED."actualcost",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table transactionhistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
index d2093da597..885d19cf1d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistory/TransactionhistoryRepoMock.scala
@@ -104,4 +104,12 @@ class TransactionhistoryRepoMock(toRow: Function1[TransactionhistoryRowUnsaved,
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.transactionid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
index f9a6d2ebce..6a09a42b07 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepo.scala
@@ -32,4 +32,5 @@ trait TransactionhistoryarchiveRepo {
   def update: UpdateBuilder[TransactionhistoryarchiveFields, TransactionhistoryarchiveRow]
   def update(row: TransactionhistoryarchiveRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: TransactionhistoryarchiveRow): ZIO[ZConnection, Throwable, UpdateResult[TransactionhistoryarchiveRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryarchiveRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
index cef5180d39..3ba51c8208 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoImpl.scala
@@ -138,4 +138,23 @@ class TransactionhistoryarchiveRepoImpl extends TransactionhistoryarchiveRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate"::text, "transactiontype", "quantity", "actualcost", "modifieddate"::text""".insertReturning(using TransactionhistoryarchiveRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryarchiveRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table transactionhistoryarchive_TEMP (like production.transactionhistoryarchive) on commit drop".execute
+    val copied = streamingInsert(s"""copy transactionhistoryarchive_TEMP("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(TransactionhistoryarchiveRow.text)
+    val merged = sql"""insert into production.transactionhistoryarchive("transactionid", "productid", "referenceorderid", "referenceorderlineid", "transactiondate", "transactiontype", "quantity", "actualcost", "modifieddate")
+                       select * from transactionhistoryarchive_TEMP
+                       on conflict ("transactionid")
+                       do update set
+                         "productid" = EXCLUDED."productid",
+                         "referenceorderid" = EXCLUDED."referenceorderid",
+                         "referenceorderlineid" = EXCLUDED."referenceorderlineid",
+                         "transactiondate" = EXCLUDED."transactiondate",
+                         "transactiontype" = EXCLUDED."transactiontype",
+                         "quantity" = EXCLUDED."quantity",
+                         "actualcost" = EXCLUDED."actualcost",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table transactionhistoryarchive_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
index d7dbcae654..f0c9decad0 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/transactionhistoryarchive/TransactionhistoryarchiveRepoMock.scala
@@ -104,4 +104,12 @@ class TransactionhistoryarchiveRepoMock(toRow: Function1[Transactionhistoryarchi
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, TransactionhistoryarchiveRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.transactionid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
index 7de3b87451..4e6c02aa1e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepo.scala
@@ -32,4 +32,5 @@ trait UnitmeasureRepo {
   def update: UpdateBuilder[UnitmeasureFields, UnitmeasureRow]
   def update(row: UnitmeasureRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: UnitmeasureRow): ZIO[ZConnection, Throwable, UpdateResult[UnitmeasureRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UnitmeasureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
index 885cb06da2..a29041e771 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoImpl.scala
@@ -108,4 +108,17 @@ class UnitmeasureRepoImpl extends UnitmeasureRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "unitmeasurecode", "name", "modifieddate"::text""".insertReturning(using UnitmeasureRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UnitmeasureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table unitmeasure_TEMP (like production.unitmeasure) on commit drop".execute
+    val copied = streamingInsert(s"""copy unitmeasure_TEMP("unitmeasurecode", "name", "modifieddate") from stdin""", batchSize, unsaved)(UnitmeasureRow.text)
+    val merged = sql"""insert into production.unitmeasure("unitmeasurecode", "name", "modifieddate")
+                       select * from unitmeasure_TEMP
+                       on conflict ("unitmeasurecode")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table unitmeasure_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
index ff47e0dccc..068edc5b7a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/unitmeasure/UnitmeasureRepoMock.scala
@@ -104,4 +104,12 @@ class UnitmeasureRepoMock(toRow: Function1[UnitmeasureRowUnsaved, UnitmeasureRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UnitmeasureRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.unitmeasurecode -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
index f58124a293..abb1a8c53a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepo.scala
@@ -32,4 +32,5 @@ trait WorkorderRepo {
   def update: UpdateBuilder[WorkorderFields, WorkorderRow]
   def update(row: WorkorderRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: WorkorderRow): ZIO[ZConnection, Throwable, UpdateResult[WorkorderRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
index ae17d35041..194f22798b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoImpl.scala
@@ -138,4 +138,23 @@ class WorkorderRepoImpl extends WorkorderRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "workorderid", "productid", "orderqty", "scrappedqty", "startdate"::text, "enddate"::text, "duedate"::text, "scrapreasonid", "modifieddate"::text""".insertReturning(using WorkorderRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table workorder_TEMP (like production.workorder) on commit drop".execute
+    val copied = streamingInsert(s"""copy workorder_TEMP("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate") from stdin""", batchSize, unsaved)(WorkorderRow.text)
+    val merged = sql"""insert into production.workorder("workorderid", "productid", "orderqty", "scrappedqty", "startdate", "enddate", "duedate", "scrapreasonid", "modifieddate")
+                       select * from workorder_TEMP
+                       on conflict ("workorderid")
+                       do update set
+                         "productid" = EXCLUDED."productid",
+                         "orderqty" = EXCLUDED."orderqty",
+                         "scrappedqty" = EXCLUDED."scrappedqty",
+                         "startdate" = EXCLUDED."startdate",
+                         "enddate" = EXCLUDED."enddate",
+                         "duedate" = EXCLUDED."duedate",
+                         "scrapreasonid" = EXCLUDED."scrapreasonid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table workorder_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
index 5f6fb7a10a..b400a09cda 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorder/WorkorderRepoMock.scala
@@ -104,4 +104,12 @@ class WorkorderRepoMock(toRow: Function1[WorkorderRowUnsaved, WorkorderRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.workorderid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
index 69e4845451..74e7fe4693 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepo.scala
@@ -32,4 +32,5 @@ trait WorkorderroutingRepo {
   def update: UpdateBuilder[WorkorderroutingFields, WorkorderroutingRow]
   def update(row: WorkorderroutingRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: WorkorderroutingRow): ZIO[ZConnection, Throwable, UpdateResult[WorkorderroutingRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderroutingRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
index a40f78010d..9df5d1a8eb 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoImpl.scala
@@ -159,4 +159,24 @@ class WorkorderroutingRepoImpl extends WorkorderroutingRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate"::text, "scheduledenddate"::text, "actualstartdate"::text, "actualenddate"::text, "actualresourcehrs", "plannedcost", "actualcost", "modifieddate"::text""".insertReturning(using WorkorderroutingRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderroutingRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table workorderrouting_TEMP (like production.workorderrouting) on commit drop".execute
+    val copied = streamingInsert(s"""copy workorderrouting_TEMP("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate") from stdin""", batchSize, unsaved)(WorkorderroutingRow.text)
+    val merged = sql"""insert into production.workorderrouting("workorderid", "productid", "operationsequence", "locationid", "scheduledstartdate", "scheduledenddate", "actualstartdate", "actualenddate", "actualresourcehrs", "plannedcost", "actualcost", "modifieddate")
+                       select * from workorderrouting_TEMP
+                       on conflict ("workorderid", "productid", "operationsequence")
+                       do update set
+                         "locationid" = EXCLUDED."locationid",
+                         "scheduledstartdate" = EXCLUDED."scheduledstartdate",
+                         "scheduledenddate" = EXCLUDED."scheduledenddate",
+                         "actualstartdate" = EXCLUDED."actualstartdate",
+                         "actualenddate" = EXCLUDED."actualenddate",
+                         "actualresourcehrs" = EXCLUDED."actualresourcehrs",
+                         "plannedcost" = EXCLUDED."plannedcost",
+                         "actualcost" = EXCLUDED."actualcost",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table workorderrouting_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
index a3d43858cc..4e56a752d4 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/production/workorderrouting/WorkorderroutingRepoMock.scala
@@ -104,4 +104,12 @@ class WorkorderroutingRepoMock(toRow: Function1[WorkorderroutingRowUnsaved, Work
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, WorkorderroutingRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
index f1237e8762..8cf2b1814a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepo.scala
@@ -29,4 +29,5 @@ trait FlaffRepo {
   def update: UpdateBuilder[FlaffFields, FlaffRow]
   def update(row: FlaffRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: FlaffRow): ZIO[ZConnection, Throwable, UpdateResult[FlaffRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FlaffRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
index 9d7cf7a6a7..ea8f17ad80 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoImpl.scala
@@ -97,4 +97,16 @@ class FlaffRepoImpl extends FlaffRepo {
             "parentspecifier" = EXCLUDED."parentspecifier"
           returning "code", "another_code", "some_number", "specifier", "parentspecifier"""".insertReturning(using FlaffRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FlaffRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table flaff_TEMP (like public.flaff) on commit drop".execute
+    val copied = streamingInsert(s"""copy flaff_TEMP("code", "another_code", "some_number", "specifier", "parentspecifier") from stdin""", batchSize, unsaved)(FlaffRow.text)
+    val merged = sql"""insert into public.flaff("code", "another_code", "some_number", "specifier", "parentspecifier")
+                       select * from flaff_TEMP
+                       on conflict ("code", "another_code", "some_number", "specifier")
+                       do update set
+                         "parentspecifier" = EXCLUDED."parentspecifier"
+                       ;
+                       drop table flaff_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
index c498852dd3..d453e5d93a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/flaff/FlaffRepoMock.scala
@@ -90,4 +90,12 @@ class FlaffRepoMock(map: scala.collection.mutable.Map[FlaffId, FlaffRow] = scala
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, FlaffRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
index 94abafbe0e..82991643b1 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepo.scala
@@ -32,4 +32,5 @@ trait IdentityTestRepo {
   def update: UpdateBuilder[IdentityTestFields, IdentityTestRow]
   def update(row: IdentityTestRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: IdentityTestRow): ZIO[ZConnection, Throwable, UpdateResult[IdentityTestRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IdentityTestRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
index 1d70a20260..fdd7637af1 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoImpl.scala
@@ -106,4 +106,17 @@ class IdentityTestRepoImpl extends IdentityTestRepo {
             "default_generated" = EXCLUDED."default_generated"
           returning "always_generated", "default_generated", "name"""".insertReturning(using IdentityTestRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IdentityTestRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table identity-test_TEMP (like public.identity-test) on commit drop".execute
+    val copied = streamingInsert(s"""copy identity-test_TEMP("always_generated", "default_generated", "name") from stdin""", batchSize, unsaved)(IdentityTestRow.text)
+    val merged = sql"""insert into public.identity-test("always_generated", "default_generated", "name")
+                       select * from identity-test_TEMP
+                       on conflict ("name")
+                       do update set
+                         "always_generated" = EXCLUDED."always_generated",
+                         "default_generated" = EXCLUDED."default_generated"
+                       ;
+                       drop table identity-test_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
index 885b7ceaf7..10a404a2e3 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/identity_test/IdentityTestRepoMock.scala
@@ -104,4 +104,12 @@ class IdentityTestRepoMock(toRow: Function1[IdentityTestRowUnsaved, IdentityTest
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, IdentityTestRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.name -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
index ff5fc2d619..5e93807f7c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepo.scala
@@ -34,4 +34,5 @@ trait UsersRepo {
   def update: UpdateBuilder[UsersFields, UsersRow]
   def update(row: UsersRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: UsersRow): ZIO[ZConnection, Throwable, UpdateResult[UsersRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UsersRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
index ca99aff9a4..8700db9ea8 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoImpl.scala
@@ -131,4 +131,21 @@ class UsersRepoImpl extends UsersRepo {
             "verified_on" = EXCLUDED."verified_on"
           returning "user_id", "name", "last_name", "email"::text, "password", "created_at"::text, "verified_on"::text""".insertReturning(using UsersRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UsersRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table users_TEMP (like public.users) on commit drop".execute
+    val copied = streamingInsert(s"""copy users_TEMP("user_id", "name", "last_name", "email", "password", "created_at", "verified_on") from stdin""", batchSize, unsaved)(UsersRow.text)
+    val merged = sql"""insert into public.users("user_id", "name", "last_name", "email", "password", "created_at", "verified_on")
+                       select * from users_TEMP
+                       on conflict ("user_id")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "last_name" = EXCLUDED."last_name",
+                         "email" = EXCLUDED."email",
+                         "password" = EXCLUDED."password",
+                         "created_at" = EXCLUDED."created_at",
+                         "verified_on" = EXCLUDED."verified_on"
+                       ;
+                       drop table users_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
index 578a0d2762..1970d499bd 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/public/users/UsersRepoMock.scala
@@ -108,4 +108,12 @@ class UsersRepoMock(toRow: Function1[UsersRowUnsaved, UsersRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, UsersRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.userId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
index 4b42e7a0f3..50ea25bdbb 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepo.scala
@@ -32,4 +32,5 @@ trait ProductvendorRepo {
   def update: UpdateBuilder[ProductvendorFields, ProductvendorRow]
   def update(row: ProductvendorRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ProductvendorRow): ZIO[ZConnection, Throwable, UpdateResult[ProductvendorRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductvendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
index 1963407225..96dde0f50e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoImpl.scala
@@ -155,4 +155,24 @@ class ProductvendorRepoImpl extends ProductvendorRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate"::text, "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate"::text""".insertReturning(using ProductvendorRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductvendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table productvendor_TEMP (like purchasing.productvendor) on commit drop".execute
+    val copied = streamingInsert(s"""copy productvendor_TEMP("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate") from stdin""", batchSize, unsaved)(ProductvendorRow.text)
+    val merged = sql"""insert into purchasing.productvendor("productid", "businessentityid", "averageleadtime", "standardprice", "lastreceiptcost", "lastreceiptdate", "minorderqty", "maxorderqty", "onorderqty", "unitmeasurecode", "modifieddate")
+                       select * from productvendor_TEMP
+                       on conflict ("productid", "businessentityid")
+                       do update set
+                         "averageleadtime" = EXCLUDED."averageleadtime",
+                         "standardprice" = EXCLUDED."standardprice",
+                         "lastreceiptcost" = EXCLUDED."lastreceiptcost",
+                         "lastreceiptdate" = EXCLUDED."lastreceiptdate",
+                         "minorderqty" = EXCLUDED."minorderqty",
+                         "maxorderqty" = EXCLUDED."maxorderqty",
+                         "onorderqty" = EXCLUDED."onorderqty",
+                         "unitmeasurecode" = EXCLUDED."unitmeasurecode",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table productvendor_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
index f5aa4d8503..eede26f24d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/productvendor/ProductvendorRepoMock.scala
@@ -104,4 +104,12 @@ class ProductvendorRepoMock(toRow: Function1[ProductvendorRowUnsaved, Productven
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ProductvendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
index 3e7e3ea94d..aab8662d0f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepo.scala
@@ -32,4 +32,5 @@ trait PurchaseorderheaderRepo {
   def update: UpdateBuilder[PurchaseorderheaderFields, PurchaseorderheaderRow]
   def update(row: PurchaseorderheaderRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PurchaseorderheaderRow): ZIO[ZConnection, Throwable, UpdateResult[PurchaseorderheaderRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PurchaseorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
index b2a9f8cf2f..c6c3737a64 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoImpl.scala
@@ -168,4 +168,26 @@ class PurchaseorderheaderRepoImpl extends PurchaseorderheaderRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate"::text, "shipdate"::text, "subtotal", "taxamt", "freight", "modifieddate"::text""".insertReturning(using PurchaseorderheaderRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PurchaseorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table purchaseorderheader_TEMP (like purchasing.purchaseorderheader) on commit drop".execute
+    val copied = streamingInsert(s"""copy purchaseorderheader_TEMP("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate") from stdin""", batchSize, unsaved)(PurchaseorderheaderRow.text)
+    val merged = sql"""insert into purchasing.purchaseorderheader("purchaseorderid", "revisionnumber", "status", "employeeid", "vendorid", "shipmethodid", "orderdate", "shipdate", "subtotal", "taxamt", "freight", "modifieddate")
+                       select * from purchaseorderheader_TEMP
+                       on conflict ("purchaseorderid")
+                       do update set
+                         "revisionnumber" = EXCLUDED."revisionnumber",
+                         "status" = EXCLUDED."status",
+                         "employeeid" = EXCLUDED."employeeid",
+                         "vendorid" = EXCLUDED."vendorid",
+                         "shipmethodid" = EXCLUDED."shipmethodid",
+                         "orderdate" = EXCLUDED."orderdate",
+                         "shipdate" = EXCLUDED."shipdate",
+                         "subtotal" = EXCLUDED."subtotal",
+                         "taxamt" = EXCLUDED."taxamt",
+                         "freight" = EXCLUDED."freight",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table purchaseorderheader_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
index 6e718679a8..75a7041534 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/purchaseorderheader/PurchaseorderheaderRepoMock.scala
@@ -104,4 +104,12 @@ class PurchaseorderheaderRepoMock(toRow: Function1[PurchaseorderheaderRowUnsaved
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PurchaseorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.purchaseorderid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
index 981ee3cb9f..e2e7b66b13 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepo.scala
@@ -32,4 +32,5 @@ trait ShipmethodRepo {
   def update: UpdateBuilder[ShipmethodFields, ShipmethodRow]
   def update(row: ShipmethodRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ShipmethodRow): ZIO[ZConnection, Throwable, UpdateResult[ShipmethodRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShipmethodRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
index 1720360ccb..193b9aeb40 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoImpl.scala
@@ -134,4 +134,20 @@ class ShipmethodRepoImpl extends ShipmethodRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate"::text""".insertReturning(using ShipmethodRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShipmethodRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table shipmethod_TEMP (like purchasing.shipmethod) on commit drop".execute
+    val copied = streamingInsert(s"""copy shipmethod_TEMP("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(ShipmethodRow.text)
+    val merged = sql"""insert into purchasing.shipmethod("shipmethodid", "name", "shipbase", "shiprate", "rowguid", "modifieddate")
+                       select * from shipmethod_TEMP
+                       on conflict ("shipmethodid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "shipbase" = EXCLUDED."shipbase",
+                         "shiprate" = EXCLUDED."shiprate",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table shipmethod_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
index cfcfc0d4bf..ab2d258ee0 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/shipmethod/ShipmethodRepoMock.scala
@@ -104,4 +104,12 @@ class ShipmethodRepoMock(toRow: Function1[ShipmethodRowUnsaved, ShipmethodRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShipmethodRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.shipmethodid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
index 8c492a5d32..016497ee82 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepo.scala
@@ -33,4 +33,5 @@ trait VendorRepo {
   def update: UpdateBuilder[VendorFields, VendorRow]
   def update(row: VendorRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: VendorRow): ZIO[ZConnection, Throwable, UpdateResult[VendorRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, VendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
index 4950511a5e..58e565a73d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoImpl.scala
@@ -139,4 +139,22 @@ class VendorRepoImpl extends VendorRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate"::text""".insertReturning(using VendorRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, VendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table vendor_TEMP (like purchasing.vendor) on commit drop".execute
+    val copied = streamingInsert(s"""copy vendor_TEMP("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate") from stdin""", batchSize, unsaved)(VendorRow.text)
+    val merged = sql"""insert into purchasing.vendor("businessentityid", "accountnumber", "name", "creditrating", "preferredvendorstatus", "activeflag", "purchasingwebserviceurl", "modifieddate")
+                       select * from vendor_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "accountnumber" = EXCLUDED."accountnumber",
+                         "name" = EXCLUDED."name",
+                         "creditrating" = EXCLUDED."creditrating",
+                         "preferredvendorstatus" = EXCLUDED."preferredvendorstatus",
+                         "activeflag" = EXCLUDED."activeflag",
+                         "purchasingwebserviceurl" = EXCLUDED."purchasingwebserviceurl",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table vendor_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
index 1d744413b3..f7742bdb43 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/purchasing/vendor/VendorRepoMock.scala
@@ -105,4 +105,12 @@ class VendorRepoMock(toRow: Function1[VendorRowUnsaved, VendorRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, VendorRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
index 1b00302e48..1a7cbff448 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepo.scala
@@ -32,4 +32,5 @@ trait CountryregioncurrencyRepo {
   def update: UpdateBuilder[CountryregioncurrencyFields, CountryregioncurrencyRow]
   def update(row: CountryregioncurrencyRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CountryregioncurrencyRow): ZIO[ZConnection, Throwable, UpdateResult[CountryregioncurrencyRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregioncurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
index 115741d379..814102cbf2 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoImpl.scala
@@ -121,4 +121,16 @@ class CountryregioncurrencyRepoImpl extends CountryregioncurrencyRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "countryregioncode", "currencycode", "modifieddate"::text""".insertReturning(using CountryregioncurrencyRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregioncurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table countryregioncurrency_TEMP (like sales.countryregioncurrency) on commit drop".execute
+    val copied = streamingInsert(s"""copy countryregioncurrency_TEMP("countryregioncode", "currencycode", "modifieddate") from stdin""", batchSize, unsaved)(CountryregioncurrencyRow.text)
+    val merged = sql"""insert into sales.countryregioncurrency("countryregioncode", "currencycode", "modifieddate")
+                       select * from countryregioncurrency_TEMP
+                       on conflict ("countryregioncode", "currencycode")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table countryregioncurrency_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
index 6cdc2736fe..4382e6487c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/countryregioncurrency/CountryregioncurrencyRepoMock.scala
@@ -104,4 +104,12 @@ class CountryregioncurrencyRepoMock(toRow: Function1[CountryregioncurrencyRowUns
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CountryregioncurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
index c8ec9706ea..b577d771b8 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepo.scala
@@ -34,4 +34,5 @@ trait CreditcardRepo {
   def update: UpdateBuilder[CreditcardFields, CreditcardRow]
   def update(row: CreditcardRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CreditcardRow): ZIO[ZConnection, Throwable, UpdateResult[CreditcardRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
index 8aec1fe2ae..f281ebd719 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoImpl.scala
@@ -126,4 +126,20 @@ class CreditcardRepoImpl extends CreditcardRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate"::text""".insertReturning(using CreditcardRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table creditcard_TEMP (like sales.creditcard) on commit drop".execute
+    val copied = streamingInsert(s"""copy creditcard_TEMP("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate") from stdin""", batchSize, unsaved)(CreditcardRow.text)
+    val merged = sql"""insert into sales.creditcard("creditcardid", "cardtype", "cardnumber", "expmonth", "expyear", "modifieddate")
+                       select * from creditcard_TEMP
+                       on conflict ("creditcardid")
+                       do update set
+                         "cardtype" = EXCLUDED."cardtype",
+                         "cardnumber" = EXCLUDED."cardnumber",
+                         "expmonth" = EXCLUDED."expmonth",
+                         "expyear" = EXCLUDED."expyear",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table creditcard_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
index 291a41d1f9..55edfcde29 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/creditcard/CreditcardRepoMock.scala
@@ -106,4 +106,12 @@ class CreditcardRepoMock(toRow: Function1[CreditcardRowUnsaved, CreditcardRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.creditcardid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
index debac359be..27a10419f5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepo.scala
@@ -32,4 +32,5 @@ trait CurrencyRepo {
   def update: UpdateBuilder[CurrencyFields, CurrencyRow]
   def update(row: CurrencyRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CurrencyRow): ZIO[ZConnection, Throwable, UpdateResult[CurrencyRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
index 9249342c24..0149d30731 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoImpl.scala
@@ -108,4 +108,17 @@ class CurrencyRepoImpl extends CurrencyRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "currencycode", "name", "modifieddate"::text""".insertReturning(using CurrencyRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table currency_TEMP (like sales.currency) on commit drop".execute
+    val copied = streamingInsert(s"""copy currency_TEMP("currencycode", "name", "modifieddate") from stdin""", batchSize, unsaved)(CurrencyRow.text)
+    val merged = sql"""insert into sales.currency("currencycode", "name", "modifieddate")
+                       select * from currency_TEMP
+                       on conflict ("currencycode")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table currency_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
index 1ad286085d..c8aad2a134 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currency/CurrencyRepoMock.scala
@@ -104,4 +104,12 @@ class CurrencyRepoMock(toRow: Function1[CurrencyRowUnsaved, CurrencyRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.currencycode -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
index 124c5481b6..c4fdbdfe98 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepo.scala
@@ -32,4 +32,5 @@ trait CurrencyrateRepo {
   def update: UpdateBuilder[CurrencyrateFields, CurrencyrateRow]
   def update(row: CurrencyrateRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CurrencyrateRow): ZIO[ZConnection, Throwable, UpdateResult[CurrencyrateRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
index ffbc50a108..251f70e081 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoImpl.scala
@@ -128,4 +128,21 @@ class CurrencyrateRepoImpl extends CurrencyrateRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "currencyrateid", "currencyratedate"::text, "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate"::text""".insertReturning(using CurrencyrateRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table currencyrate_TEMP (like sales.currencyrate) on commit drop".execute
+    val copied = streamingInsert(s"""copy currencyrate_TEMP("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate") from stdin""", batchSize, unsaved)(CurrencyrateRow.text)
+    val merged = sql"""insert into sales.currencyrate("currencyrateid", "currencyratedate", "fromcurrencycode", "tocurrencycode", "averagerate", "endofdayrate", "modifieddate")
+                       select * from currencyrate_TEMP
+                       on conflict ("currencyrateid")
+                       do update set
+                         "currencyratedate" = EXCLUDED."currencyratedate",
+                         "fromcurrencycode" = EXCLUDED."fromcurrencycode",
+                         "tocurrencycode" = EXCLUDED."tocurrencycode",
+                         "averagerate" = EXCLUDED."averagerate",
+                         "endofdayrate" = EXCLUDED."endofdayrate",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table currencyrate_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
index fbb47db580..8d8038525b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/currencyrate/CurrencyrateRepoMock.scala
@@ -104,4 +104,12 @@ class CurrencyrateRepoMock(toRow: Function1[CurrencyrateRowUnsaved, Currencyrate
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CurrencyrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.currencyrateid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
index 709ff71e31..6135938c1d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepo.scala
@@ -32,4 +32,5 @@ trait CustomerRepo {
   def update: UpdateBuilder[CustomerFields, CustomerRow]
   def update(row: CustomerRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: CustomerRow): ZIO[ZConnection, Throwable, UpdateResult[CustomerRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CustomerRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
index 3c5be1cab5..56dd13d60e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoImpl.scala
@@ -129,4 +129,20 @@ class CustomerRepoImpl extends CustomerRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate"::text""".insertReturning(using CustomerRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CustomerRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table customer_TEMP (like sales.customer) on commit drop".execute
+    val copied = streamingInsert(s"""copy customer_TEMP("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(CustomerRow.text)
+    val merged = sql"""insert into sales.customer("customerid", "personid", "storeid", "territoryid", "rowguid", "modifieddate")
+                       select * from customer_TEMP
+                       on conflict ("customerid")
+                       do update set
+                         "personid" = EXCLUDED."personid",
+                         "storeid" = EXCLUDED."storeid",
+                         "territoryid" = EXCLUDED."territoryid",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table customer_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
index 9381b34951..6ad87e02fe 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/customer/CustomerRepoMock.scala
@@ -104,4 +104,12 @@ class CustomerRepoMock(toRow: Function1[CustomerRowUnsaved, CustomerRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, CustomerRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.customerid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
index 71c56ddf07..ab353f0399 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepo.scala
@@ -34,4 +34,5 @@ trait PersoncreditcardRepo {
   def update: UpdateBuilder[PersoncreditcardFields, PersoncreditcardRow]
   def update(row: PersoncreditcardRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: PersoncreditcardRow): ZIO[ZConnection, Throwable, UpdateResult[PersoncreditcardRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersoncreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
index 172b8a34f9..694def00f7 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoImpl.scala
@@ -122,4 +122,16 @@ class PersoncreditcardRepoImpl extends PersoncreditcardRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "creditcardid", "modifieddate"::text""".insertReturning(using PersoncreditcardRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersoncreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table personcreditcard_TEMP (like sales.personcreditcard) on commit drop".execute
+    val copied = streamingInsert(s"""copy personcreditcard_TEMP("businessentityid", "creditcardid", "modifieddate") from stdin""", batchSize, unsaved)(PersoncreditcardRow.text)
+    val merged = sql"""insert into sales.personcreditcard("businessentityid", "creditcardid", "modifieddate")
+                       select * from personcreditcard_TEMP
+                       on conflict ("businessentityid", "creditcardid")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table personcreditcard_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
index 1f97ec8e5d..a6cff3c98e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/personcreditcard/PersoncreditcardRepoMock.scala
@@ -106,4 +106,12 @@ class PersoncreditcardRepoMock(toRow: Function1[PersoncreditcardRowUnsaved, Pers
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, PersoncreditcardRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
index fcf64e94e6..0da3a179bd 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepo.scala
@@ -32,4 +32,5 @@ trait SalesorderdetailRepo {
   def update: UpdateBuilder[SalesorderdetailFields, SalesorderdetailRow]
   def update(row: SalesorderdetailRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesorderdetailRow): ZIO[ZConnection, Throwable, UpdateResult[SalesorderdetailRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderdetailRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
index 53ac8405c5..8baac155e0 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoImpl.scala
@@ -162,4 +162,23 @@ class SalesorderdetailRepoImpl extends SalesorderdetailRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate"::text""".insertReturning(using SalesorderdetailRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderdetailRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesorderdetail_TEMP (like sales.salesorderdetail) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesorderdetail_TEMP("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderdetailRow.text)
+    val merged = sql"""insert into sales.salesorderdetail("salesorderid", "salesorderdetailid", "carriertrackingnumber", "orderqty", "productid", "specialofferid", "unitprice", "unitpricediscount", "rowguid", "modifieddate")
+                       select * from salesorderdetail_TEMP
+                       on conflict ("salesorderid", "salesorderdetailid")
+                       do update set
+                         "carriertrackingnumber" = EXCLUDED."carriertrackingnumber",
+                         "orderqty" = EXCLUDED."orderqty",
+                         "productid" = EXCLUDED."productid",
+                         "specialofferid" = EXCLUDED."specialofferid",
+                         "unitprice" = EXCLUDED."unitprice",
+                         "unitpricediscount" = EXCLUDED."unitpricediscount",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesorderdetail_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
index f3c464945b..860f47c07f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderdetail/SalesorderdetailRepoMock.scala
@@ -104,4 +104,12 @@ class SalesorderdetailRepoMock(toRow: Function1[SalesorderdetailRowUnsaved, Sale
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderdetailRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
index b4a0ba40fb..230b128f4d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepo.scala
@@ -32,4 +32,5 @@ trait SalesorderheaderRepo {
   def update: UpdateBuilder[SalesorderheaderFields, SalesorderheaderRow]
   def update(row: SalesorderheaderRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesorderheaderRow): ZIO[ZConnection, Throwable, UpdateResult[SalesorderheaderRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
index 67f2d5b14a..60b9af23b9 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoImpl.scala
@@ -235,4 +235,39 @@ class SalesorderheaderRepoImpl extends SalesorderheaderRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "salesorderid", "revisionnumber", "orderdate"::text, "duedate"::text, "shipdate"::text, "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate"::text""".insertReturning(using SalesorderheaderRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesorderheader_TEMP (like sales.salesorderheader) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesorderheader_TEMP("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderheaderRow.text)
+    val merged = sql"""insert into sales.salesorderheader("salesorderid", "revisionnumber", "orderdate", "duedate", "shipdate", "status", "onlineorderflag", "purchaseordernumber", "accountnumber", "customerid", "salespersonid", "territoryid", "billtoaddressid", "shiptoaddressid", "shipmethodid", "creditcardid", "creditcardapprovalcode", "currencyrateid", "subtotal", "taxamt", "freight", "totaldue", "comment", "rowguid", "modifieddate")
+                       select * from salesorderheader_TEMP
+                       on conflict ("salesorderid")
+                       do update set
+                         "revisionnumber" = EXCLUDED."revisionnumber",
+                         "orderdate" = EXCLUDED."orderdate",
+                         "duedate" = EXCLUDED."duedate",
+                         "shipdate" = EXCLUDED."shipdate",
+                         "status" = EXCLUDED."status",
+                         "onlineorderflag" = EXCLUDED."onlineorderflag",
+                         "purchaseordernumber" = EXCLUDED."purchaseordernumber",
+                         "accountnumber" = EXCLUDED."accountnumber",
+                         "customerid" = EXCLUDED."customerid",
+                         "salespersonid" = EXCLUDED."salespersonid",
+                         "territoryid" = EXCLUDED."territoryid",
+                         "billtoaddressid" = EXCLUDED."billtoaddressid",
+                         "shiptoaddressid" = EXCLUDED."shiptoaddressid",
+                         "shipmethodid" = EXCLUDED."shipmethodid",
+                         "creditcardid" = EXCLUDED."creditcardid",
+                         "creditcardapprovalcode" = EXCLUDED."creditcardapprovalcode",
+                         "currencyrateid" = EXCLUDED."currencyrateid",
+                         "subtotal" = EXCLUDED."subtotal",
+                         "taxamt" = EXCLUDED."taxamt",
+                         "freight" = EXCLUDED."freight",
+                         "totaldue" = EXCLUDED."totaldue",
+                         "comment" = EXCLUDED."comment",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesorderheader_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
index ac01ebbca0..f5dd3beb63 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheader/SalesorderheaderRepoMock.scala
@@ -104,4 +104,12 @@ class SalesorderheaderRepoMock(toRow: Function1[SalesorderheaderRowUnsaved, Sale
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheaderRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.salesorderid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
index 0726ebe73e..fc1ef01ba6 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepo.scala
@@ -32,4 +32,5 @@ trait SalesorderheadersalesreasonRepo {
   def update: UpdateBuilder[SalesorderheadersalesreasonFields, SalesorderheadersalesreasonRow]
   def update(row: SalesorderheadersalesreasonRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesorderheadersalesreasonRow): ZIO[ZConnection, Throwable, UpdateResult[SalesorderheadersalesreasonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
index 49e765c06f..040e978eca 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoImpl.scala
@@ -121,4 +121,16 @@ class SalesorderheadersalesreasonRepoImpl extends SalesorderheadersalesreasonRep
             "modifieddate" = EXCLUDED."modifieddate"
           returning "salesorderid", "salesreasonid", "modifieddate"::text""".insertReturning(using SalesorderheadersalesreasonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesorderheadersalesreason_TEMP (like sales.salesorderheadersalesreason) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesorderheadersalesreason_TEMP("salesorderid", "salesreasonid", "modifieddate") from stdin""", batchSize, unsaved)(SalesorderheadersalesreasonRow.text)
+    val merged = sql"""insert into sales.salesorderheadersalesreason("salesorderid", "salesreasonid", "modifieddate")
+                       select * from salesorderheadersalesreason_TEMP
+                       on conflict ("salesorderid", "salesreasonid")
+                       do update set
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesorderheadersalesreason_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
index d3eed73955..f9199ebc09 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesorderheadersalesreason/SalesorderheadersalesreasonRepoMock.scala
@@ -104,4 +104,12 @@ class SalesorderheadersalesreasonRepoMock(toRow: Function1[Salesorderheadersales
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesorderheadersalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
index c4aa0d1150..3fdda8f12a 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepo.scala
@@ -33,4 +33,5 @@ trait SalespersonRepo {
   def update: UpdateBuilder[SalespersonFields, SalespersonRow]
   def update(row: SalespersonRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalespersonRow): ZIO[ZConnection, Throwable, UpdateResult[SalespersonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
index 8d50e89764..c08ecc86a8 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoImpl.scala
@@ -150,4 +150,23 @@ class SalespersonRepoImpl extends SalespersonRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate"::text""".insertReturning(using SalespersonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesperson_TEMP (like sales.salesperson) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesperson_TEMP("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalespersonRow.text)
+    val merged = sql"""insert into sales.salesperson("businessentityid", "territoryid", "salesquota", "bonus", "commissionpct", "salesytd", "saleslastyear", "rowguid", "modifieddate")
+                       select * from salesperson_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "territoryid" = EXCLUDED."territoryid",
+                         "salesquota" = EXCLUDED."salesquota",
+                         "bonus" = EXCLUDED."bonus",
+                         "commissionpct" = EXCLUDED."commissionpct",
+                         "salesytd" = EXCLUDED."salesytd",
+                         "saleslastyear" = EXCLUDED."saleslastyear",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesperson_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
index f7c3cf1da6..d0ccc3938b 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesperson/SalespersonRepoMock.scala
@@ -105,4 +105,12 @@ class SalespersonRepoMock(toRow: Function1[SalespersonRowUnsaved, SalespersonRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
index 19ec5ee403..3404174808 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepo.scala
@@ -32,4 +32,5 @@ trait SalespersonquotahistoryRepo {
   def update: UpdateBuilder[SalespersonquotahistoryFields, SalespersonquotahistoryRow]
   def update(row: SalespersonquotahistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalespersonquotahistoryRow): ZIO[ZConnection, Throwable, UpdateResult[SalespersonquotahistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonquotahistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
index b6c9bc46f0..c530fbdb2c 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoImpl.scala
@@ -133,4 +133,18 @@ class SalespersonquotahistoryRepoImpl extends SalespersonquotahistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "quotadate"::text, "salesquota", "rowguid", "modifieddate"::text""".insertReturning(using SalespersonquotahistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonquotahistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salespersonquotahistory_TEMP (like sales.salespersonquotahistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy salespersonquotahistory_TEMP("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalespersonquotahistoryRow.text)
+    val merged = sql"""insert into sales.salespersonquotahistory("businessentityid", "quotadate", "salesquota", "rowguid", "modifieddate")
+                       select * from salespersonquotahistory_TEMP
+                       on conflict ("businessentityid", "quotadate")
+                       do update set
+                         "salesquota" = EXCLUDED."salesquota",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salespersonquotahistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
index 6db7161aee..2e9752fbd6 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salespersonquotahistory/SalespersonquotahistoryRepoMock.scala
@@ -104,4 +104,12 @@ class SalespersonquotahistoryRepoMock(toRow: Function1[SalespersonquotahistoryRo
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalespersonquotahistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
index 670156811e..7f47636f3e 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepo.scala
@@ -32,4 +32,5 @@ trait SalesreasonRepo {
   def update: UpdateBuilder[SalesreasonFields, SalesreasonRow]
   def update(row: SalesreasonRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesreasonRow): ZIO[ZConnection, Throwable, UpdateResult[SalesreasonRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
index 52076ec057..d40bd10707 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoImpl.scala
@@ -115,4 +115,18 @@ class SalesreasonRepoImpl extends SalesreasonRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "salesreasonid", "name", "reasontype", "modifieddate"::text""".insertReturning(using SalesreasonRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesreason_TEMP (like sales.salesreason) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesreason_TEMP("salesreasonid", "name", "reasontype", "modifieddate") from stdin""", batchSize, unsaved)(SalesreasonRow.text)
+    val merged = sql"""insert into sales.salesreason("salesreasonid", "name", "reasontype", "modifieddate")
+                       select * from salesreason_TEMP
+                       on conflict ("salesreasonid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "reasontype" = EXCLUDED."reasontype",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesreason_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
index f22e606f0b..1819824200 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesreason/SalesreasonRepoMock.scala
@@ -104,4 +104,12 @@ class SalesreasonRepoMock(toRow: Function1[SalesreasonRowUnsaved, SalesreasonRow
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesreasonRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.salesreasonid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
index 89c8a059f1..d948f18758 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepo.scala
@@ -32,4 +32,5 @@ trait SalestaxrateRepo {
   def update: UpdateBuilder[SalestaxrateFields, SalestaxrateRow]
   def update(row: SalestaxrateRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalestaxrateRow): ZIO[ZConnection, Throwable, UpdateResult[SalestaxrateRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalestaxrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
index a4a4e9c7bd..f4fd885ade 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoImpl.scala
@@ -137,4 +137,21 @@ class SalestaxrateRepoImpl extends SalestaxrateRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate"::text""".insertReturning(using SalestaxrateRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalestaxrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salestaxrate_TEMP (like sales.salestaxrate) on commit drop".execute
+    val copied = streamingInsert(s"""copy salestaxrate_TEMP("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalestaxrateRow.text)
+    val merged = sql"""insert into sales.salestaxrate("salestaxrateid", "stateprovinceid", "taxtype", "taxrate", "name", "rowguid", "modifieddate")
+                       select * from salestaxrate_TEMP
+                       on conflict ("salestaxrateid")
+                       do update set
+                         "stateprovinceid" = EXCLUDED."stateprovinceid",
+                         "taxtype" = EXCLUDED."taxtype",
+                         "taxrate" = EXCLUDED."taxrate",
+                         "name" = EXCLUDED."name",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salestaxrate_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
index 2ff8b8c5a2..43cfba5ca0 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salestaxrate/SalestaxrateRepoMock.scala
@@ -104,4 +104,12 @@ class SalestaxrateRepoMock(toRow: Function1[SalestaxrateRowUnsaved, Salestaxrate
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalestaxrateRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.salestaxrateid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
index 10c0ccfe63..19185b5356 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepo.scala
@@ -32,4 +32,5 @@ trait SalesterritoryRepo {
   def update: UpdateBuilder[SalesterritoryFields, SalesterritoryRow]
   def update(row: SalesterritoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesterritoryRow): ZIO[ZConnection, Throwable, UpdateResult[SalesterritoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
index e7540f5d7c..46958f2cd2 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoImpl.scala
@@ -157,4 +157,24 @@ class SalesterritoryRepoImpl extends SalesterritoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate"::text""".insertReturning(using SalesterritoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesterritory_TEMP (like sales.salesterritory) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesterritory_TEMP("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesterritoryRow.text)
+    val merged = sql"""insert into sales.salesterritory("territoryid", "name", "countryregioncode", "group", "salesytd", "saleslastyear", "costytd", "costlastyear", "rowguid", "modifieddate")
+                       select * from salesterritory_TEMP
+                       on conflict ("territoryid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "countryregioncode" = EXCLUDED."countryregioncode",
+                         "group" = EXCLUDED."group",
+                         "salesytd" = EXCLUDED."salesytd",
+                         "saleslastyear" = EXCLUDED."saleslastyear",
+                         "costytd" = EXCLUDED."costytd",
+                         "costlastyear" = EXCLUDED."costlastyear",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesterritory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
index 43cef8c347..7d2129ebb3 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritory/SalesterritoryRepoMock.scala
@@ -104,4 +104,12 @@ class SalesterritoryRepoMock(toRow: Function1[SalesterritoryRowUnsaved, Salester
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.territoryid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
index 11e7a642ec..ff8830250f 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepo.scala
@@ -32,4 +32,5 @@ trait SalesterritoryhistoryRepo {
   def update: UpdateBuilder[SalesterritoryhistoryFields, SalesterritoryhistoryRow]
   def update(row: SalesterritoryhistoryRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SalesterritoryhistoryRow): ZIO[ZConnection, Throwable, UpdateResult[SalesterritoryhistoryRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
index 4fc126ce8e..9b037e5857 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoImpl.scala
@@ -138,4 +138,18 @@ class SalesterritoryhistoryRepoImpl extends SalesterritoryhistoryRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "territoryid", "startdate"::text, "enddate"::text, "rowguid", "modifieddate"::text""".insertReturning(using SalesterritoryhistoryRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table salesterritoryhistory_TEMP (like sales.salesterritoryhistory) on commit drop".execute
+    val copied = streamingInsert(s"""copy salesterritoryhistory_TEMP("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SalesterritoryhistoryRow.text)
+    val merged = sql"""insert into sales.salesterritoryhistory("businessentityid", "territoryid", "startdate", "enddate", "rowguid", "modifieddate")
+                       select * from salesterritoryhistory_TEMP
+                       on conflict ("businessentityid", "startdate", "territoryid")
+                       do update set
+                         "enddate" = EXCLUDED."enddate",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table salesterritoryhistory_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
index d8b9113f06..8e78904013 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/salesterritoryhistory/SalesterritoryhistoryRepoMock.scala
@@ -104,4 +104,12 @@ class SalesterritoryhistoryRepoMock(toRow: Function1[SalesterritoryhistoryRowUns
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SalesterritoryhistoryRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
index fa18348b75..be428a0a56 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepo.scala
@@ -32,4 +32,5 @@ trait ShoppingcartitemRepo {
   def update: UpdateBuilder[ShoppingcartitemFields, ShoppingcartitemRow]
   def update(row: ShoppingcartitemRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: ShoppingcartitemRow): ZIO[ZConnection, Throwable, UpdateResult[ShoppingcartitemRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShoppingcartitemRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
index 13d8b9ddf2..fae5d399bc 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoImpl.scala
@@ -130,4 +130,20 @@ class ShoppingcartitemRepoImpl extends ShoppingcartitemRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated"::text, "modifieddate"::text""".insertReturning(using ShoppingcartitemRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShoppingcartitemRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table shoppingcartitem_TEMP (like sales.shoppingcartitem) on commit drop".execute
+    val copied = streamingInsert(s"""copy shoppingcartitem_TEMP("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate") from stdin""", batchSize, unsaved)(ShoppingcartitemRow.text)
+    val merged = sql"""insert into sales.shoppingcartitem("shoppingcartitemid", "shoppingcartid", "quantity", "productid", "datecreated", "modifieddate")
+                       select * from shoppingcartitem_TEMP
+                       on conflict ("shoppingcartitemid")
+                       do update set
+                         "shoppingcartid" = EXCLUDED."shoppingcartid",
+                         "quantity" = EXCLUDED."quantity",
+                         "productid" = EXCLUDED."productid",
+                         "datecreated" = EXCLUDED."datecreated",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table shoppingcartitem_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
index a33d37745f..9d83529eda 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/shoppingcartitem/ShoppingcartitemRepoMock.scala
@@ -104,4 +104,12 @@ class ShoppingcartitemRepoMock(toRow: Function1[ShoppingcartitemRowUnsaved, Shop
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, ShoppingcartitemRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.shoppingcartitemid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
index 00d3b8c63c..8ce025ec44 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepo.scala
@@ -32,4 +32,5 @@ trait SpecialofferRepo {
   def update: UpdateBuilder[SpecialofferFields, SpecialofferRow]
   def update(row: SpecialofferRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SpecialofferRow): ZIO[ZConnection, Throwable, UpdateResult[SpecialofferRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
index 55399e98bf..4fb310f469 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoImpl.scala
@@ -153,4 +153,25 @@ class SpecialofferRepoImpl extends SpecialofferRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "specialofferid", "description", "discountpct", "type", "category", "startdate"::text, "enddate"::text, "minqty", "maxqty", "rowguid", "modifieddate"::text""".insertReturning(using SpecialofferRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table specialoffer_TEMP (like sales.specialoffer) on commit drop".execute
+    val copied = streamingInsert(s"""copy specialoffer_TEMP("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SpecialofferRow.text)
+    val merged = sql"""insert into sales.specialoffer("specialofferid", "description", "discountpct", "type", "category", "startdate", "enddate", "minqty", "maxqty", "rowguid", "modifieddate")
+                       select * from specialoffer_TEMP
+                       on conflict ("specialofferid")
+                       do update set
+                         "description" = EXCLUDED."description",
+                         "discountpct" = EXCLUDED."discountpct",
+                         "type" = EXCLUDED."type",
+                         "category" = EXCLUDED."category",
+                         "startdate" = EXCLUDED."startdate",
+                         "enddate" = EXCLUDED."enddate",
+                         "minqty" = EXCLUDED."minqty",
+                         "maxqty" = EXCLUDED."maxqty",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table specialoffer_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
index 3977a2f2ed..6424eda813 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialoffer/SpecialofferRepoMock.scala
@@ -104,4 +104,12 @@ class SpecialofferRepoMock(toRow: Function1[SpecialofferRowUnsaved, Specialoffer
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.specialofferid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
index 816c9302df..686883ce60 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepo.scala
@@ -32,4 +32,5 @@ trait SpecialofferproductRepo {
   def update: UpdateBuilder[SpecialofferproductFields, SpecialofferproductRow]
   def update(row: SpecialofferproductRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: SpecialofferproductRow): ZIO[ZConnection, Throwable, UpdateResult[SpecialofferproductRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferproductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
index e6ea351d9f..67136926a8 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoImpl.scala
@@ -129,4 +129,17 @@ class SpecialofferproductRepoImpl extends SpecialofferproductRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "specialofferid", "productid", "rowguid", "modifieddate"::text""".insertReturning(using SpecialofferproductRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferproductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table specialofferproduct_TEMP (like sales.specialofferproduct) on commit drop".execute
+    val copied = streamingInsert(s"""copy specialofferproduct_TEMP("specialofferid", "productid", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(SpecialofferproductRow.text)
+    val merged = sql"""insert into sales.specialofferproduct("specialofferid", "productid", "rowguid", "modifieddate")
+                       select * from specialofferproduct_TEMP
+                       on conflict ("specialofferid", "productid")
+                       do update set
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table specialofferproduct_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
index 8f1c036d53..23f9839eab 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/specialofferproduct/SpecialofferproductRepoMock.scala
@@ -104,4 +104,12 @@ class SpecialofferproductRepoMock(toRow: Function1[SpecialofferproductRowUnsaved
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, SpecialofferproductRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.compositeId -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
index 1585505442..1f896b80c5 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepo.scala
@@ -33,4 +33,5 @@ trait StoreRepo {
   def update: UpdateBuilder[StoreFields, StoreRow]
   def update(row: StoreRow): ZIO[ZConnection, Throwable, Boolean]
   def upsert(unsaved: StoreRow): ZIO[ZConnection, Throwable, UpdateResult[StoreRow]]
+  def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StoreRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long]
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
index f6929c1341..d012ea41e9 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoImpl.scala
@@ -127,4 +127,20 @@ class StoreRepoImpl extends StoreRepo {
             "modifieddate" = EXCLUDED."modifieddate"
           returning "businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate"::text""".insertReturning(using StoreRow.jdbcDecoder)
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StoreRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    val created = sql"create temporary table store_TEMP (like sales.store) on commit drop".execute
+    val copied = streamingInsert(s"""copy store_TEMP("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate") from stdin""", batchSize, unsaved)(StoreRow.text)
+    val merged = sql"""insert into sales.store("businessentityid", "name", "salespersonid", "demographics", "rowguid", "modifieddate")
+                       select * from store_TEMP
+                       on conflict ("businessentityid")
+                       do update set
+                         "name" = EXCLUDED."name",
+                         "salespersonid" = EXCLUDED."salespersonid",
+                         "demographics" = EXCLUDED."demographics",
+                         "rowguid" = EXCLUDED."rowguid",
+                         "modifieddate" = EXCLUDED."modifieddate"
+                       ;
+                       drop table store_TEMP;""".update
+    created *> copied *> merged
+  }
 }
diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
index edd8c79fe2..6199746b1d 100644
--- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
+++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/sales/store/StoreRepoMock.scala
@@ -105,4 +105,12 @@ class StoreRepoMock(toRow: Function1[StoreRowUnsaved, StoreRow],
       UpdateResult(1, Chunk.single(unsaved))
     }
   }
+  override def upsertStreaming(unsaved: ZStream[ZConnection, Throwable, StoreRow], batchSize: Int = 10000): ZIO[ZConnection, Throwable, Long] = {
+    unsaved.scanZIO(0L) { case (acc, row) =>
+      ZIO.succeed {
+        map += (row.businessentityid -> row)
+        acc + 1
+      }
+    }.runLast.map(_.getOrElse(0L))
+  }
 }
diff --git a/typo-tester-zio-jdbc/src/scala/adventureworks/production/product/RepoTest.scala b/typo-tester-zio-jdbc/src/scala/adventureworks/production/product/RepoTest.scala
new file mode 100644
index 0000000000..3fab505541
--- /dev/null
+++ b/typo-tester-zio-jdbc/src/scala/adventureworks/production/product/RepoTest.scala
@@ -0,0 +1,31 @@
+package adventureworks.production.product
+
+import adventureworks.customtypes.*
+import adventureworks.production.unitmeasure.*
+import adventureworks.public.Name
+import adventureworks.{SnapshotTest, withConnection}
+import org.scalatest.Assertion
+import zio.Chunk
+import zio.stream.ZStream
+
+class RepoTest extends SnapshotTest {
+  def runTest(unitmeasureRepo: UnitmeasureRepo): Assertion =
+    withConnection {
+      for {
+        um1 <- unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg1"), name = Name("name1")))
+        um2 <- unitmeasureRepo.insert(UnitmeasureRowUnsaved(unitmeasurecode = UnitmeasureId("kg2"), name = Name("name2")))
+        um1a = um1.copy(name = Name("name1a"))
+        um2a = um2.copy(name = Name("name2a"))
+        _ <- unitmeasureRepo.upsertStreaming(ZStream(um1a, um2a))
+        all <- unitmeasureRepo.selectAll.runCollect
+      } yield assert(Chunk(um1a, um2a) == all.sortBy(_.name))
+    }
+
+  test("in-memory") {
+    runTest(new UnitmeasureRepoMock(_.toRow(TypoLocalDateTime.now)))
+  }
+
+  test("pg") {
+    runTest(new UnitmeasureRepoImpl)
+  }
+}
diff --git a/typo/src/scala/typo/internal/ComputedTable.scala b/typo/src/scala/typo/internal/ComputedTable.scala
index 71edeee06b..a9ad310448 100644
--- a/typo/src/scala/typo/internal/ComputedTable.scala
+++ b/typo/src/scala/typo/internal/ComputedTable.scala
@@ -174,6 +174,9 @@ case class ComputedTable(
           RepoMethod.Insert(dbTable.name, cols, unsavedParam, names.RowName)
         },
         if (options.enableStreamingInserts) Some(RepoMethod.InsertStreaming(dbTable.name, cols, names.RowName)) else None,
+        maybeId.collect {
+          case id if options.enableStreamingInserts => RepoMethod.UpsertStreaming(dbTable.name, cols, id, names.RowName)
+        },
         maybeUnsavedRow.map { unsavedRow =>
           val unsavedParam = sc.Param(sc.Ident("unsaved"), unsavedRow.tpe, None)
           RepoMethod.InsertUnsaved(dbTable.name, cols, unsavedRow, unsavedParam, default, names.RowName)
diff --git a/typo/src/scala/typo/internal/RepoMethod.scala b/typo/src/scala/typo/internal/RepoMethod.scala
index 39288119f8..725e027d9c 100644
--- a/typo/src/scala/typo/internal/RepoMethod.scala
+++ b/typo/src/scala/typo/internal/RepoMethod.scala
@@ -86,6 +86,13 @@ object RepoMethod {
       rowType: sc.Type
   ) extends Mutator("upsert")
 
+  case class UpsertStreaming(
+      relName: db.RelationName,
+      cols: NonEmptyList[ComputedColumn],
+      id: IdComputed,
+      rowType: sc.Type
+  ) extends Mutator("upsertStreaming")
+
   case class Insert(
       relName: db.RelationName,
       cols: NonEmptyList[ComputedColumn],
diff --git a/typo/src/scala/typo/internal/codegen/DbLibAnorm.scala b/typo/src/scala/typo/internal/codegen/DbLibAnorm.scala
index 03196afb12..37dd2c7ad1 100644
--- a/typo/src/scala/typo/internal/codegen/DbLibAnorm.scala
+++ b/typo/src/scala/typo/internal/codegen/DbLibAnorm.scala
@@ -191,6 +191,8 @@ class DbLibAnorm(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDefa
         code"def $name(unsaved: ${TypesScala.Iterator.of(rowType)}, batchSize: ${TypesScala.Int} = 10000)(implicit c: ${TypesJava.Connection}): ${TypesScala.Long}"
       case RepoMethod.Upsert(_, _, _, unsavedParam, rowType) =>
         code"def $name($unsavedParam)(implicit c: ${TypesJava.Connection}): $rowType"
+      case RepoMethod.UpsertStreaming(_, _, _, rowType) =>
+        code"def $name(unsaved: ${TypesScala.Iterator.of(rowType)}, batchSize: ${TypesScala.Int} = 10000)(implicit c: ${TypesJava.Connection}): ${TypesScala.Int}"
       case RepoMethod.InsertUnsaved(_, _, _, unsavedParam, _, rowType) =>
         code"def $name($unsavedParam)(implicit c: ${TypesJava.Connection}): $rowType"
       case RepoMethod.InsertUnsavedStreaming(_, unsaved) =>
@@ -394,6 +396,26 @@ class DbLibAnorm(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDefa
         code"""|$sql
                |  .executeInsert(${rowParserFor(rowType)}.single)
                |"""
+      case RepoMethod.UpsertStreaming(relName, cols, id, rowType) =>
+        val pickExcludedCols = cols.toList
+          .filterNot(c => id.cols.exists(_.name == c.name))
+          .map { c => code"${c.dbName.code} = EXCLUDED.${c.dbName.code}" }
+        val tempTablename = s"${relName.name}_TEMP"
+
+        val copySql = sc.s(code"copy $tempTablename(${dbNames(cols, isRead = false)}) from stdin")
+
+        val mergeSql = SQL {
+          code"""|insert into $relName(${dbNames(cols, isRead = false)})
+                 |select * from $tempTablename
+                 |on conflict (${dbNames(id.cols, isRead = false)})
+                 |do update set
+                 |  ${pickExcludedCols.mkCode(",\n")}
+                 |;
+                 |drop table $tempTablename;""".stripMargin
+        }
+        code"""|${SQL(code"create temporary table $tempTablename (like $relName) on commit drop")}.execute(): @${TypesScala.nowarn}
+               |${textSupport.get.streamingInsert}($copySql, batchSize, unsaved)(${textSupport.get.lookupTextFor(rowType)}, c): @${TypesScala.nowarn}
+               |$mergeSql.executeUpdate()""".stripMargin
 
       case RepoMethod.InsertUnsaved(relName, cols, unsaved, unsavedParam, default, rowType) =>
         val cases0 = unsaved.restCols.map { col =>
@@ -572,6 +594,12 @@ class DbLibAnorm(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDefa
       case RepoMethod.Upsert(_, _, _, unsavedParam, _) =>
         code"""|map.put(${unsavedParam.name}.${id.paramName}, ${unsavedParam.name}): @${TypesScala.nowarn}
                |${unsavedParam.name}"""
+      case RepoMethod.UpsertStreaming(relName, cols, id, rowType) =>
+        code"""|unsaved.foreach { row =>
+               |  map += (row.${id.paramName} -> row)
+               |}
+               |unsaved.size""".stripMargin
+
       case RepoMethod.InsertUnsaved(_, _, _, unsavedParam, _, _) =>
         code"insert(${maybeToRow.get.name}(${unsavedParam.name}))"
       case RepoMethod.InsertStreaming(_, _, _) =>
diff --git a/typo/src/scala/typo/internal/codegen/DbLibDoobie.scala b/typo/src/scala/typo/internal/codegen/DbLibDoobie.scala
index 7579232a75..6bc2068141 100644
--- a/typo/src/scala/typo/internal/codegen/DbLibDoobie.scala
+++ b/typo/src/scala/typo/internal/codegen/DbLibDoobie.scala
@@ -108,6 +108,8 @@ class DbLibDoobie(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDef
         code"def $name(unsaved: ${fs2Stream.of(ConnectionIO, unsaved.tpe)}, batchSize: ${TypesScala.Int} = 10000): ${ConnectionIO.of(TypesScala.Long)}"
       case RepoMethod.Upsert(_, _, _, unsavedParam, rowType) =>
         code"def $name($unsavedParam): ${ConnectionIO.of(rowType)}"
+      case RepoMethod.UpsertStreaming(_, _, _, rowType) =>
+        code"def $name(unsaved: ${fs2Stream.of(ConnectionIO, rowType)}, batchSize: ${TypesScala.Int} = 10000): ${ConnectionIO.of(TypesScala.Int)}"
       case RepoMethod.DeleteBuilder(_, fieldsType, rowType) =>
         code"def $name: ${sc.Type.dsl.DeleteBuilder.of(fieldsType, rowType)}"
       case RepoMethod.Delete(_, id) =>
@@ -315,6 +317,34 @@ class DbLibDoobie(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDef
 
         code"${query(sql, rowType)}.unique"
 
+      case RepoMethod.UpsertStreaming(relName, cols, id, rowType) =>
+        val pickExcludedCols = cols.toList
+          .filterNot(c => id.cols.exists(_.name == c.name))
+          .map { c => code"${c.dbName.code} = EXCLUDED.${c.dbName.code}" }
+        val tempTablename = s"${relName.name}_TEMP"
+
+        val streamingInsert = {
+          val sql = SQL(code"copy $tempTablename(${dbNames(cols, isRead = false)}) from stdin")
+          if (fixVerySlowImplicit) code"new $FragmentOps($sql).copyIn(unsaved, batchSize)(using ${textSupport.get.lookupTextFor(rowType)})"
+          else code"new $FragmentOps($sql).copyIn[$rowType](unsaved, batchSize)"
+        }
+
+        val mergeSql = SQL {
+          code"""|insert into $relName(${dbNames(cols, isRead = false)})
+                 |select * from $tempTablename
+                 |on conflict (${dbNames(id.cols, isRead = false)})
+                 |do update set
+                 |  ${pickExcludedCols.mkCode(",\n")}
+                 |;
+                 |drop table $tempTablename;""".stripMargin
+        }
+
+        code"""|for {
+               |  _ <- ${SQL(code"create temporary table $tempTablename (like $relName) on commit drop")}.update.run
+               |  _ <- $streamingInsert
+               |  res <- $mergeSql.update.run
+               |} yield res""".stripMargin
+
       case RepoMethod.Insert(relName, cols, unsavedParam, rowType) =>
         val values = cols.map { c =>
           code"${runtimeInterpolateValue(code"${unsavedParam.name}.${c.name}", c.tpe)}${SqlCast.toPgCode(c)}"
@@ -462,6 +492,15 @@ class DbLibDoobie(pkg: sc.QIdent, inlineImplicits: Boolean, default: ComputedDef
                |  map.put(${unsavedParam.name}.${id.paramName}, ${unsavedParam.name}): @${TypesScala.nowarn}
                |  ${unsavedParam.name}
                |}""".stripMargin
+      case RepoMethod.UpsertStreaming(_, _, _, _) =>
+        code"""|unsaved.compile.toList.map { rows =>
+               |  var num = 0
+               |  rows.foreach { row =>
+               |    map += (row.${id.paramName} -> row)
+               |    num += 1
+               |  }
+               |  num
+               |}""".stripMargin
       case RepoMethod.InsertUnsaved(_, _, _, unsavedParam, _, _) =>
         code"insert(${maybeToRow.get.name}(${unsavedParam.name}))"
       case RepoMethod.InsertStreaming(_, _, _) =>
diff --git a/typo/src/scala/typo/internal/codegen/DbLibZioJdbc.scala b/typo/src/scala/typo/internal/codegen/DbLibZioJdbc.scala
index 1f9594d729..5f149c8f7b 100644
--- a/typo/src/scala/typo/internal/codegen/DbLibZioJdbc.scala
+++ b/typo/src/scala/typo/internal/codegen/DbLibZioJdbc.scala
@@ -224,6 +224,10 @@ class DbLibZioJdbc(pkg: sc.QIdent, inlineImplicits: Boolean, dslEnabled: Boolean
         val in = ZStream.of(ZConnection, TypesJava.Throwable, rowType)
         val out = ZIO.of(ZConnection, TypesJava.Throwable, TypesScala.Long)
         code"def $name(unsaved: $in, batchSize: Int = 10000): $out"
+      case RepoMethod.UpsertStreaming(_, _, _, rowType) =>
+        val in = ZStream.of(ZConnection, TypesJava.Throwable, rowType)
+        val out = ZIO.of(ZConnection, TypesJava.Throwable, TypesScala.Long)
+        code"def $name(unsaved: $in, batchSize: Int = 10000): $out"
       case RepoMethod.Upsert(_, _, _, unsavedParam, rowType) =>
         code"def $name($unsavedParam): ${ZIO.of(ZConnection, Throwable, UpdateResult.of(rowType))}"
       case RepoMethod.InsertUnsavedStreaming(_, unsaved) =>
@@ -425,6 +429,28 @@ class DbLibZioJdbc(pkg: sc.QIdent, inlineImplicits: Boolean, dslEnabled: Boolean
 
         code"$sql.insertReturning(using ${lookupJdbcDecoder(rowType)})"
 
+      case RepoMethod.UpsertStreaming(relName, cols, id, rowType) =>
+        val pickExcludedCols = cols.toList
+          .filterNot(c => id.cols.exists(_.name == c.name))
+          .map { c => code"${c.dbName.code} = EXCLUDED.${c.dbName.code}" }
+        val tempTablename = s"${relName.name}_TEMP"
+
+        val copySql = sc.s(code"copy $tempTablename(${dbNames(cols, isRead = false)}) from stdin")
+
+        val mergeSql = SQL {
+          code"""|insert into $relName(${dbNames(cols, isRead = false)})
+                 |select * from $tempTablename
+                 |on conflict (${dbNames(id.cols, isRead = false)})
+                 |do update set
+                 |  ${pickExcludedCols.mkCode(",\n")}
+                 |;
+                 |drop table $tempTablename;""".stripMargin
+        }
+        code"""|val created = ${SQL(code"create temporary table $tempTablename (like $relName) on commit drop")}.execute
+               |val copied = ${textSupport.get.streamingInsert}($copySql, batchSize, unsaved)(${textSupport.get.lookupTextFor(rowType)})
+               |val merged = $mergeSql.update
+               |created *> copied *> merged""".stripMargin
+
       case RepoMethod.Insert(relName, cols, unsavedParam, rowType) =>
         val values = cols.map { c =>
           code"${runtimeInterpolateValue(code"${unsavedParam.name}.${c.name}", c.tpe)}${SqlCast.toPgCode(c)}"
@@ -579,6 +605,13 @@ class DbLibZioJdbc(pkg: sc.QIdent, inlineImplicits: Boolean, dslEnabled: Boolean
                |  map.put(${unsavedParam.name}.${id.paramName}, ${unsavedParam.name}): @${TypesScala.nowarn}
                |  $UpdateResult(1, $Chunk.single(${unsavedParam.name}))
                |}""".stripMargin
+      case RepoMethod.UpsertStreaming(_, _, _, _) =>
+        code"""|unsaved.scanZIO(0L) { case (acc, row) =>
+               |  ZIO.succeed {
+               |    map += (row.${id.paramName} -> row)
+               |    acc + 1
+               |  }
+               |}.runLast.map(_.getOrElse(0L))""".stripMargin
       case RepoMethod.InsertUnsaved(_, _, _, unsavedParam, _, _) =>
         code"insert(${maybeToRow.get.name}(${unsavedParam.name}))"