diff --git a/tests/src/scala/typo/NamingTest.scala b/tests/src/scala/typo/NamingTest.scala new file mode 100644 index 0000000000..a592a00970 --- /dev/null +++ b/tests/src/scala/typo/NamingTest.scala @@ -0,0 +1,10 @@ +package typo + +import org.scalactic.TypeCheckedTripleEquals +import org.scalatest.funsuite.AnyFunSuite + +class NamingTest extends AnyFunSuite with TypeCheckedTripleEquals { + test("works") { + assert(Naming.splitOnSymbol("asd-dsa").toList === List("asd", "dsa")) + } +} diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala index 93938baac3..1f35768849 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala @@ -16,17 +16,17 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] val businessentityid: OptField[BusinessentityId, Row] - val `Name.Prefix`: OptField[/* max 30 chars */ String, Row] - val `Name.First`: OptField[/* max 30 chars */ String, Row] - val `Name.Middle`: OptField[/* max 30 chars */ String, Row] - val `Name.Last`: OptField[/* max 30 chars */ String, Row] - val `Name.Suffix`: OptField[/* max 30 chars */ String, Row] + val NamePrefix: OptField[/* max 30 chars */ String, Row] + val NameFirst: OptField[/* max 30 chars */ String, Row] + val NameMiddle: OptField[/* max 30 chars */ String, Row] + val NameLast: OptField[/* max 30 chars */ String, Row] + val NameSuffix: OptField[/* max 30 chars */ String, Row] val Skills: OptField[String, Row] - val `Addr.Type`: OptField[/* max 30 chars */ String, Row] - val `Addr.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.City`: OptField[/* max 100 chars */ String, Row] - val `Addr.PostalCode`: OptField[/* max 20 chars */ String, Row] + val AddrType: OptField[/* max 30 chars */ String, Row] + val AddrLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val AddrLocState: OptField[/* max 100 chars */ String, Row] + val AddrLocCity: OptField[/* max 100 chars */ String, Row] + val AddrPostalCode: OptField[/* max 20 chars */ String, Row] val EMail: OptField[String, Row] val WebSite: OptField[String, Row] val modifieddate: Field[TypoLocalDateTime, Row] diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala index 94c446074b..975e0afc80 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala @@ -27,17 +27,17 @@ case class VjobcandidateViewRow( jobcandidateid: JobcandidateId, /** Points to [[jobcandidate.JobcandidateRow.businessentityid]] */ businessentityid: Option[BusinessentityId], - `Name.Prefix`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.First`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Middle`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Last`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Suffix`: /* nullability unknown */ Option[/* max 30 chars */ String], + NamePrefix: /* nullability unknown */ Option[/* max 30 chars */ String], + NameFirst: /* nullability unknown */ Option[/* max 30 chars */ String], + NameMiddle: /* nullability unknown */ Option[/* max 30 chars */ String], + NameLast: /* nullability unknown */ Option[/* max 30 chars */ String], + NameSuffix: /* nullability unknown */ Option[/* max 30 chars */ String], Skills: /* nullability unknown */ Option[String], - `Addr.Type`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Addr.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.PostalCode`: /* nullability unknown */ Option[/* max 20 chars */ String], + AddrType: /* nullability unknown */ Option[/* max 30 chars */ String], + AddrLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocCity: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrPostalCode: /* nullability unknown */ Option[/* max 20 chars */ String], EMail: /* nullability unknown */ Option[String], WebSite: /* nullability unknown */ Option[String], /** Points to [[jobcandidate.JobcandidateRow.modifieddate]] */ @@ -50,17 +50,17 @@ object VjobcandidateViewRow { VjobcandidateViewRow( jobcandidateid = json.\("jobcandidateid").as(JobcandidateId.reads), businessentityid = json.\("businessentityid").toOption.map(_.as(BusinessentityId.reads)), - `Name.Prefix` = json.\("Name.Prefix").toOption.map(_.as(Reads.StringReads)), - `Name.First` = json.\("Name.First").toOption.map(_.as(Reads.StringReads)), - `Name.Middle` = json.\("Name.Middle").toOption.map(_.as(Reads.StringReads)), - `Name.Last` = json.\("Name.Last").toOption.map(_.as(Reads.StringReads)), - `Name.Suffix` = json.\("Name.Suffix").toOption.map(_.as(Reads.StringReads)), + NamePrefix = json.\("Name.Prefix").toOption.map(_.as(Reads.StringReads)), + NameFirst = json.\("Name.First").toOption.map(_.as(Reads.StringReads)), + NameMiddle = json.\("Name.Middle").toOption.map(_.as(Reads.StringReads)), + NameLast = json.\("Name.Last").toOption.map(_.as(Reads.StringReads)), + NameSuffix = json.\("Name.Suffix").toOption.map(_.as(Reads.StringReads)), Skills = json.\("Skills").toOption.map(_.as(Reads.StringReads)), - `Addr.Type` = json.\("Addr.Type").toOption.map(_.as(Reads.StringReads)), - `Addr.Loc.CountryRegion` = json.\("Addr.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), - `Addr.Loc.State` = json.\("Addr.Loc.State").toOption.map(_.as(Reads.StringReads)), - `Addr.Loc.City` = json.\("Addr.Loc.City").toOption.map(_.as(Reads.StringReads)), - `Addr.PostalCode` = json.\("Addr.PostalCode").toOption.map(_.as(Reads.StringReads)), + AddrType = json.\("Addr.Type").toOption.map(_.as(Reads.StringReads)), + AddrLocCountryRegion = json.\("Addr.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), + AddrLocState = json.\("Addr.Loc.State").toOption.map(_.as(Reads.StringReads)), + AddrLocCity = json.\("Addr.Loc.City").toOption.map(_.as(Reads.StringReads)), + AddrPostalCode = json.\("Addr.PostalCode").toOption.map(_.as(Reads.StringReads)), EMail = json.\("EMail").toOption.map(_.as(Reads.StringReads)), WebSite = json.\("WebSite").toOption.map(_.as(Reads.StringReads)), modifieddate = json.\("modifieddate").as(TypoLocalDateTime.reads) @@ -73,17 +73,17 @@ object VjobcandidateViewRow { VjobcandidateViewRow( jobcandidateid = row(idx + 0)(JobcandidateId.column), businessentityid = row(idx + 1)(Column.columnToOption(BusinessentityId.column)), - `Name.Prefix` = row(idx + 2)(Column.columnToOption(Column.columnToString)), - `Name.First` = row(idx + 3)(Column.columnToOption(Column.columnToString)), - `Name.Middle` = row(idx + 4)(Column.columnToOption(Column.columnToString)), - `Name.Last` = row(idx + 5)(Column.columnToOption(Column.columnToString)), - `Name.Suffix` = row(idx + 6)(Column.columnToOption(Column.columnToString)), + NamePrefix = row(idx + 2)(Column.columnToOption(Column.columnToString)), + NameFirst = row(idx + 3)(Column.columnToOption(Column.columnToString)), + NameMiddle = row(idx + 4)(Column.columnToOption(Column.columnToString)), + NameLast = row(idx + 5)(Column.columnToOption(Column.columnToString)), + NameSuffix = row(idx + 6)(Column.columnToOption(Column.columnToString)), Skills = row(idx + 7)(Column.columnToOption(Column.columnToString)), - `Addr.Type` = row(idx + 8)(Column.columnToOption(Column.columnToString)), - `Addr.Loc.CountryRegion` = row(idx + 9)(Column.columnToOption(Column.columnToString)), - `Addr.Loc.State` = row(idx + 10)(Column.columnToOption(Column.columnToString)), - `Addr.Loc.City` = row(idx + 11)(Column.columnToOption(Column.columnToString)), - `Addr.PostalCode` = row(idx + 12)(Column.columnToOption(Column.columnToString)), + AddrType = row(idx + 8)(Column.columnToOption(Column.columnToString)), + AddrLocCountryRegion = row(idx + 9)(Column.columnToOption(Column.columnToString)), + AddrLocState = row(idx + 10)(Column.columnToOption(Column.columnToString)), + AddrLocCity = row(idx + 11)(Column.columnToOption(Column.columnToString)), + AddrPostalCode = row(idx + 12)(Column.columnToOption(Column.columnToString)), EMail = row(idx + 13)(Column.columnToOption(Column.columnToString)), WebSite = row(idx + 14)(Column.columnToOption(Column.columnToString)), modifieddate = row(idx + 15)(TypoLocalDateTime.column) @@ -94,17 +94,17 @@ object VjobcandidateViewRow { new JsObject(ListMap[String, JsValue]( "jobcandidateid" -> JobcandidateId.writes.writes(o.jobcandidateid), "businessentityid" -> Writes.OptionWrites(BusinessentityId.writes).writes(o.businessentityid), - "Name.Prefix" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Name.Prefix`), - "Name.First" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Name.First`), - "Name.Middle" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Name.Middle`), - "Name.Last" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Name.Last`), - "Name.Suffix" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Name.Suffix`), + "Name.Prefix" -> Writes.OptionWrites(Writes.StringWrites).writes(o.NamePrefix), + "Name.First" -> Writes.OptionWrites(Writes.StringWrites).writes(o.NameFirst), + "Name.Middle" -> Writes.OptionWrites(Writes.StringWrites).writes(o.NameMiddle), + "Name.Last" -> Writes.OptionWrites(Writes.StringWrites).writes(o.NameLast), + "Name.Suffix" -> Writes.OptionWrites(Writes.StringWrites).writes(o.NameSuffix), "Skills" -> Writes.OptionWrites(Writes.StringWrites).writes(o.Skills), - "Addr.Type" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Addr.Type`), - "Addr.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Addr.Loc.CountryRegion`), - "Addr.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Addr.Loc.State`), - "Addr.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Addr.Loc.City`), - "Addr.PostalCode" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Addr.PostalCode`), + "Addr.Type" -> Writes.OptionWrites(Writes.StringWrites).writes(o.AddrType), + "Addr.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.AddrLocCountryRegion), + "Addr.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.AddrLocState), + "Addr.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.AddrLocCity), + "Addr.PostalCode" -> Writes.OptionWrites(Writes.StringWrites).writes(o.AddrPostalCode), "EMail" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EMail), "WebSite" -> Writes.OptionWrites(Writes.StringWrites).writes(o.WebSite), "modifieddate" -> TypoLocalDateTime.writes.writes(o.modifieddate) diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala index bf1d0efa6a..c2523ce854 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala @@ -21,23 +21,23 @@ class VjobcandidateViewStructure[Row](val prefix: Option[String], val extract: R override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) override val businessentityid = new OptField[BusinessentityId, Row](prefix, "businessentityid", None, None)(x => extract(x).businessentityid, (row, value) => merge(row, extract(row).copy(businessentityid = value))) - override val `Name.Prefix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).`Name.Prefix`, (row, value) => merge(row, extract(row).copy(`Name.Prefix` = value))) - override val `Name.First` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).`Name.First`, (row, value) => merge(row, extract(row).copy(`Name.First` = value))) - override val `Name.Middle` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).`Name.Middle`, (row, value) => merge(row, extract(row).copy(`Name.Middle` = value))) - override val `Name.Last` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).`Name.Last`, (row, value) => merge(row, extract(row).copy(`Name.Last` = value))) - override val `Name.Suffix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).`Name.Suffix`, (row, value) => merge(row, extract(row).copy(`Name.Suffix` = value))) + override val NamePrefix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).NamePrefix, (row, value) => merge(row, extract(row).copy(NamePrefix = value))) + override val NameFirst = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).NameFirst, (row, value) => merge(row, extract(row).copy(NameFirst = value))) + override val NameMiddle = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).NameMiddle, (row, value) => merge(row, extract(row).copy(NameMiddle = value))) + override val NameLast = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).NameLast, (row, value) => merge(row, extract(row).copy(NameLast = value))) + override val NameSuffix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).NameSuffix, (row, value) => merge(row, extract(row).copy(NameSuffix = value))) override val Skills = new OptField[String, Row](prefix, "Skills", None, None)(x => extract(x).Skills, (row, value) => merge(row, extract(row).copy(Skills = value))) - override val `Addr.Type` = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).`Addr.Type`, (row, value) => merge(row, extract(row).copy(`Addr.Type` = value))) - override val `Addr.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).`Addr.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.CountryRegion` = value))) - override val `Addr.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).`Addr.Loc.State`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.State` = value))) - override val `Addr.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).`Addr.Loc.City`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.City` = value))) - override val `Addr.PostalCode` = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).`Addr.PostalCode`, (row, value) => merge(row, extract(row).copy(`Addr.PostalCode` = value))) + override val AddrType = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).AddrType, (row, value) => merge(row, extract(row).copy(AddrType = value))) + override val AddrLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).AddrLocCountryRegion, (row, value) => merge(row, extract(row).copy(AddrLocCountryRegion = value))) + override val AddrLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).AddrLocState, (row, value) => merge(row, extract(row).copy(AddrLocState = value))) + override val AddrLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).AddrLocCity, (row, value) => merge(row, extract(row).copy(AddrLocCity = value))) + override val AddrPostalCode = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).AddrPostalCode, (row, value) => merge(row, extract(row).copy(AddrPostalCode = value))) override val EMail = new OptField[String, Row](prefix, "EMail", None, None)(x => extract(x).EMail, (row, value) => merge(row, extract(row).copy(EMail = value))) override val WebSite = new OptField[String, Row](prefix, "WebSite", None, None)(x => extract(x).WebSite, (row, value) => merge(row, extract(row).copy(WebSite = value))) override val modifieddate = new Field[TypoLocalDateTime, Row](prefix, "modifieddate", Some("text"), None)(x => extract(x).modifieddate, (row, value) => merge(row, extract(row).copy(modifieddate = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, `Name.Prefix`, `Name.First`, `Name.Middle`, `Name.Last`, `Name.Suffix`, Skills, `Addr.Type`, `Addr.Loc.CountryRegion`, `Addr.Loc.State`, `Addr.Loc.City`, `Addr.PostalCode`, EMail, WebSite, modifieddate) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, NamePrefix, NameFirst, NameMiddle, NameLast, NameSuffix, Skills, AddrType, AddrLocCountryRegion, AddrLocState, AddrLocCity, AddrPostalCode, EMail, WebSite, modifieddate) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateViewRow, merge: (NewRow, VjobcandidateViewRow) => NewRow): VjobcandidateViewStructure[NewRow] = new VjobcandidateViewStructure(prefix, extract, merge) diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala index 773ebbdbb7..c404685066 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala @@ -14,18 +14,18 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateeducationViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Edu.Level`: OptField[/* max 50 chars */ String, Row] - val `Edu.StartDate`: OptField[TypoLocalDate, Row] - val `Edu.EndDate`: OptField[TypoLocalDate, Row] - val `Edu.Degree`: OptField[/* max 50 chars */ String, Row] - val `Edu.Major`: OptField[/* max 50 chars */ String, Row] - val `Edu.Minor`: OptField[/* max 50 chars */ String, Row] - val `Edu.GPA`: OptField[/* max 5 chars */ String, Row] - val `Edu.GPAScale`: OptField[/* max 5 chars */ String, Row] - val `Edu.School`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.City`: OptField[/* max 100 chars */ String, Row] + val EduLevel: OptField[/* max 50 chars */ String, Row] + val EduStartDate: OptField[TypoLocalDate, Row] + val EduEndDate: OptField[TypoLocalDate, Row] + val EduDegree: OptField[/* max 50 chars */ String, Row] + val EduMajor: OptField[/* max 50 chars */ String, Row] + val EduMinor: OptField[/* max 50 chars */ String, Row] + val EduGPA: OptField[/* max 5 chars */ String, Row] + val EduGPAScale: OptField[/* max 5 chars */ String, Row] + val EduSchool: OptField[/* max 100 chars */ String, Row] + val EduLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val EduLocState: OptField[/* max 100 chars */ String, Row] + val EduLocCity: OptField[/* max 100 chars */ String, Row] } object VjobcandidateeducationViewFields extends VjobcandidateeducationViewStructure[VjobcandidateeducationViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala index 10dfc87d76..dfe4b114ed 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala @@ -24,18 +24,18 @@ import scala.util.Try case class VjobcandidateeducationViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Edu.Level`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.Degree`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Major`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Minor`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.GPA`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.GPAScale`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.School`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String] + EduLevel: /* nullability unknown */ Option[/* max 50 chars */ String], + EduStartDate: /* nullability unknown */ Option[TypoLocalDate], + EduEndDate: /* nullability unknown */ Option[TypoLocalDate], + EduDegree: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMajor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMinor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduGPA: /* nullability unknown */ Option[/* max 5 chars */ String], + EduGPAScale: /* nullability unknown */ Option[/* max 5 chars */ String], + EduSchool: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCity: /* nullability unknown */ Option[/* max 100 chars */ String] ) object VjobcandidateeducationViewRow { @@ -43,18 +43,18 @@ object VjobcandidateeducationViewRow { Try( VjobcandidateeducationViewRow( jobcandidateid = json.\("jobcandidateid").as(JobcandidateId.reads), - `Edu.Level` = json.\("Edu.Level").toOption.map(_.as(Reads.StringReads)), - `Edu.StartDate` = json.\("Edu.StartDate").toOption.map(_.as(TypoLocalDate.reads)), - `Edu.EndDate` = json.\("Edu.EndDate").toOption.map(_.as(TypoLocalDate.reads)), - `Edu.Degree` = json.\("Edu.Degree").toOption.map(_.as(Reads.StringReads)), - `Edu.Major` = json.\("Edu.Major").toOption.map(_.as(Reads.StringReads)), - `Edu.Minor` = json.\("Edu.Minor").toOption.map(_.as(Reads.StringReads)), - `Edu.GPA` = json.\("Edu.GPA").toOption.map(_.as(Reads.StringReads)), - `Edu.GPAScale` = json.\("Edu.GPAScale").toOption.map(_.as(Reads.StringReads)), - `Edu.School` = json.\("Edu.School").toOption.map(_.as(Reads.StringReads)), - `Edu.Loc.CountryRegion` = json.\("Edu.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), - `Edu.Loc.State` = json.\("Edu.Loc.State").toOption.map(_.as(Reads.StringReads)), - `Edu.Loc.City` = json.\("Edu.Loc.City").toOption.map(_.as(Reads.StringReads)) + EduLevel = json.\("Edu.Level").toOption.map(_.as(Reads.StringReads)), + EduStartDate = json.\("Edu.StartDate").toOption.map(_.as(TypoLocalDate.reads)), + EduEndDate = json.\("Edu.EndDate").toOption.map(_.as(TypoLocalDate.reads)), + EduDegree = json.\("Edu.Degree").toOption.map(_.as(Reads.StringReads)), + EduMajor = json.\("Edu.Major").toOption.map(_.as(Reads.StringReads)), + EduMinor = json.\("Edu.Minor").toOption.map(_.as(Reads.StringReads)), + EduGPA = json.\("Edu.GPA").toOption.map(_.as(Reads.StringReads)), + EduGPAScale = json.\("Edu.GPAScale").toOption.map(_.as(Reads.StringReads)), + EduSchool = json.\("Edu.School").toOption.map(_.as(Reads.StringReads)), + EduLocCountryRegion = json.\("Edu.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), + EduLocState = json.\("Edu.Loc.State").toOption.map(_.as(Reads.StringReads)), + EduLocCity = json.\("Edu.Loc.City").toOption.map(_.as(Reads.StringReads)) ) ) ), @@ -63,36 +63,36 @@ object VjobcandidateeducationViewRow { Success( VjobcandidateeducationViewRow( jobcandidateid = row(idx + 0)(JobcandidateId.column), - `Edu.Level` = row(idx + 1)(Column.columnToOption(Column.columnToString)), - `Edu.StartDate` = row(idx + 2)(Column.columnToOption(TypoLocalDate.column)), - `Edu.EndDate` = row(idx + 3)(Column.columnToOption(TypoLocalDate.column)), - `Edu.Degree` = row(idx + 4)(Column.columnToOption(Column.columnToString)), - `Edu.Major` = row(idx + 5)(Column.columnToOption(Column.columnToString)), - `Edu.Minor` = row(idx + 6)(Column.columnToOption(Column.columnToString)), - `Edu.GPA` = row(idx + 7)(Column.columnToOption(Column.columnToString)), - `Edu.GPAScale` = row(idx + 8)(Column.columnToOption(Column.columnToString)), - `Edu.School` = row(idx + 9)(Column.columnToOption(Column.columnToString)), - `Edu.Loc.CountryRegion` = row(idx + 10)(Column.columnToOption(Column.columnToString)), - `Edu.Loc.State` = row(idx + 11)(Column.columnToOption(Column.columnToString)), - `Edu.Loc.City` = row(idx + 12)(Column.columnToOption(Column.columnToString)) + EduLevel = row(idx + 1)(Column.columnToOption(Column.columnToString)), + EduStartDate = row(idx + 2)(Column.columnToOption(TypoLocalDate.column)), + EduEndDate = row(idx + 3)(Column.columnToOption(TypoLocalDate.column)), + EduDegree = row(idx + 4)(Column.columnToOption(Column.columnToString)), + EduMajor = row(idx + 5)(Column.columnToOption(Column.columnToString)), + EduMinor = row(idx + 6)(Column.columnToOption(Column.columnToString)), + EduGPA = row(idx + 7)(Column.columnToOption(Column.columnToString)), + EduGPAScale = row(idx + 8)(Column.columnToOption(Column.columnToString)), + EduSchool = row(idx + 9)(Column.columnToOption(Column.columnToString)), + EduLocCountryRegion = row(idx + 10)(Column.columnToOption(Column.columnToString)), + EduLocState = row(idx + 11)(Column.columnToOption(Column.columnToString)), + EduLocCity = row(idx + 12)(Column.columnToOption(Column.columnToString)) ) ) } implicit lazy val writes: OWrites[VjobcandidateeducationViewRow] = OWrites[VjobcandidateeducationViewRow](o => new JsObject(ListMap[String, JsValue]( "jobcandidateid" -> JobcandidateId.writes.writes(o.jobcandidateid), - "Edu.Level" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Level`), - "Edu.StartDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.`Edu.StartDate`), - "Edu.EndDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.`Edu.EndDate`), - "Edu.Degree" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Degree`), - "Edu.Major" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Major`), - "Edu.Minor" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Minor`), - "Edu.GPA" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.GPA`), - "Edu.GPAScale" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.GPAScale`), - "Edu.School" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.School`), - "Edu.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Loc.CountryRegion`), - "Edu.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Loc.State`), - "Edu.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Edu.Loc.City`) + "Edu.Level" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduLevel), + "Edu.StartDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.EduStartDate), + "Edu.EndDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.EduEndDate), + "Edu.Degree" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduDegree), + "Edu.Major" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduMajor), + "Edu.Minor" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduMinor), + "Edu.GPA" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduGPA), + "Edu.GPAScale" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduGPAScale), + "Edu.School" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduSchool), + "Edu.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduLocCountryRegion), + "Edu.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduLocState), + "Edu.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EduLocCity) )) ) } diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala index e8fbf52207..f15b3290a9 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala @@ -19,21 +19,21 @@ class VjobcandidateeducationViewStructure[Row](val prefix: Option[String], val e with VjobcandidateeducationViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Edu.Level` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).`Edu.Level`, (row, value) => merge(row, extract(row).copy(`Edu.Level` = value))) - override val `Edu.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).`Edu.StartDate`, (row, value) => merge(row, extract(row).copy(`Edu.StartDate` = value))) - override val `Edu.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).`Edu.EndDate`, (row, value) => merge(row, extract(row).copy(`Edu.EndDate` = value))) - override val `Edu.Degree` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).`Edu.Degree`, (row, value) => merge(row, extract(row).copy(`Edu.Degree` = value))) - override val `Edu.Major` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).`Edu.Major`, (row, value) => merge(row, extract(row).copy(`Edu.Major` = value))) - override val `Edu.Minor` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).`Edu.Minor`, (row, value) => merge(row, extract(row).copy(`Edu.Minor` = value))) - override val `Edu.GPA` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).`Edu.GPA`, (row, value) => merge(row, extract(row).copy(`Edu.GPA` = value))) - override val `Edu.GPAScale` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).`Edu.GPAScale`, (row, value) => merge(row, extract(row).copy(`Edu.GPAScale` = value))) - override val `Edu.School` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).`Edu.School`, (row, value) => merge(row, extract(row).copy(`Edu.School` = value))) - override val `Edu.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).`Edu.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.CountryRegion` = value))) - override val `Edu.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).`Edu.Loc.State`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.State` = value))) - override val `Edu.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).`Edu.Loc.City`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.City` = value))) + override val EduLevel = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).EduLevel, (row, value) => merge(row, extract(row).copy(EduLevel = value))) + override val EduStartDate = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).EduStartDate, (row, value) => merge(row, extract(row).copy(EduStartDate = value))) + override val EduEndDate = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).EduEndDate, (row, value) => merge(row, extract(row).copy(EduEndDate = value))) + override val EduDegree = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).EduDegree, (row, value) => merge(row, extract(row).copy(EduDegree = value))) + override val EduMajor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).EduMajor, (row, value) => merge(row, extract(row).copy(EduMajor = value))) + override val EduMinor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).EduMinor, (row, value) => merge(row, extract(row).copy(EduMinor = value))) + override val EduGPA = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).EduGPA, (row, value) => merge(row, extract(row).copy(EduGPA = value))) + override val EduGPAScale = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).EduGPAScale, (row, value) => merge(row, extract(row).copy(EduGPAScale = value))) + override val EduSchool = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).EduSchool, (row, value) => merge(row, extract(row).copy(EduSchool = value))) + override val EduLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).EduLocCountryRegion, (row, value) => merge(row, extract(row).copy(EduLocCountryRegion = value))) + override val EduLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).EduLocState, (row, value) => merge(row, extract(row).copy(EduLocState = value))) + override val EduLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).EduLocCity, (row, value) => merge(row, extract(row).copy(EduLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Edu.Level`, `Edu.StartDate`, `Edu.EndDate`, `Edu.Degree`, `Edu.Major`, `Edu.Minor`, `Edu.GPA`, `Edu.GPAScale`, `Edu.School`, `Edu.Loc.CountryRegion`, `Edu.Loc.State`, `Edu.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EduLevel, EduStartDate, EduEndDate, EduDegree, EduMajor, EduMinor, EduGPA, EduGPAScale, EduSchool, EduLocCountryRegion, EduLocState, EduLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateeducationViewRow, merge: (NewRow, VjobcandidateeducationViewRow) => NewRow): VjobcandidateeducationViewStructure[NewRow] = new VjobcandidateeducationViewStructure(prefix, extract, merge) diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala index 91792438f8..f7df4754b7 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala @@ -14,16 +14,16 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateemploymentViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Emp.StartDate`: OptField[TypoLocalDate, Row] - val `Emp.EndDate`: OptField[TypoLocalDate, Row] - val `Emp.OrgName`: OptField[/* max 100 chars */ String, Row] - val `Emp.JobTitle`: OptField[/* max 100 chars */ String, Row] - val `Emp.Responsibility`: OptField[String, Row] - val `Emp.FunctionCategory`: OptField[String, Row] - val `Emp.IndustryCategory`: OptField[String, Row] - val `Emp.Loc.CountryRegion`: OptField[String, Row] - val `Emp.Loc.State`: OptField[String, Row] - val `Emp.Loc.City`: OptField[String, Row] + val EmpStartDate: OptField[TypoLocalDate, Row] + val EmpEndDate: OptField[TypoLocalDate, Row] + val EmpOrgName: OptField[/* max 100 chars */ String, Row] + val EmpJobTitle: OptField[/* max 100 chars */ String, Row] + val EmpResponsibility: OptField[String, Row] + val EmpFunctionCategory: OptField[String, Row] + val EmpIndustryCategory: OptField[String, Row] + val EmpLocCountryRegion: OptField[String, Row] + val EmpLocState: OptField[String, Row] + val EmpLocCity: OptField[String, Row] } object VjobcandidateemploymentViewFields extends VjobcandidateemploymentViewStructure[VjobcandidateemploymentViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala index 13738f24f9..fe3fb7e775 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala @@ -24,16 +24,16 @@ import scala.util.Try case class VjobcandidateemploymentViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Emp.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.OrgName`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.JobTitle`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.Responsibility`: /* nullability unknown */ Option[String], - `Emp.FunctionCategory`: /* nullability unknown */ Option[String], - `Emp.IndustryCategory`: /* nullability unknown */ Option[String], - `Emp.Loc.CountryRegion`: /* nullability unknown */ Option[String], - `Emp.Loc.State`: /* nullability unknown */ Option[String], - `Emp.Loc.City`: /* nullability unknown */ Option[String] + EmpStartDate: /* nullability unknown */ Option[TypoLocalDate], + EmpEndDate: /* nullability unknown */ Option[TypoLocalDate], + EmpOrgName: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpJobTitle: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpResponsibility: /* nullability unknown */ Option[String], + EmpFunctionCategory: /* nullability unknown */ Option[String], + EmpIndustryCategory: /* nullability unknown */ Option[String], + EmpLocCountryRegion: /* nullability unknown */ Option[String], + EmpLocState: /* nullability unknown */ Option[String], + EmpLocCity: /* nullability unknown */ Option[String] ) object VjobcandidateemploymentViewRow { @@ -41,16 +41,16 @@ object VjobcandidateemploymentViewRow { Try( VjobcandidateemploymentViewRow( jobcandidateid = json.\("jobcandidateid").as(JobcandidateId.reads), - `Emp.StartDate` = json.\("Emp.StartDate").toOption.map(_.as(TypoLocalDate.reads)), - `Emp.EndDate` = json.\("Emp.EndDate").toOption.map(_.as(TypoLocalDate.reads)), - `Emp.OrgName` = json.\("Emp.OrgName").toOption.map(_.as(Reads.StringReads)), - `Emp.JobTitle` = json.\("Emp.JobTitle").toOption.map(_.as(Reads.StringReads)), - `Emp.Responsibility` = json.\("Emp.Responsibility").toOption.map(_.as(Reads.StringReads)), - `Emp.FunctionCategory` = json.\("Emp.FunctionCategory").toOption.map(_.as(Reads.StringReads)), - `Emp.IndustryCategory` = json.\("Emp.IndustryCategory").toOption.map(_.as(Reads.StringReads)), - `Emp.Loc.CountryRegion` = json.\("Emp.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), - `Emp.Loc.State` = json.\("Emp.Loc.State").toOption.map(_.as(Reads.StringReads)), - `Emp.Loc.City` = json.\("Emp.Loc.City").toOption.map(_.as(Reads.StringReads)) + EmpStartDate = json.\("Emp.StartDate").toOption.map(_.as(TypoLocalDate.reads)), + EmpEndDate = json.\("Emp.EndDate").toOption.map(_.as(TypoLocalDate.reads)), + EmpOrgName = json.\("Emp.OrgName").toOption.map(_.as(Reads.StringReads)), + EmpJobTitle = json.\("Emp.JobTitle").toOption.map(_.as(Reads.StringReads)), + EmpResponsibility = json.\("Emp.Responsibility").toOption.map(_.as(Reads.StringReads)), + EmpFunctionCategory = json.\("Emp.FunctionCategory").toOption.map(_.as(Reads.StringReads)), + EmpIndustryCategory = json.\("Emp.IndustryCategory").toOption.map(_.as(Reads.StringReads)), + EmpLocCountryRegion = json.\("Emp.Loc.CountryRegion").toOption.map(_.as(Reads.StringReads)), + EmpLocState = json.\("Emp.Loc.State").toOption.map(_.as(Reads.StringReads)), + EmpLocCity = json.\("Emp.Loc.City").toOption.map(_.as(Reads.StringReads)) ) ) ), @@ -59,32 +59,32 @@ object VjobcandidateemploymentViewRow { Success( VjobcandidateemploymentViewRow( jobcandidateid = row(idx + 0)(JobcandidateId.column), - `Emp.StartDate` = row(idx + 1)(Column.columnToOption(TypoLocalDate.column)), - `Emp.EndDate` = row(idx + 2)(Column.columnToOption(TypoLocalDate.column)), - `Emp.OrgName` = row(idx + 3)(Column.columnToOption(Column.columnToString)), - `Emp.JobTitle` = row(idx + 4)(Column.columnToOption(Column.columnToString)), - `Emp.Responsibility` = row(idx + 5)(Column.columnToOption(Column.columnToString)), - `Emp.FunctionCategory` = row(idx + 6)(Column.columnToOption(Column.columnToString)), - `Emp.IndustryCategory` = row(idx + 7)(Column.columnToOption(Column.columnToString)), - `Emp.Loc.CountryRegion` = row(idx + 8)(Column.columnToOption(Column.columnToString)), - `Emp.Loc.State` = row(idx + 9)(Column.columnToOption(Column.columnToString)), - `Emp.Loc.City` = row(idx + 10)(Column.columnToOption(Column.columnToString)) + EmpStartDate = row(idx + 1)(Column.columnToOption(TypoLocalDate.column)), + EmpEndDate = row(idx + 2)(Column.columnToOption(TypoLocalDate.column)), + EmpOrgName = row(idx + 3)(Column.columnToOption(Column.columnToString)), + EmpJobTitle = row(idx + 4)(Column.columnToOption(Column.columnToString)), + EmpResponsibility = row(idx + 5)(Column.columnToOption(Column.columnToString)), + EmpFunctionCategory = row(idx + 6)(Column.columnToOption(Column.columnToString)), + EmpIndustryCategory = row(idx + 7)(Column.columnToOption(Column.columnToString)), + EmpLocCountryRegion = row(idx + 8)(Column.columnToOption(Column.columnToString)), + EmpLocState = row(idx + 9)(Column.columnToOption(Column.columnToString)), + EmpLocCity = row(idx + 10)(Column.columnToOption(Column.columnToString)) ) ) } implicit lazy val writes: OWrites[VjobcandidateemploymentViewRow] = OWrites[VjobcandidateemploymentViewRow](o => new JsObject(ListMap[String, JsValue]( "jobcandidateid" -> JobcandidateId.writes.writes(o.jobcandidateid), - "Emp.StartDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.`Emp.StartDate`), - "Emp.EndDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.`Emp.EndDate`), - "Emp.OrgName" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.OrgName`), - "Emp.JobTitle" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.JobTitle`), - "Emp.Responsibility" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.Responsibility`), - "Emp.FunctionCategory" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.FunctionCategory`), - "Emp.IndustryCategory" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.IndustryCategory`), - "Emp.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.Loc.CountryRegion`), - "Emp.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.Loc.State`), - "Emp.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.`Emp.Loc.City`) + "Emp.StartDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.EmpStartDate), + "Emp.EndDate" -> Writes.OptionWrites(TypoLocalDate.writes).writes(o.EmpEndDate), + "Emp.OrgName" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpOrgName), + "Emp.JobTitle" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpJobTitle), + "Emp.Responsibility" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpResponsibility), + "Emp.FunctionCategory" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpFunctionCategory), + "Emp.IndustryCategory" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpIndustryCategory), + "Emp.Loc.CountryRegion" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpLocCountryRegion), + "Emp.Loc.State" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpLocState), + "Emp.Loc.City" -> Writes.OptionWrites(Writes.StringWrites).writes(o.EmpLocCity) )) ) } diff --git a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala index 21af2c6559..249a29af29 100644 --- a/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala +++ b/typo-tester-anorm/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala @@ -19,19 +19,19 @@ class VjobcandidateemploymentViewStructure[Row](val prefix: Option[String], val with VjobcandidateemploymentViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Emp.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).`Emp.StartDate`, (row, value) => merge(row, extract(row).copy(`Emp.StartDate` = value))) - override val `Emp.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).`Emp.EndDate`, (row, value) => merge(row, extract(row).copy(`Emp.EndDate` = value))) - override val `Emp.OrgName` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).`Emp.OrgName`, (row, value) => merge(row, extract(row).copy(`Emp.OrgName` = value))) - override val `Emp.JobTitle` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).`Emp.JobTitle`, (row, value) => merge(row, extract(row).copy(`Emp.JobTitle` = value))) - override val `Emp.Responsibility` = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).`Emp.Responsibility`, (row, value) => merge(row, extract(row).copy(`Emp.Responsibility` = value))) - override val `Emp.FunctionCategory` = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).`Emp.FunctionCategory`, (row, value) => merge(row, extract(row).copy(`Emp.FunctionCategory` = value))) - override val `Emp.IndustryCategory` = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).`Emp.IndustryCategory`, (row, value) => merge(row, extract(row).copy(`Emp.IndustryCategory` = value))) - override val `Emp.Loc.CountryRegion` = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).`Emp.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.CountryRegion` = value))) - override val `Emp.Loc.State` = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).`Emp.Loc.State`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.State` = value))) - override val `Emp.Loc.City` = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).`Emp.Loc.City`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.City` = value))) + override val EmpStartDate = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).EmpStartDate, (row, value) => merge(row, extract(row).copy(EmpStartDate = value))) + override val EmpEndDate = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).EmpEndDate, (row, value) => merge(row, extract(row).copy(EmpEndDate = value))) + override val EmpOrgName = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).EmpOrgName, (row, value) => merge(row, extract(row).copy(EmpOrgName = value))) + override val EmpJobTitle = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).EmpJobTitle, (row, value) => merge(row, extract(row).copy(EmpJobTitle = value))) + override val EmpResponsibility = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).EmpResponsibility, (row, value) => merge(row, extract(row).copy(EmpResponsibility = value))) + override val EmpFunctionCategory = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).EmpFunctionCategory, (row, value) => merge(row, extract(row).copy(EmpFunctionCategory = value))) + override val EmpIndustryCategory = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).EmpIndustryCategory, (row, value) => merge(row, extract(row).copy(EmpIndustryCategory = value))) + override val EmpLocCountryRegion = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).EmpLocCountryRegion, (row, value) => merge(row, extract(row).copy(EmpLocCountryRegion = value))) + override val EmpLocState = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).EmpLocState, (row, value) => merge(row, extract(row).copy(EmpLocState = value))) + override val EmpLocCity = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).EmpLocCity, (row, value) => merge(row, extract(row).copy(EmpLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Emp.StartDate`, `Emp.EndDate`, `Emp.OrgName`, `Emp.JobTitle`, `Emp.Responsibility`, `Emp.FunctionCategory`, `Emp.IndustryCategory`, `Emp.Loc.CountryRegion`, `Emp.Loc.State`, `Emp.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EmpStartDate, EmpEndDate, EmpOrgName, EmpJobTitle, EmpResponsibility, EmpFunctionCategory, EmpIndustryCategory, EmpLocCountryRegion, EmpLocState, EmpLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateemploymentViewRow, merge: (NewRow, VjobcandidateemploymentViewRow) => NewRow): VjobcandidateemploymentViewStructure[NewRow] = new VjobcandidateemploymentViewStructure(prefix, extract, merge) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala index 93938baac3..1f35768849 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala @@ -16,17 +16,17 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] val businessentityid: OptField[BusinessentityId, Row] - val `Name.Prefix`: OptField[/* max 30 chars */ String, Row] - val `Name.First`: OptField[/* max 30 chars */ String, Row] - val `Name.Middle`: OptField[/* max 30 chars */ String, Row] - val `Name.Last`: OptField[/* max 30 chars */ String, Row] - val `Name.Suffix`: OptField[/* max 30 chars */ String, Row] + val NamePrefix: OptField[/* max 30 chars */ String, Row] + val NameFirst: OptField[/* max 30 chars */ String, Row] + val NameMiddle: OptField[/* max 30 chars */ String, Row] + val NameLast: OptField[/* max 30 chars */ String, Row] + val NameSuffix: OptField[/* max 30 chars */ String, Row] val Skills: OptField[String, Row] - val `Addr.Type`: OptField[/* max 30 chars */ String, Row] - val `Addr.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.City`: OptField[/* max 100 chars */ String, Row] - val `Addr.PostalCode`: OptField[/* max 20 chars */ String, Row] + val AddrType: OptField[/* max 30 chars */ String, Row] + val AddrLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val AddrLocState: OptField[/* max 100 chars */ String, Row] + val AddrLocCity: OptField[/* max 100 chars */ String, Row] + val AddrPostalCode: OptField[/* max 20 chars */ String, Row] val EMail: OptField[String, Row] val WebSite: OptField[String, Row] val modifieddate: Field[TypoLocalDateTime, Row] diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala index 2d8ecc8506..0c440175dc 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala @@ -22,17 +22,17 @@ case class VjobcandidateViewRow( jobcandidateid: JobcandidateId, /** Points to [[jobcandidate.JobcandidateRow.businessentityid]] */ businessentityid: Option[BusinessentityId], - `Name.Prefix`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.First`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Middle`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Last`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Suffix`: /* nullability unknown */ Option[/* max 30 chars */ String], + NamePrefix: /* nullability unknown */ Option[/* max 30 chars */ String], + NameFirst: /* nullability unknown */ Option[/* max 30 chars */ String], + NameMiddle: /* nullability unknown */ Option[/* max 30 chars */ String], + NameLast: /* nullability unknown */ Option[/* max 30 chars */ String], + NameSuffix: /* nullability unknown */ Option[/* max 30 chars */ String], Skills: /* nullability unknown */ Option[String], - `Addr.Type`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Addr.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.PostalCode`: /* nullability unknown */ Option[/* max 20 chars */ String], + AddrType: /* nullability unknown */ Option[/* max 30 chars */ String], + AddrLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocCity: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrPostalCode: /* nullability unknown */ Option[/* max 20 chars */ String], EMail: /* nullability unknown */ Option[String], WebSite: /* nullability unknown */ Option[String], /** Points to [[jobcandidate.JobcandidateRow.modifieddate]] */ @@ -41,7 +41,7 @@ case class VjobcandidateViewRow( object VjobcandidateViewRow { implicit lazy val decoder: Decoder[VjobcandidateViewRow] = Decoder.forProduct16[VjobcandidateViewRow, JobcandidateId, Option[BusinessentityId], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 20 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], TypoLocalDateTime]("jobcandidateid", "businessentityid", "Name.Prefix", "Name.First", "Name.Middle", "Name.Last", "Name.Suffix", "Skills", "Addr.Type", "Addr.Loc.CountryRegion", "Addr.Loc.State", "Addr.Loc.City", "Addr.PostalCode", "EMail", "WebSite", "modifieddate")(VjobcandidateViewRow.apply)(JobcandidateId.decoder, Decoder.decodeOption(BusinessentityId.decoder), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), TypoLocalDateTime.decoder) - implicit lazy val encoder: Encoder[VjobcandidateViewRow] = Encoder.forProduct16[VjobcandidateViewRow, JobcandidateId, Option[BusinessentityId], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 20 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], TypoLocalDateTime]("jobcandidateid", "businessentityid", "Name.Prefix", "Name.First", "Name.Middle", "Name.Last", "Name.Suffix", "Skills", "Addr.Type", "Addr.Loc.CountryRegion", "Addr.Loc.State", "Addr.Loc.City", "Addr.PostalCode", "EMail", "WebSite", "modifieddate")(x => (x.jobcandidateid, x.businessentityid, x.`Name.Prefix`, x.`Name.First`, x.`Name.Middle`, x.`Name.Last`, x.`Name.Suffix`, x.Skills, x.`Addr.Type`, x.`Addr.Loc.CountryRegion`, x.`Addr.Loc.State`, x.`Addr.Loc.City`, x.`Addr.PostalCode`, x.EMail, x.WebSite, x.modifieddate))(JobcandidateId.encoder, Encoder.encodeOption(BusinessentityId.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), TypoLocalDateTime.encoder) + implicit lazy val encoder: Encoder[VjobcandidateViewRow] = Encoder.forProduct16[VjobcandidateViewRow, JobcandidateId, Option[BusinessentityId], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[/* max 30 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 20 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], TypoLocalDateTime]("jobcandidateid", "businessentityid", "Name.Prefix", "Name.First", "Name.Middle", "Name.Last", "Name.Suffix", "Skills", "Addr.Type", "Addr.Loc.CountryRegion", "Addr.Loc.State", "Addr.Loc.City", "Addr.PostalCode", "EMail", "WebSite", "modifieddate")(x => (x.jobcandidateid, x.businessentityid, x.NamePrefix, x.NameFirst, x.NameMiddle, x.NameLast, x.NameSuffix, x.Skills, x.AddrType, x.AddrLocCountryRegion, x.AddrLocState, x.AddrLocCity, x.AddrPostalCode, x.EMail, x.WebSite, x.modifieddate))(JobcandidateId.encoder, Encoder.encodeOption(BusinessentityId.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), TypoLocalDateTime.encoder) implicit lazy val read: Read[VjobcandidateViewRow] = new Read[VjobcandidateViewRow]( gets = List( (JobcandidateId.get, Nullability.NoNulls), @@ -64,17 +64,17 @@ object VjobcandidateViewRow { unsafeGet = (rs: ResultSet, i: Int) => VjobcandidateViewRow( jobcandidateid = JobcandidateId.get.unsafeGetNonNullable(rs, i + 0), businessentityid = BusinessentityId.get.unsafeGetNullable(rs, i + 1), - `Name.Prefix` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 2), - `Name.First` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 3), - `Name.Middle` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), - `Name.Last` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), - `Name.Suffix` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), + NamePrefix = Meta.StringMeta.get.unsafeGetNullable(rs, i + 2), + NameFirst = Meta.StringMeta.get.unsafeGetNullable(rs, i + 3), + NameMiddle = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), + NameLast = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), + NameSuffix = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), Skills = Meta.StringMeta.get.unsafeGetNullable(rs, i + 7), - `Addr.Type` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), - `Addr.Loc.CountryRegion` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), - `Addr.Loc.State` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10), - `Addr.Loc.City` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 11), - `Addr.PostalCode` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 12), + AddrType = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), + AddrLocCountryRegion = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), + AddrLocState = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10), + AddrLocCity = Meta.StringMeta.get.unsafeGetNullable(rs, i + 11), + AddrPostalCode = Meta.StringMeta.get.unsafeGetNullable(rs, i + 12), EMail = Meta.StringMeta.get.unsafeGetNullable(rs, i + 13), WebSite = Meta.StringMeta.get.unsafeGetNullable(rs, i + 14), modifieddate = TypoLocalDateTime.get.unsafeGetNonNullable(rs, i + 15) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala index bf1d0efa6a..c2523ce854 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala @@ -21,23 +21,23 @@ class VjobcandidateViewStructure[Row](val prefix: Option[String], val extract: R override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) override val businessentityid = new OptField[BusinessentityId, Row](prefix, "businessentityid", None, None)(x => extract(x).businessentityid, (row, value) => merge(row, extract(row).copy(businessentityid = value))) - override val `Name.Prefix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).`Name.Prefix`, (row, value) => merge(row, extract(row).copy(`Name.Prefix` = value))) - override val `Name.First` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).`Name.First`, (row, value) => merge(row, extract(row).copy(`Name.First` = value))) - override val `Name.Middle` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).`Name.Middle`, (row, value) => merge(row, extract(row).copy(`Name.Middle` = value))) - override val `Name.Last` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).`Name.Last`, (row, value) => merge(row, extract(row).copy(`Name.Last` = value))) - override val `Name.Suffix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).`Name.Suffix`, (row, value) => merge(row, extract(row).copy(`Name.Suffix` = value))) + override val NamePrefix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).NamePrefix, (row, value) => merge(row, extract(row).copy(NamePrefix = value))) + override val NameFirst = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).NameFirst, (row, value) => merge(row, extract(row).copy(NameFirst = value))) + override val NameMiddle = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).NameMiddle, (row, value) => merge(row, extract(row).copy(NameMiddle = value))) + override val NameLast = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).NameLast, (row, value) => merge(row, extract(row).copy(NameLast = value))) + override val NameSuffix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).NameSuffix, (row, value) => merge(row, extract(row).copy(NameSuffix = value))) override val Skills = new OptField[String, Row](prefix, "Skills", None, None)(x => extract(x).Skills, (row, value) => merge(row, extract(row).copy(Skills = value))) - override val `Addr.Type` = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).`Addr.Type`, (row, value) => merge(row, extract(row).copy(`Addr.Type` = value))) - override val `Addr.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).`Addr.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.CountryRegion` = value))) - override val `Addr.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).`Addr.Loc.State`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.State` = value))) - override val `Addr.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).`Addr.Loc.City`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.City` = value))) - override val `Addr.PostalCode` = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).`Addr.PostalCode`, (row, value) => merge(row, extract(row).copy(`Addr.PostalCode` = value))) + override val AddrType = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).AddrType, (row, value) => merge(row, extract(row).copy(AddrType = value))) + override val AddrLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).AddrLocCountryRegion, (row, value) => merge(row, extract(row).copy(AddrLocCountryRegion = value))) + override val AddrLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).AddrLocState, (row, value) => merge(row, extract(row).copy(AddrLocState = value))) + override val AddrLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).AddrLocCity, (row, value) => merge(row, extract(row).copy(AddrLocCity = value))) + override val AddrPostalCode = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).AddrPostalCode, (row, value) => merge(row, extract(row).copy(AddrPostalCode = value))) override val EMail = new OptField[String, Row](prefix, "EMail", None, None)(x => extract(x).EMail, (row, value) => merge(row, extract(row).copy(EMail = value))) override val WebSite = new OptField[String, Row](prefix, "WebSite", None, None)(x => extract(x).WebSite, (row, value) => merge(row, extract(row).copy(WebSite = value))) override val modifieddate = new Field[TypoLocalDateTime, Row](prefix, "modifieddate", Some("text"), None)(x => extract(x).modifieddate, (row, value) => merge(row, extract(row).copy(modifieddate = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, `Name.Prefix`, `Name.First`, `Name.Middle`, `Name.Last`, `Name.Suffix`, Skills, `Addr.Type`, `Addr.Loc.CountryRegion`, `Addr.Loc.State`, `Addr.Loc.City`, `Addr.PostalCode`, EMail, WebSite, modifieddate) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, NamePrefix, NameFirst, NameMiddle, NameLast, NameSuffix, Skills, AddrType, AddrLocCountryRegion, AddrLocState, AddrLocCity, AddrPostalCode, EMail, WebSite, modifieddate) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateViewRow, merge: (NewRow, VjobcandidateViewRow) => NewRow): VjobcandidateViewStructure[NewRow] = new VjobcandidateViewStructure(prefix, extract, merge) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala index 773ebbdbb7..c404685066 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala @@ -14,18 +14,18 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateeducationViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Edu.Level`: OptField[/* max 50 chars */ String, Row] - val `Edu.StartDate`: OptField[TypoLocalDate, Row] - val `Edu.EndDate`: OptField[TypoLocalDate, Row] - val `Edu.Degree`: OptField[/* max 50 chars */ String, Row] - val `Edu.Major`: OptField[/* max 50 chars */ String, Row] - val `Edu.Minor`: OptField[/* max 50 chars */ String, Row] - val `Edu.GPA`: OptField[/* max 5 chars */ String, Row] - val `Edu.GPAScale`: OptField[/* max 5 chars */ String, Row] - val `Edu.School`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.City`: OptField[/* max 100 chars */ String, Row] + val EduLevel: OptField[/* max 50 chars */ String, Row] + val EduStartDate: OptField[TypoLocalDate, Row] + val EduEndDate: OptField[TypoLocalDate, Row] + val EduDegree: OptField[/* max 50 chars */ String, Row] + val EduMajor: OptField[/* max 50 chars */ String, Row] + val EduMinor: OptField[/* max 50 chars */ String, Row] + val EduGPA: OptField[/* max 5 chars */ String, Row] + val EduGPAScale: OptField[/* max 5 chars */ String, Row] + val EduSchool: OptField[/* max 100 chars */ String, Row] + val EduLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val EduLocState: OptField[/* max 100 chars */ String, Row] + val EduLocCity: OptField[/* max 100 chars */ String, Row] } object VjobcandidateeducationViewFields extends VjobcandidateeducationViewStructure[VjobcandidateeducationViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala index 4f0aafedcb..2c3fdd6db3 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala @@ -19,23 +19,23 @@ import java.sql.ResultSet case class VjobcandidateeducationViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Edu.Level`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.Degree`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Major`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Minor`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.GPA`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.GPAScale`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.School`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String] + EduLevel: /* nullability unknown */ Option[/* max 50 chars */ String], + EduStartDate: /* nullability unknown */ Option[TypoLocalDate], + EduEndDate: /* nullability unknown */ Option[TypoLocalDate], + EduDegree: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMajor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMinor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduGPA: /* nullability unknown */ Option[/* max 5 chars */ String], + EduGPAScale: /* nullability unknown */ Option[/* max 5 chars */ String], + EduSchool: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCity: /* nullability unknown */ Option[/* max 100 chars */ String] ) object VjobcandidateeducationViewRow { implicit lazy val decoder: Decoder[VjobcandidateeducationViewRow] = Decoder.forProduct13[VjobcandidateeducationViewRow, JobcandidateId, /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String]]("jobcandidateid", "Edu.Level", "Edu.StartDate", "Edu.EndDate", "Edu.Degree", "Edu.Major", "Edu.Minor", "Edu.GPA", "Edu.GPAScale", "Edu.School", "Edu.Loc.CountryRegion", "Edu.Loc.State", "Edu.Loc.City")(VjobcandidateeducationViewRow.apply)(JobcandidateId.decoder, Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(TypoLocalDate.decoder), Decoder.decodeOption(TypoLocalDate.decoder), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString)) - implicit lazy val encoder: Encoder[VjobcandidateeducationViewRow] = Encoder.forProduct13[VjobcandidateeducationViewRow, JobcandidateId, /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String]]("jobcandidateid", "Edu.Level", "Edu.StartDate", "Edu.EndDate", "Edu.Degree", "Edu.Major", "Edu.Minor", "Edu.GPA", "Edu.GPAScale", "Edu.School", "Edu.Loc.CountryRegion", "Edu.Loc.State", "Edu.Loc.City")(x => (x.jobcandidateid, x.`Edu.Level`, x.`Edu.StartDate`, x.`Edu.EndDate`, x.`Edu.Degree`, x.`Edu.Major`, x.`Edu.Minor`, x.`Edu.GPA`, x.`Edu.GPAScale`, x.`Edu.School`, x.`Edu.Loc.CountryRegion`, x.`Edu.Loc.State`, x.`Edu.Loc.City`))(JobcandidateId.encoder, Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString)) + implicit lazy val encoder: Encoder[VjobcandidateeducationViewRow] = Encoder.forProduct13[VjobcandidateeducationViewRow, JobcandidateId, /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 50 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 5 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String]]("jobcandidateid", "Edu.Level", "Edu.StartDate", "Edu.EndDate", "Edu.Degree", "Edu.Major", "Edu.Minor", "Edu.GPA", "Edu.GPAScale", "Edu.School", "Edu.Loc.CountryRegion", "Edu.Loc.State", "Edu.Loc.City")(x => (x.jobcandidateid, x.EduLevel, x.EduStartDate, x.EduEndDate, x.EduDegree, x.EduMajor, x.EduMinor, x.EduGPA, x.EduGPAScale, x.EduSchool, x.EduLocCountryRegion, x.EduLocState, x.EduLocCity))(JobcandidateId.encoder, Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString)) implicit lazy val read: Read[VjobcandidateeducationViewRow] = new Read[VjobcandidateeducationViewRow]( gets = List( (JobcandidateId.get, Nullability.NoNulls), @@ -54,18 +54,18 @@ object VjobcandidateeducationViewRow { ), unsafeGet = (rs: ResultSet, i: Int) => VjobcandidateeducationViewRow( jobcandidateid = JobcandidateId.get.unsafeGetNonNullable(rs, i + 0), - `Edu.Level` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 1), - `Edu.StartDate` = TypoLocalDate.get.unsafeGetNullable(rs, i + 2), - `Edu.EndDate` = TypoLocalDate.get.unsafeGetNullable(rs, i + 3), - `Edu.Degree` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), - `Edu.Major` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), - `Edu.Minor` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), - `Edu.GPA` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 7), - `Edu.GPAScale` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), - `Edu.School` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), - `Edu.Loc.CountryRegion` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10), - `Edu.Loc.State` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 11), - `Edu.Loc.City` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 12) + EduLevel = Meta.StringMeta.get.unsafeGetNullable(rs, i + 1), + EduStartDate = TypoLocalDate.get.unsafeGetNullable(rs, i + 2), + EduEndDate = TypoLocalDate.get.unsafeGetNullable(rs, i + 3), + EduDegree = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), + EduMajor = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), + EduMinor = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), + EduGPA = Meta.StringMeta.get.unsafeGetNullable(rs, i + 7), + EduGPAScale = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), + EduSchool = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), + EduLocCountryRegion = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10), + EduLocState = Meta.StringMeta.get.unsafeGetNullable(rs, i + 11), + EduLocCity = Meta.StringMeta.get.unsafeGetNullable(rs, i + 12) ) ) } diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala index e8fbf52207..f15b3290a9 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala @@ -19,21 +19,21 @@ class VjobcandidateeducationViewStructure[Row](val prefix: Option[String], val e with VjobcandidateeducationViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Edu.Level` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).`Edu.Level`, (row, value) => merge(row, extract(row).copy(`Edu.Level` = value))) - override val `Edu.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).`Edu.StartDate`, (row, value) => merge(row, extract(row).copy(`Edu.StartDate` = value))) - override val `Edu.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).`Edu.EndDate`, (row, value) => merge(row, extract(row).copy(`Edu.EndDate` = value))) - override val `Edu.Degree` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).`Edu.Degree`, (row, value) => merge(row, extract(row).copy(`Edu.Degree` = value))) - override val `Edu.Major` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).`Edu.Major`, (row, value) => merge(row, extract(row).copy(`Edu.Major` = value))) - override val `Edu.Minor` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).`Edu.Minor`, (row, value) => merge(row, extract(row).copy(`Edu.Minor` = value))) - override val `Edu.GPA` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).`Edu.GPA`, (row, value) => merge(row, extract(row).copy(`Edu.GPA` = value))) - override val `Edu.GPAScale` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).`Edu.GPAScale`, (row, value) => merge(row, extract(row).copy(`Edu.GPAScale` = value))) - override val `Edu.School` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).`Edu.School`, (row, value) => merge(row, extract(row).copy(`Edu.School` = value))) - override val `Edu.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).`Edu.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.CountryRegion` = value))) - override val `Edu.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).`Edu.Loc.State`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.State` = value))) - override val `Edu.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).`Edu.Loc.City`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.City` = value))) + override val EduLevel = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).EduLevel, (row, value) => merge(row, extract(row).copy(EduLevel = value))) + override val EduStartDate = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).EduStartDate, (row, value) => merge(row, extract(row).copy(EduStartDate = value))) + override val EduEndDate = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).EduEndDate, (row, value) => merge(row, extract(row).copy(EduEndDate = value))) + override val EduDegree = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).EduDegree, (row, value) => merge(row, extract(row).copy(EduDegree = value))) + override val EduMajor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).EduMajor, (row, value) => merge(row, extract(row).copy(EduMajor = value))) + override val EduMinor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).EduMinor, (row, value) => merge(row, extract(row).copy(EduMinor = value))) + override val EduGPA = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).EduGPA, (row, value) => merge(row, extract(row).copy(EduGPA = value))) + override val EduGPAScale = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).EduGPAScale, (row, value) => merge(row, extract(row).copy(EduGPAScale = value))) + override val EduSchool = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).EduSchool, (row, value) => merge(row, extract(row).copy(EduSchool = value))) + override val EduLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).EduLocCountryRegion, (row, value) => merge(row, extract(row).copy(EduLocCountryRegion = value))) + override val EduLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).EduLocState, (row, value) => merge(row, extract(row).copy(EduLocState = value))) + override val EduLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).EduLocCity, (row, value) => merge(row, extract(row).copy(EduLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Edu.Level`, `Edu.StartDate`, `Edu.EndDate`, `Edu.Degree`, `Edu.Major`, `Edu.Minor`, `Edu.GPA`, `Edu.GPAScale`, `Edu.School`, `Edu.Loc.CountryRegion`, `Edu.Loc.State`, `Edu.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EduLevel, EduStartDate, EduEndDate, EduDegree, EduMajor, EduMinor, EduGPA, EduGPAScale, EduSchool, EduLocCountryRegion, EduLocState, EduLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateeducationViewRow, merge: (NewRow, VjobcandidateeducationViewRow) => NewRow): VjobcandidateeducationViewStructure[NewRow] = new VjobcandidateeducationViewStructure(prefix, extract, merge) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala index 91792438f8..f7df4754b7 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala @@ -14,16 +14,16 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateemploymentViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Emp.StartDate`: OptField[TypoLocalDate, Row] - val `Emp.EndDate`: OptField[TypoLocalDate, Row] - val `Emp.OrgName`: OptField[/* max 100 chars */ String, Row] - val `Emp.JobTitle`: OptField[/* max 100 chars */ String, Row] - val `Emp.Responsibility`: OptField[String, Row] - val `Emp.FunctionCategory`: OptField[String, Row] - val `Emp.IndustryCategory`: OptField[String, Row] - val `Emp.Loc.CountryRegion`: OptField[String, Row] - val `Emp.Loc.State`: OptField[String, Row] - val `Emp.Loc.City`: OptField[String, Row] + val EmpStartDate: OptField[TypoLocalDate, Row] + val EmpEndDate: OptField[TypoLocalDate, Row] + val EmpOrgName: OptField[/* max 100 chars */ String, Row] + val EmpJobTitle: OptField[/* max 100 chars */ String, Row] + val EmpResponsibility: OptField[String, Row] + val EmpFunctionCategory: OptField[String, Row] + val EmpIndustryCategory: OptField[String, Row] + val EmpLocCountryRegion: OptField[String, Row] + val EmpLocState: OptField[String, Row] + val EmpLocCity: OptField[String, Row] } object VjobcandidateemploymentViewFields extends VjobcandidateemploymentViewStructure[VjobcandidateemploymentViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala index 1b6aade1b2..efda8c5d08 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala @@ -19,21 +19,21 @@ import java.sql.ResultSet case class VjobcandidateemploymentViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Emp.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.OrgName`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.JobTitle`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.Responsibility`: /* nullability unknown */ Option[String], - `Emp.FunctionCategory`: /* nullability unknown */ Option[String], - `Emp.IndustryCategory`: /* nullability unknown */ Option[String], - `Emp.Loc.CountryRegion`: /* nullability unknown */ Option[String], - `Emp.Loc.State`: /* nullability unknown */ Option[String], - `Emp.Loc.City`: /* nullability unknown */ Option[String] + EmpStartDate: /* nullability unknown */ Option[TypoLocalDate], + EmpEndDate: /* nullability unknown */ Option[TypoLocalDate], + EmpOrgName: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpJobTitle: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpResponsibility: /* nullability unknown */ Option[String], + EmpFunctionCategory: /* nullability unknown */ Option[String], + EmpIndustryCategory: /* nullability unknown */ Option[String], + EmpLocCountryRegion: /* nullability unknown */ Option[String], + EmpLocState: /* nullability unknown */ Option[String], + EmpLocCity: /* nullability unknown */ Option[String] ) object VjobcandidateemploymentViewRow { implicit lazy val decoder: Decoder[VjobcandidateemploymentViewRow] = Decoder.forProduct11[VjobcandidateemploymentViewRow, JobcandidateId, /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String]]("jobcandidateid", "Emp.StartDate", "Emp.EndDate", "Emp.OrgName", "Emp.JobTitle", "Emp.Responsibility", "Emp.FunctionCategory", "Emp.IndustryCategory", "Emp.Loc.CountryRegion", "Emp.Loc.State", "Emp.Loc.City")(VjobcandidateemploymentViewRow.apply)(JobcandidateId.decoder, Decoder.decodeOption(TypoLocalDate.decoder), Decoder.decodeOption(TypoLocalDate.decoder), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString), Decoder.decodeOption(Decoder.decodeString)) - implicit lazy val encoder: Encoder[VjobcandidateemploymentViewRow] = Encoder.forProduct11[VjobcandidateemploymentViewRow, JobcandidateId, /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String]]("jobcandidateid", "Emp.StartDate", "Emp.EndDate", "Emp.OrgName", "Emp.JobTitle", "Emp.Responsibility", "Emp.FunctionCategory", "Emp.IndustryCategory", "Emp.Loc.CountryRegion", "Emp.Loc.State", "Emp.Loc.City")(x => (x.jobcandidateid, x.`Emp.StartDate`, x.`Emp.EndDate`, x.`Emp.OrgName`, x.`Emp.JobTitle`, x.`Emp.Responsibility`, x.`Emp.FunctionCategory`, x.`Emp.IndustryCategory`, x.`Emp.Loc.CountryRegion`, x.`Emp.Loc.State`, x.`Emp.Loc.City`))(JobcandidateId.encoder, Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString)) + implicit lazy val encoder: Encoder[VjobcandidateemploymentViewRow] = Encoder.forProduct11[VjobcandidateemploymentViewRow, JobcandidateId, /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[TypoLocalDate], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[/* max 100 chars */ String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String], /* nullability unknown */ Option[String]]("jobcandidateid", "Emp.StartDate", "Emp.EndDate", "Emp.OrgName", "Emp.JobTitle", "Emp.Responsibility", "Emp.FunctionCategory", "Emp.IndustryCategory", "Emp.Loc.CountryRegion", "Emp.Loc.State", "Emp.Loc.City")(x => (x.jobcandidateid, x.EmpStartDate, x.EmpEndDate, x.EmpOrgName, x.EmpJobTitle, x.EmpResponsibility, x.EmpFunctionCategory, x.EmpIndustryCategory, x.EmpLocCountryRegion, x.EmpLocState, x.EmpLocCity))(JobcandidateId.encoder, Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(TypoLocalDate.encoder), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString), Encoder.encodeOption(Encoder.encodeString)) implicit lazy val read: Read[VjobcandidateemploymentViewRow] = new Read[VjobcandidateemploymentViewRow]( gets = List( (JobcandidateId.get, Nullability.NoNulls), @@ -50,16 +50,16 @@ object VjobcandidateemploymentViewRow { ), unsafeGet = (rs: ResultSet, i: Int) => VjobcandidateemploymentViewRow( jobcandidateid = JobcandidateId.get.unsafeGetNonNullable(rs, i + 0), - `Emp.StartDate` = TypoLocalDate.get.unsafeGetNullable(rs, i + 1), - `Emp.EndDate` = TypoLocalDate.get.unsafeGetNullable(rs, i + 2), - `Emp.OrgName` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 3), - `Emp.JobTitle` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), - `Emp.Responsibility` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), - `Emp.FunctionCategory` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), - `Emp.IndustryCategory` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 7), - `Emp.Loc.CountryRegion` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), - `Emp.Loc.State` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), - `Emp.Loc.City` = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10) + EmpStartDate = TypoLocalDate.get.unsafeGetNullable(rs, i + 1), + EmpEndDate = TypoLocalDate.get.unsafeGetNullable(rs, i + 2), + EmpOrgName = Meta.StringMeta.get.unsafeGetNullable(rs, i + 3), + EmpJobTitle = Meta.StringMeta.get.unsafeGetNullable(rs, i + 4), + EmpResponsibility = Meta.StringMeta.get.unsafeGetNullable(rs, i + 5), + EmpFunctionCategory = Meta.StringMeta.get.unsafeGetNullable(rs, i + 6), + EmpIndustryCategory = Meta.StringMeta.get.unsafeGetNullable(rs, i + 7), + EmpLocCountryRegion = Meta.StringMeta.get.unsafeGetNullable(rs, i + 8), + EmpLocState = Meta.StringMeta.get.unsafeGetNullable(rs, i + 9), + EmpLocCity = Meta.StringMeta.get.unsafeGetNullable(rs, i + 10) ) ) } diff --git a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala index 21af2c6559..249a29af29 100644 --- a/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala +++ b/typo-tester-doobie/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala @@ -19,19 +19,19 @@ class VjobcandidateemploymentViewStructure[Row](val prefix: Option[String], val with VjobcandidateemploymentViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Emp.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).`Emp.StartDate`, (row, value) => merge(row, extract(row).copy(`Emp.StartDate` = value))) - override val `Emp.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).`Emp.EndDate`, (row, value) => merge(row, extract(row).copy(`Emp.EndDate` = value))) - override val `Emp.OrgName` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).`Emp.OrgName`, (row, value) => merge(row, extract(row).copy(`Emp.OrgName` = value))) - override val `Emp.JobTitle` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).`Emp.JobTitle`, (row, value) => merge(row, extract(row).copy(`Emp.JobTitle` = value))) - override val `Emp.Responsibility` = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).`Emp.Responsibility`, (row, value) => merge(row, extract(row).copy(`Emp.Responsibility` = value))) - override val `Emp.FunctionCategory` = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).`Emp.FunctionCategory`, (row, value) => merge(row, extract(row).copy(`Emp.FunctionCategory` = value))) - override val `Emp.IndustryCategory` = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).`Emp.IndustryCategory`, (row, value) => merge(row, extract(row).copy(`Emp.IndustryCategory` = value))) - override val `Emp.Loc.CountryRegion` = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).`Emp.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.CountryRegion` = value))) - override val `Emp.Loc.State` = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).`Emp.Loc.State`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.State` = value))) - override val `Emp.Loc.City` = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).`Emp.Loc.City`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.City` = value))) + override val EmpStartDate = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).EmpStartDate, (row, value) => merge(row, extract(row).copy(EmpStartDate = value))) + override val EmpEndDate = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).EmpEndDate, (row, value) => merge(row, extract(row).copy(EmpEndDate = value))) + override val EmpOrgName = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).EmpOrgName, (row, value) => merge(row, extract(row).copy(EmpOrgName = value))) + override val EmpJobTitle = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).EmpJobTitle, (row, value) => merge(row, extract(row).copy(EmpJobTitle = value))) + override val EmpResponsibility = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).EmpResponsibility, (row, value) => merge(row, extract(row).copy(EmpResponsibility = value))) + override val EmpFunctionCategory = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).EmpFunctionCategory, (row, value) => merge(row, extract(row).copy(EmpFunctionCategory = value))) + override val EmpIndustryCategory = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).EmpIndustryCategory, (row, value) => merge(row, extract(row).copy(EmpIndustryCategory = value))) + override val EmpLocCountryRegion = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).EmpLocCountryRegion, (row, value) => merge(row, extract(row).copy(EmpLocCountryRegion = value))) + override val EmpLocState = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).EmpLocState, (row, value) => merge(row, extract(row).copy(EmpLocState = value))) + override val EmpLocCity = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).EmpLocCity, (row, value) => merge(row, extract(row).copy(EmpLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Emp.StartDate`, `Emp.EndDate`, `Emp.OrgName`, `Emp.JobTitle`, `Emp.Responsibility`, `Emp.FunctionCategory`, `Emp.IndustryCategory`, `Emp.Loc.CountryRegion`, `Emp.Loc.State`, `Emp.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EmpStartDate, EmpEndDate, EmpOrgName, EmpJobTitle, EmpResponsibility, EmpFunctionCategory, EmpIndustryCategory, EmpLocCountryRegion, EmpLocState, EmpLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateemploymentViewRow, merge: (NewRow, VjobcandidateemploymentViewRow) => NewRow): VjobcandidateemploymentViewStructure[NewRow] = new VjobcandidateemploymentViewStructure(prefix, extract, merge) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala index 93938baac3..1f35768849 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala @@ -16,17 +16,17 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] val businessentityid: OptField[BusinessentityId, Row] - val `Name.Prefix`: OptField[/* max 30 chars */ String, Row] - val `Name.First`: OptField[/* max 30 chars */ String, Row] - val `Name.Middle`: OptField[/* max 30 chars */ String, Row] - val `Name.Last`: OptField[/* max 30 chars */ String, Row] - val `Name.Suffix`: OptField[/* max 30 chars */ String, Row] + val NamePrefix: OptField[/* max 30 chars */ String, Row] + val NameFirst: OptField[/* max 30 chars */ String, Row] + val NameMiddle: OptField[/* max 30 chars */ String, Row] + val NameLast: OptField[/* max 30 chars */ String, Row] + val NameSuffix: OptField[/* max 30 chars */ String, Row] val Skills: OptField[String, Row] - val `Addr.Type`: OptField[/* max 30 chars */ String, Row] - val `Addr.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Addr.Loc.City`: OptField[/* max 100 chars */ String, Row] - val `Addr.PostalCode`: OptField[/* max 20 chars */ String, Row] + val AddrType: OptField[/* max 30 chars */ String, Row] + val AddrLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val AddrLocState: OptField[/* max 100 chars */ String, Row] + val AddrLocCity: OptField[/* max 100 chars */ String, Row] + val AddrPostalCode: OptField[/* max 20 chars */ String, Row] val EMail: OptField[String, Row] val WebSite: OptField[String, Row] val modifieddate: Field[TypoLocalDateTime, Row] diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala index 4185b946fd..93a7f2070c 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala @@ -22,17 +22,17 @@ case class VjobcandidateViewRow( jobcandidateid: JobcandidateId, /** Points to [[jobcandidate.JobcandidateRow.businessentityid]] */ businessentityid: Option[BusinessentityId], - `Name.Prefix`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.First`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Middle`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Last`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Name.Suffix`: /* nullability unknown */ Option[/* max 30 chars */ String], + NamePrefix: /* nullability unknown */ Option[/* max 30 chars */ String], + NameFirst: /* nullability unknown */ Option[/* max 30 chars */ String], + NameMiddle: /* nullability unknown */ Option[/* max 30 chars */ String], + NameLast: /* nullability unknown */ Option[/* max 30 chars */ String], + NameSuffix: /* nullability unknown */ Option[/* max 30 chars */ String], Skills: /* nullability unknown */ Option[String], - `Addr.Type`: /* nullability unknown */ Option[/* max 30 chars */ String], - `Addr.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Addr.PostalCode`: /* nullability unknown */ Option[/* max 20 chars */ String], + AddrType: /* nullability unknown */ Option[/* max 30 chars */ String], + AddrLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrLocCity: /* nullability unknown */ Option[/* max 100 chars */ String], + AddrPostalCode: /* nullability unknown */ Option[/* max 20 chars */ String], EMail: /* nullability unknown */ Option[String], WebSite: /* nullability unknown */ Option[String], /** Points to [[jobcandidate.JobcandidateRow.modifieddate]] */ @@ -46,17 +46,17 @@ object VjobcandidateViewRow { VjobcandidateViewRow( jobcandidateid = JobcandidateId.jdbcDecoder.unsafeDecode(columIndex + 0, rs)._2, businessentityid = JdbcDecoder.optionDecoder(BusinessentityId.jdbcDecoder).unsafeDecode(columIndex + 1, rs)._2, - `Name.Prefix` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 2, rs)._2, - `Name.First` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 3, rs)._2, - `Name.Middle` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, - `Name.Last` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, - `Name.Suffix` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, + NamePrefix = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 2, rs)._2, + NameFirst = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 3, rs)._2, + NameMiddle = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, + NameLast = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, + NameSuffix = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, Skills = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 7, rs)._2, - `Addr.Type` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, - `Addr.Loc.CountryRegion` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, - `Addr.Loc.State` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2, - `Addr.Loc.City` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 11, rs)._2, - `Addr.PostalCode` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 12, rs)._2, + AddrType = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, + AddrLocCountryRegion = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, + AddrLocState = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2, + AddrLocCity = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 11, rs)._2, + AddrPostalCode = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 12, rs)._2, EMail = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 13, rs)._2, WebSite = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 14, rs)._2, modifieddate = TypoLocalDateTime.jdbcDecoder.unsafeDecode(columIndex + 15, rs)._2 @@ -65,23 +65,23 @@ object VjobcandidateViewRow { implicit lazy val jsonDecoder: JsonDecoder[VjobcandidateViewRow] = JsonDecoder[Json.Obj].mapOrFail { jsonObj => val jobcandidateid = jsonObj.get("jobcandidateid").toRight("Missing field 'jobcandidateid'").flatMap(_.as(JobcandidateId.jsonDecoder)) val businessentityid = jsonObj.get("businessentityid").fold[Either[String, Option[BusinessentityId]]](Right(None))(_.as(JsonDecoder.option(BusinessentityId.jsonDecoder))) - val `Name.Prefix` = jsonObj.get("Name.Prefix").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Name.First` = jsonObj.get("Name.First").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Name.Middle` = jsonObj.get("Name.Middle").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Name.Last` = jsonObj.get("Name.Last").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Name.Suffix` = jsonObj.get("Name.Suffix").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val NamePrefix = jsonObj.get("Name.Prefix").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val NameFirst = jsonObj.get("Name.First").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val NameMiddle = jsonObj.get("Name.Middle").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val NameLast = jsonObj.get("Name.Last").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val NameSuffix = jsonObj.get("Name.Suffix").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) val Skills = jsonObj.get("Skills").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Addr.Type` = jsonObj.get("Addr.Type").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Addr.Loc.CountryRegion` = jsonObj.get("Addr.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Addr.Loc.State` = jsonObj.get("Addr.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Addr.Loc.City` = jsonObj.get("Addr.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Addr.PostalCode` = jsonObj.get("Addr.PostalCode").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val AddrType = jsonObj.get("Addr.Type").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val AddrLocCountryRegion = jsonObj.get("Addr.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val AddrLocState = jsonObj.get("Addr.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val AddrLocCity = jsonObj.get("Addr.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val AddrPostalCode = jsonObj.get("Addr.PostalCode").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) val EMail = jsonObj.get("EMail").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) val WebSite = jsonObj.get("WebSite").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) val modifieddate = jsonObj.get("modifieddate").toRight("Missing field 'modifieddate'").flatMap(_.as(TypoLocalDateTime.jsonDecoder)) - if (jobcandidateid.isRight && businessentityid.isRight && `Name.Prefix`.isRight && `Name.First`.isRight && `Name.Middle`.isRight && `Name.Last`.isRight && `Name.Suffix`.isRight && Skills.isRight && `Addr.Type`.isRight && `Addr.Loc.CountryRegion`.isRight && `Addr.Loc.State`.isRight && `Addr.Loc.City`.isRight && `Addr.PostalCode`.isRight && EMail.isRight && WebSite.isRight && modifieddate.isRight) - Right(VjobcandidateViewRow(jobcandidateid = jobcandidateid.toOption.get, businessentityid = businessentityid.toOption.get, `Name.Prefix` = `Name.Prefix`.toOption.get, `Name.First` = `Name.First`.toOption.get, `Name.Middle` = `Name.Middle`.toOption.get, `Name.Last` = `Name.Last`.toOption.get, `Name.Suffix` = `Name.Suffix`.toOption.get, Skills = Skills.toOption.get, `Addr.Type` = `Addr.Type`.toOption.get, `Addr.Loc.CountryRegion` = `Addr.Loc.CountryRegion`.toOption.get, `Addr.Loc.State` = `Addr.Loc.State`.toOption.get, `Addr.Loc.City` = `Addr.Loc.City`.toOption.get, `Addr.PostalCode` = `Addr.PostalCode`.toOption.get, EMail = EMail.toOption.get, WebSite = WebSite.toOption.get, modifieddate = modifieddate.toOption.get)) - else Left(List[Either[String, Any]](jobcandidateid, businessentityid, `Name.Prefix`, `Name.First`, `Name.Middle`, `Name.Last`, `Name.Suffix`, Skills, `Addr.Type`, `Addr.Loc.CountryRegion`, `Addr.Loc.State`, `Addr.Loc.City`, `Addr.PostalCode`, EMail, WebSite, modifieddate).flatMap(_.left.toOption).mkString(", ")) + if (jobcandidateid.isRight && businessentityid.isRight && NamePrefix.isRight && NameFirst.isRight && NameMiddle.isRight && NameLast.isRight && NameSuffix.isRight && Skills.isRight && AddrType.isRight && AddrLocCountryRegion.isRight && AddrLocState.isRight && AddrLocCity.isRight && AddrPostalCode.isRight && EMail.isRight && WebSite.isRight && modifieddate.isRight) + Right(VjobcandidateViewRow(jobcandidateid = jobcandidateid.toOption.get, businessentityid = businessentityid.toOption.get, NamePrefix = NamePrefix.toOption.get, NameFirst = NameFirst.toOption.get, NameMiddle = NameMiddle.toOption.get, NameLast = NameLast.toOption.get, NameSuffix = NameSuffix.toOption.get, Skills = Skills.toOption.get, AddrType = AddrType.toOption.get, AddrLocCountryRegion = AddrLocCountryRegion.toOption.get, AddrLocState = AddrLocState.toOption.get, AddrLocCity = AddrLocCity.toOption.get, AddrPostalCode = AddrPostalCode.toOption.get, EMail = EMail.toOption.get, WebSite = WebSite.toOption.get, modifieddate = modifieddate.toOption.get)) + else Left(List[Either[String, Any]](jobcandidateid, businessentityid, NamePrefix, NameFirst, NameMiddle, NameLast, NameSuffix, Skills, AddrType, AddrLocCountryRegion, AddrLocState, AddrLocCity, AddrPostalCode, EMail, WebSite, modifieddate).flatMap(_.left.toOption).mkString(", ")) } implicit lazy val jsonEncoder: JsonEncoder[VjobcandidateViewRow] = new JsonEncoder[VjobcandidateViewRow] { override def unsafeEncode(a: VjobcandidateViewRow, indent: Option[Int], out: Write): Unit = { @@ -93,37 +93,37 @@ object VjobcandidateViewRow { JsonEncoder.option(BusinessentityId.jsonEncoder).unsafeEncode(a.businessentityid, indent, out) out.write(",") out.write(""""Name.Prefix":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Name.Prefix`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.NamePrefix, indent, out) out.write(",") out.write(""""Name.First":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Name.First`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.NameFirst, indent, out) out.write(",") out.write(""""Name.Middle":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Name.Middle`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.NameMiddle, indent, out) out.write(",") out.write(""""Name.Last":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Name.Last`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.NameLast, indent, out) out.write(",") out.write(""""Name.Suffix":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Name.Suffix`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.NameSuffix, indent, out) out.write(",") out.write(""""Skills":""") JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.Skills, indent, out) out.write(",") out.write(""""Addr.Type":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Addr.Type`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.AddrType, indent, out) out.write(",") out.write(""""Addr.Loc.CountryRegion":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Addr.Loc.CountryRegion`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.AddrLocCountryRegion, indent, out) out.write(",") out.write(""""Addr.Loc.State":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Addr.Loc.State`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.AddrLocState, indent, out) out.write(",") out.write(""""Addr.Loc.City":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Addr.Loc.City`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.AddrLocCity, indent, out) out.write(",") out.write(""""Addr.PostalCode":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Addr.PostalCode`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.AddrPostalCode, indent, out) out.write(",") out.write(""""EMail":""") JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EMail, indent, out) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala index bf1d0efa6a..c2523ce854 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala @@ -21,23 +21,23 @@ class VjobcandidateViewStructure[Row](val prefix: Option[String], val extract: R override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) override val businessentityid = new OptField[BusinessentityId, Row](prefix, "businessentityid", None, None)(x => extract(x).businessentityid, (row, value) => merge(row, extract(row).copy(businessentityid = value))) - override val `Name.Prefix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).`Name.Prefix`, (row, value) => merge(row, extract(row).copy(`Name.Prefix` = value))) - override val `Name.First` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).`Name.First`, (row, value) => merge(row, extract(row).copy(`Name.First` = value))) - override val `Name.Middle` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).`Name.Middle`, (row, value) => merge(row, extract(row).copy(`Name.Middle` = value))) - override val `Name.Last` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).`Name.Last`, (row, value) => merge(row, extract(row).copy(`Name.Last` = value))) - override val `Name.Suffix` = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).`Name.Suffix`, (row, value) => merge(row, extract(row).copy(`Name.Suffix` = value))) + override val NamePrefix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Prefix", None, None)(x => extract(x).NamePrefix, (row, value) => merge(row, extract(row).copy(NamePrefix = value))) + override val NameFirst = new OptField[/* max 30 chars */ String, Row](prefix, "Name.First", None, None)(x => extract(x).NameFirst, (row, value) => merge(row, extract(row).copy(NameFirst = value))) + override val NameMiddle = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Middle", None, None)(x => extract(x).NameMiddle, (row, value) => merge(row, extract(row).copy(NameMiddle = value))) + override val NameLast = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Last", None, None)(x => extract(x).NameLast, (row, value) => merge(row, extract(row).copy(NameLast = value))) + override val NameSuffix = new OptField[/* max 30 chars */ String, Row](prefix, "Name.Suffix", None, None)(x => extract(x).NameSuffix, (row, value) => merge(row, extract(row).copy(NameSuffix = value))) override val Skills = new OptField[String, Row](prefix, "Skills", None, None)(x => extract(x).Skills, (row, value) => merge(row, extract(row).copy(Skills = value))) - override val `Addr.Type` = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).`Addr.Type`, (row, value) => merge(row, extract(row).copy(`Addr.Type` = value))) - override val `Addr.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).`Addr.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.CountryRegion` = value))) - override val `Addr.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).`Addr.Loc.State`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.State` = value))) - override val `Addr.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).`Addr.Loc.City`, (row, value) => merge(row, extract(row).copy(`Addr.Loc.City` = value))) - override val `Addr.PostalCode` = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).`Addr.PostalCode`, (row, value) => merge(row, extract(row).copy(`Addr.PostalCode` = value))) + override val AddrType = new OptField[/* max 30 chars */ String, Row](prefix, "Addr.Type", None, None)(x => extract(x).AddrType, (row, value) => merge(row, extract(row).copy(AddrType = value))) + override val AddrLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.CountryRegion", None, None)(x => extract(x).AddrLocCountryRegion, (row, value) => merge(row, extract(row).copy(AddrLocCountryRegion = value))) + override val AddrLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.State", None, None)(x => extract(x).AddrLocState, (row, value) => merge(row, extract(row).copy(AddrLocState = value))) + override val AddrLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Addr.Loc.City", None, None)(x => extract(x).AddrLocCity, (row, value) => merge(row, extract(row).copy(AddrLocCity = value))) + override val AddrPostalCode = new OptField[/* max 20 chars */ String, Row](prefix, "Addr.PostalCode", None, None)(x => extract(x).AddrPostalCode, (row, value) => merge(row, extract(row).copy(AddrPostalCode = value))) override val EMail = new OptField[String, Row](prefix, "EMail", None, None)(x => extract(x).EMail, (row, value) => merge(row, extract(row).copy(EMail = value))) override val WebSite = new OptField[String, Row](prefix, "WebSite", None, None)(x => extract(x).WebSite, (row, value) => merge(row, extract(row).copy(WebSite = value))) override val modifieddate = new Field[TypoLocalDateTime, Row](prefix, "modifieddate", Some("text"), None)(x => extract(x).modifieddate, (row, value) => merge(row, extract(row).copy(modifieddate = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, `Name.Prefix`, `Name.First`, `Name.Middle`, `Name.Last`, `Name.Suffix`, Skills, `Addr.Type`, `Addr.Loc.CountryRegion`, `Addr.Loc.State`, `Addr.Loc.City`, `Addr.PostalCode`, EMail, WebSite, modifieddate) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, businessentityid, NamePrefix, NameFirst, NameMiddle, NameLast, NameSuffix, Skills, AddrType, AddrLocCountryRegion, AddrLocState, AddrLocCity, AddrPostalCode, EMail, WebSite, modifieddate) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateViewRow, merge: (NewRow, VjobcandidateViewRow) => NewRow): VjobcandidateViewStructure[NewRow] = new VjobcandidateViewStructure(prefix, extract, merge) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala index 773ebbdbb7..c404685066 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala @@ -14,18 +14,18 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateeducationViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Edu.Level`: OptField[/* max 50 chars */ String, Row] - val `Edu.StartDate`: OptField[TypoLocalDate, Row] - val `Edu.EndDate`: OptField[TypoLocalDate, Row] - val `Edu.Degree`: OptField[/* max 50 chars */ String, Row] - val `Edu.Major`: OptField[/* max 50 chars */ String, Row] - val `Edu.Minor`: OptField[/* max 50 chars */ String, Row] - val `Edu.GPA`: OptField[/* max 5 chars */ String, Row] - val `Edu.GPAScale`: OptField[/* max 5 chars */ String, Row] - val `Edu.School`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.CountryRegion`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.State`: OptField[/* max 100 chars */ String, Row] - val `Edu.Loc.City`: OptField[/* max 100 chars */ String, Row] + val EduLevel: OptField[/* max 50 chars */ String, Row] + val EduStartDate: OptField[TypoLocalDate, Row] + val EduEndDate: OptField[TypoLocalDate, Row] + val EduDegree: OptField[/* max 50 chars */ String, Row] + val EduMajor: OptField[/* max 50 chars */ String, Row] + val EduMinor: OptField[/* max 50 chars */ String, Row] + val EduGPA: OptField[/* max 5 chars */ String, Row] + val EduGPAScale: OptField[/* max 5 chars */ String, Row] + val EduSchool: OptField[/* max 100 chars */ String, Row] + val EduLocCountryRegion: OptField[/* max 100 chars */ String, Row] + val EduLocState: OptField[/* max 100 chars */ String, Row] + val EduLocCity: OptField[/* max 100 chars */ String, Row] } object VjobcandidateeducationViewFields extends VjobcandidateeducationViewStructure[VjobcandidateeducationViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala index da935cf52e..13040a4361 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewRow.scala @@ -19,18 +19,18 @@ import zio.json.internal.Write case class VjobcandidateeducationViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Edu.Level`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Edu.Degree`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Major`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.Minor`: /* nullability unknown */ Option[/* max 50 chars */ String], - `Edu.GPA`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.GPAScale`: /* nullability unknown */ Option[/* max 5 chars */ String], - `Edu.School`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.CountryRegion`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.State`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Edu.Loc.City`: /* nullability unknown */ Option[/* max 100 chars */ String] + EduLevel: /* nullability unknown */ Option[/* max 50 chars */ String], + EduStartDate: /* nullability unknown */ Option[TypoLocalDate], + EduEndDate: /* nullability unknown */ Option[TypoLocalDate], + EduDegree: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMajor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduMinor: /* nullability unknown */ Option[/* max 50 chars */ String], + EduGPA: /* nullability unknown */ Option[/* max 5 chars */ String], + EduGPAScale: /* nullability unknown */ Option[/* max 5 chars */ String], + EduSchool: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCountryRegion: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocState: /* nullability unknown */ Option[/* max 100 chars */ String], + EduLocCity: /* nullability unknown */ Option[/* max 100 chars */ String] ) object VjobcandidateeducationViewRow { @@ -39,37 +39,37 @@ object VjobcandidateeducationViewRow { columIndex + 12 -> VjobcandidateeducationViewRow( jobcandidateid = JobcandidateId.jdbcDecoder.unsafeDecode(columIndex + 0, rs)._2, - `Edu.Level` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 1, rs)._2, - `Edu.StartDate` = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 2, rs)._2, - `Edu.EndDate` = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 3, rs)._2, - `Edu.Degree` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, - `Edu.Major` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, - `Edu.Minor` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, - `Edu.GPA` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 7, rs)._2, - `Edu.GPAScale` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, - `Edu.School` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, - `Edu.Loc.CountryRegion` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2, - `Edu.Loc.State` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 11, rs)._2, - `Edu.Loc.City` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 12, rs)._2 + EduLevel = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 1, rs)._2, + EduStartDate = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 2, rs)._2, + EduEndDate = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 3, rs)._2, + EduDegree = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, + EduMajor = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, + EduMinor = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, + EduGPA = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 7, rs)._2, + EduGPAScale = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, + EduSchool = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, + EduLocCountryRegion = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2, + EduLocState = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 11, rs)._2, + EduLocCity = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 12, rs)._2 ) } implicit lazy val jsonDecoder: JsonDecoder[VjobcandidateeducationViewRow] = JsonDecoder[Json.Obj].mapOrFail { jsonObj => val jobcandidateid = jsonObj.get("jobcandidateid").toRight("Missing field 'jobcandidateid'").flatMap(_.as(JobcandidateId.jsonDecoder)) - val `Edu.Level` = jsonObj.get("Edu.Level").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.StartDate` = jsonObj.get("Edu.StartDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) - val `Edu.EndDate` = jsonObj.get("Edu.EndDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) - val `Edu.Degree` = jsonObj.get("Edu.Degree").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.Major` = jsonObj.get("Edu.Major").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.Minor` = jsonObj.get("Edu.Minor").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.GPA` = jsonObj.get("Edu.GPA").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.GPAScale` = jsonObj.get("Edu.GPAScale").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.School` = jsonObj.get("Edu.School").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.Loc.CountryRegion` = jsonObj.get("Edu.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.Loc.State` = jsonObj.get("Edu.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Edu.Loc.City` = jsonObj.get("Edu.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - if (jobcandidateid.isRight && `Edu.Level`.isRight && `Edu.StartDate`.isRight && `Edu.EndDate`.isRight && `Edu.Degree`.isRight && `Edu.Major`.isRight && `Edu.Minor`.isRight && `Edu.GPA`.isRight && `Edu.GPAScale`.isRight && `Edu.School`.isRight && `Edu.Loc.CountryRegion`.isRight && `Edu.Loc.State`.isRight && `Edu.Loc.City`.isRight) - Right(VjobcandidateeducationViewRow(jobcandidateid = jobcandidateid.toOption.get, `Edu.Level` = `Edu.Level`.toOption.get, `Edu.StartDate` = `Edu.StartDate`.toOption.get, `Edu.EndDate` = `Edu.EndDate`.toOption.get, `Edu.Degree` = `Edu.Degree`.toOption.get, `Edu.Major` = `Edu.Major`.toOption.get, `Edu.Minor` = `Edu.Minor`.toOption.get, `Edu.GPA` = `Edu.GPA`.toOption.get, `Edu.GPAScale` = `Edu.GPAScale`.toOption.get, `Edu.School` = `Edu.School`.toOption.get, `Edu.Loc.CountryRegion` = `Edu.Loc.CountryRegion`.toOption.get, `Edu.Loc.State` = `Edu.Loc.State`.toOption.get, `Edu.Loc.City` = `Edu.Loc.City`.toOption.get)) - else Left(List[Either[String, Any]](jobcandidateid, `Edu.Level`, `Edu.StartDate`, `Edu.EndDate`, `Edu.Degree`, `Edu.Major`, `Edu.Minor`, `Edu.GPA`, `Edu.GPAScale`, `Edu.School`, `Edu.Loc.CountryRegion`, `Edu.Loc.State`, `Edu.Loc.City`).flatMap(_.left.toOption).mkString(", ")) + val EduLevel = jsonObj.get("Edu.Level").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduStartDate = jsonObj.get("Edu.StartDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) + val EduEndDate = jsonObj.get("Edu.EndDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) + val EduDegree = jsonObj.get("Edu.Degree").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduMajor = jsonObj.get("Edu.Major").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduMinor = jsonObj.get("Edu.Minor").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduGPA = jsonObj.get("Edu.GPA").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduGPAScale = jsonObj.get("Edu.GPAScale").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduSchool = jsonObj.get("Edu.School").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduLocCountryRegion = jsonObj.get("Edu.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduLocState = jsonObj.get("Edu.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EduLocCity = jsonObj.get("Edu.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + if (jobcandidateid.isRight && EduLevel.isRight && EduStartDate.isRight && EduEndDate.isRight && EduDegree.isRight && EduMajor.isRight && EduMinor.isRight && EduGPA.isRight && EduGPAScale.isRight && EduSchool.isRight && EduLocCountryRegion.isRight && EduLocState.isRight && EduLocCity.isRight) + Right(VjobcandidateeducationViewRow(jobcandidateid = jobcandidateid.toOption.get, EduLevel = EduLevel.toOption.get, EduStartDate = EduStartDate.toOption.get, EduEndDate = EduEndDate.toOption.get, EduDegree = EduDegree.toOption.get, EduMajor = EduMajor.toOption.get, EduMinor = EduMinor.toOption.get, EduGPA = EduGPA.toOption.get, EduGPAScale = EduGPAScale.toOption.get, EduSchool = EduSchool.toOption.get, EduLocCountryRegion = EduLocCountryRegion.toOption.get, EduLocState = EduLocState.toOption.get, EduLocCity = EduLocCity.toOption.get)) + else Left(List[Either[String, Any]](jobcandidateid, EduLevel, EduStartDate, EduEndDate, EduDegree, EduMajor, EduMinor, EduGPA, EduGPAScale, EduSchool, EduLocCountryRegion, EduLocState, EduLocCity).flatMap(_.left.toOption).mkString(", ")) } implicit lazy val jsonEncoder: JsonEncoder[VjobcandidateeducationViewRow] = new JsonEncoder[VjobcandidateeducationViewRow] { override def unsafeEncode(a: VjobcandidateeducationViewRow, indent: Option[Int], out: Write): Unit = { @@ -78,40 +78,40 @@ object VjobcandidateeducationViewRow { JobcandidateId.jsonEncoder.unsafeEncode(a.jobcandidateid, indent, out) out.write(",") out.write(""""Edu.Level":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Level`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduLevel, indent, out) out.write(",") out.write(""""Edu.StartDate":""") - JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.`Edu.StartDate`, indent, out) + JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.EduStartDate, indent, out) out.write(",") out.write(""""Edu.EndDate":""") - JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.`Edu.EndDate`, indent, out) + JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.EduEndDate, indent, out) out.write(",") out.write(""""Edu.Degree":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Degree`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduDegree, indent, out) out.write(",") out.write(""""Edu.Major":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Major`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduMajor, indent, out) out.write(",") out.write(""""Edu.Minor":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Minor`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduMinor, indent, out) out.write(",") out.write(""""Edu.GPA":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.GPA`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduGPA, indent, out) out.write(",") out.write(""""Edu.GPAScale":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.GPAScale`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduGPAScale, indent, out) out.write(",") out.write(""""Edu.School":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.School`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduSchool, indent, out) out.write(",") out.write(""""Edu.Loc.CountryRegion":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Loc.CountryRegion`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduLocCountryRegion, indent, out) out.write(",") out.write(""""Edu.Loc.State":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Loc.State`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduLocState, indent, out) out.write(",") out.write(""""Edu.Loc.City":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Edu.Loc.City`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EduLocCity, indent, out) out.write("}") } } diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala index e8fbf52207..f15b3290a9 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewStructure.scala @@ -19,21 +19,21 @@ class VjobcandidateeducationViewStructure[Row](val prefix: Option[String], val e with VjobcandidateeducationViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Edu.Level` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).`Edu.Level`, (row, value) => merge(row, extract(row).copy(`Edu.Level` = value))) - override val `Edu.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).`Edu.StartDate`, (row, value) => merge(row, extract(row).copy(`Edu.StartDate` = value))) - override val `Edu.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).`Edu.EndDate`, (row, value) => merge(row, extract(row).copy(`Edu.EndDate` = value))) - override val `Edu.Degree` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).`Edu.Degree`, (row, value) => merge(row, extract(row).copy(`Edu.Degree` = value))) - override val `Edu.Major` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).`Edu.Major`, (row, value) => merge(row, extract(row).copy(`Edu.Major` = value))) - override val `Edu.Minor` = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).`Edu.Minor`, (row, value) => merge(row, extract(row).copy(`Edu.Minor` = value))) - override val `Edu.GPA` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).`Edu.GPA`, (row, value) => merge(row, extract(row).copy(`Edu.GPA` = value))) - override val `Edu.GPAScale` = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).`Edu.GPAScale`, (row, value) => merge(row, extract(row).copy(`Edu.GPAScale` = value))) - override val `Edu.School` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).`Edu.School`, (row, value) => merge(row, extract(row).copy(`Edu.School` = value))) - override val `Edu.Loc.CountryRegion` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).`Edu.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.CountryRegion` = value))) - override val `Edu.Loc.State` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).`Edu.Loc.State`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.State` = value))) - override val `Edu.Loc.City` = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).`Edu.Loc.City`, (row, value) => merge(row, extract(row).copy(`Edu.Loc.City` = value))) + override val EduLevel = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Level", None, None)(x => extract(x).EduLevel, (row, value) => merge(row, extract(row).copy(EduLevel = value))) + override val EduStartDate = new OptField[TypoLocalDate, Row](prefix, "Edu.StartDate", Some("text"), None)(x => extract(x).EduStartDate, (row, value) => merge(row, extract(row).copy(EduStartDate = value))) + override val EduEndDate = new OptField[TypoLocalDate, Row](prefix, "Edu.EndDate", Some("text"), None)(x => extract(x).EduEndDate, (row, value) => merge(row, extract(row).copy(EduEndDate = value))) + override val EduDegree = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Degree", None, None)(x => extract(x).EduDegree, (row, value) => merge(row, extract(row).copy(EduDegree = value))) + override val EduMajor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Major", None, None)(x => extract(x).EduMajor, (row, value) => merge(row, extract(row).copy(EduMajor = value))) + override val EduMinor = new OptField[/* max 50 chars */ String, Row](prefix, "Edu.Minor", None, None)(x => extract(x).EduMinor, (row, value) => merge(row, extract(row).copy(EduMinor = value))) + override val EduGPA = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPA", None, None)(x => extract(x).EduGPA, (row, value) => merge(row, extract(row).copy(EduGPA = value))) + override val EduGPAScale = new OptField[/* max 5 chars */ String, Row](prefix, "Edu.GPAScale", None, None)(x => extract(x).EduGPAScale, (row, value) => merge(row, extract(row).copy(EduGPAScale = value))) + override val EduSchool = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.School", None, None)(x => extract(x).EduSchool, (row, value) => merge(row, extract(row).copy(EduSchool = value))) + override val EduLocCountryRegion = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.CountryRegion", None, None)(x => extract(x).EduLocCountryRegion, (row, value) => merge(row, extract(row).copy(EduLocCountryRegion = value))) + override val EduLocState = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.State", None, None)(x => extract(x).EduLocState, (row, value) => merge(row, extract(row).copy(EduLocState = value))) + override val EduLocCity = new OptField[/* max 100 chars */ String, Row](prefix, "Edu.Loc.City", None, None)(x => extract(x).EduLocCity, (row, value) => merge(row, extract(row).copy(EduLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Edu.Level`, `Edu.StartDate`, `Edu.EndDate`, `Edu.Degree`, `Edu.Major`, `Edu.Minor`, `Edu.GPA`, `Edu.GPAScale`, `Edu.School`, `Edu.Loc.CountryRegion`, `Edu.Loc.State`, `Edu.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EduLevel, EduStartDate, EduEndDate, EduDegree, EduMajor, EduMinor, EduGPA, EduGPAScale, EduSchool, EduLocCountryRegion, EduLocState, EduLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateeducationViewRow, merge: (NewRow, VjobcandidateeducationViewRow) => NewRow): VjobcandidateeducationViewStructure[NewRow] = new VjobcandidateeducationViewStructure(prefix, extract, merge) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala index 91792438f8..f7df4754b7 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewFields.scala @@ -14,16 +14,16 @@ import typo.dsl.SqlExpr.OptField trait VjobcandidateemploymentViewFields[Row] { val jobcandidateid: Field[JobcandidateId, Row] - val `Emp.StartDate`: OptField[TypoLocalDate, Row] - val `Emp.EndDate`: OptField[TypoLocalDate, Row] - val `Emp.OrgName`: OptField[/* max 100 chars */ String, Row] - val `Emp.JobTitle`: OptField[/* max 100 chars */ String, Row] - val `Emp.Responsibility`: OptField[String, Row] - val `Emp.FunctionCategory`: OptField[String, Row] - val `Emp.IndustryCategory`: OptField[String, Row] - val `Emp.Loc.CountryRegion`: OptField[String, Row] - val `Emp.Loc.State`: OptField[String, Row] - val `Emp.Loc.City`: OptField[String, Row] + val EmpStartDate: OptField[TypoLocalDate, Row] + val EmpEndDate: OptField[TypoLocalDate, Row] + val EmpOrgName: OptField[/* max 100 chars */ String, Row] + val EmpJobTitle: OptField[/* max 100 chars */ String, Row] + val EmpResponsibility: OptField[String, Row] + val EmpFunctionCategory: OptField[String, Row] + val EmpIndustryCategory: OptField[String, Row] + val EmpLocCountryRegion: OptField[String, Row] + val EmpLocState: OptField[String, Row] + val EmpLocCity: OptField[String, Row] } object VjobcandidateemploymentViewFields extends VjobcandidateemploymentViewStructure[VjobcandidateemploymentViewRow](None, identity, (_, x) => x) diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala index e241b31977..e0ed33ad2e 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewRow.scala @@ -19,16 +19,16 @@ import zio.json.internal.Write case class VjobcandidateemploymentViewRow( /** Points to [[jobcandidate.JobcandidateRow.jobcandidateid]] */ jobcandidateid: JobcandidateId, - `Emp.StartDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.EndDate`: /* nullability unknown */ Option[TypoLocalDate], - `Emp.OrgName`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.JobTitle`: /* nullability unknown */ Option[/* max 100 chars */ String], - `Emp.Responsibility`: /* nullability unknown */ Option[String], - `Emp.FunctionCategory`: /* nullability unknown */ Option[String], - `Emp.IndustryCategory`: /* nullability unknown */ Option[String], - `Emp.Loc.CountryRegion`: /* nullability unknown */ Option[String], - `Emp.Loc.State`: /* nullability unknown */ Option[String], - `Emp.Loc.City`: /* nullability unknown */ Option[String] + EmpStartDate: /* nullability unknown */ Option[TypoLocalDate], + EmpEndDate: /* nullability unknown */ Option[TypoLocalDate], + EmpOrgName: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpJobTitle: /* nullability unknown */ Option[/* max 100 chars */ String], + EmpResponsibility: /* nullability unknown */ Option[String], + EmpFunctionCategory: /* nullability unknown */ Option[String], + EmpIndustryCategory: /* nullability unknown */ Option[String], + EmpLocCountryRegion: /* nullability unknown */ Option[String], + EmpLocState: /* nullability unknown */ Option[String], + EmpLocCity: /* nullability unknown */ Option[String] ) object VjobcandidateemploymentViewRow { @@ -37,33 +37,33 @@ object VjobcandidateemploymentViewRow { columIndex + 10 -> VjobcandidateemploymentViewRow( jobcandidateid = JobcandidateId.jdbcDecoder.unsafeDecode(columIndex + 0, rs)._2, - `Emp.StartDate` = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 1, rs)._2, - `Emp.EndDate` = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 2, rs)._2, - `Emp.OrgName` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 3, rs)._2, - `Emp.JobTitle` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, - `Emp.Responsibility` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, - `Emp.FunctionCategory` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, - `Emp.IndustryCategory` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 7, rs)._2, - `Emp.Loc.CountryRegion` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, - `Emp.Loc.State` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, - `Emp.Loc.City` = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2 + EmpStartDate = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 1, rs)._2, + EmpEndDate = JdbcDecoder.optionDecoder(TypoLocalDate.jdbcDecoder).unsafeDecode(columIndex + 2, rs)._2, + EmpOrgName = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 3, rs)._2, + EmpJobTitle = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 4, rs)._2, + EmpResponsibility = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 5, rs)._2, + EmpFunctionCategory = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 6, rs)._2, + EmpIndustryCategory = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 7, rs)._2, + EmpLocCountryRegion = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 8, rs)._2, + EmpLocState = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 9, rs)._2, + EmpLocCity = JdbcDecoder.optionDecoder(JdbcDecoder.stringDecoder).unsafeDecode(columIndex + 10, rs)._2 ) } implicit lazy val jsonDecoder: JsonDecoder[VjobcandidateemploymentViewRow] = JsonDecoder[Json.Obj].mapOrFail { jsonObj => val jobcandidateid = jsonObj.get("jobcandidateid").toRight("Missing field 'jobcandidateid'").flatMap(_.as(JobcandidateId.jsonDecoder)) - val `Emp.StartDate` = jsonObj.get("Emp.StartDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) - val `Emp.EndDate` = jsonObj.get("Emp.EndDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) - val `Emp.OrgName` = jsonObj.get("Emp.OrgName").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.JobTitle` = jsonObj.get("Emp.JobTitle").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.Responsibility` = jsonObj.get("Emp.Responsibility").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.FunctionCategory` = jsonObj.get("Emp.FunctionCategory").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.IndustryCategory` = jsonObj.get("Emp.IndustryCategory").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.Loc.CountryRegion` = jsonObj.get("Emp.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.Loc.State` = jsonObj.get("Emp.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - val `Emp.Loc.City` = jsonObj.get("Emp.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) - if (jobcandidateid.isRight && `Emp.StartDate`.isRight && `Emp.EndDate`.isRight && `Emp.OrgName`.isRight && `Emp.JobTitle`.isRight && `Emp.Responsibility`.isRight && `Emp.FunctionCategory`.isRight && `Emp.IndustryCategory`.isRight && `Emp.Loc.CountryRegion`.isRight && `Emp.Loc.State`.isRight && `Emp.Loc.City`.isRight) - Right(VjobcandidateemploymentViewRow(jobcandidateid = jobcandidateid.toOption.get, `Emp.StartDate` = `Emp.StartDate`.toOption.get, `Emp.EndDate` = `Emp.EndDate`.toOption.get, `Emp.OrgName` = `Emp.OrgName`.toOption.get, `Emp.JobTitle` = `Emp.JobTitle`.toOption.get, `Emp.Responsibility` = `Emp.Responsibility`.toOption.get, `Emp.FunctionCategory` = `Emp.FunctionCategory`.toOption.get, `Emp.IndustryCategory` = `Emp.IndustryCategory`.toOption.get, `Emp.Loc.CountryRegion` = `Emp.Loc.CountryRegion`.toOption.get, `Emp.Loc.State` = `Emp.Loc.State`.toOption.get, `Emp.Loc.City` = `Emp.Loc.City`.toOption.get)) - else Left(List[Either[String, Any]](jobcandidateid, `Emp.StartDate`, `Emp.EndDate`, `Emp.OrgName`, `Emp.JobTitle`, `Emp.Responsibility`, `Emp.FunctionCategory`, `Emp.IndustryCategory`, `Emp.Loc.CountryRegion`, `Emp.Loc.State`, `Emp.Loc.City`).flatMap(_.left.toOption).mkString(", ")) + val EmpStartDate = jsonObj.get("Emp.StartDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) + val EmpEndDate = jsonObj.get("Emp.EndDate").fold[Either[String, Option[TypoLocalDate]]](Right(None))(_.as(JsonDecoder.option(TypoLocalDate.jsonDecoder))) + val EmpOrgName = jsonObj.get("Emp.OrgName").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpJobTitle = jsonObj.get("Emp.JobTitle").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpResponsibility = jsonObj.get("Emp.Responsibility").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpFunctionCategory = jsonObj.get("Emp.FunctionCategory").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpIndustryCategory = jsonObj.get("Emp.IndustryCategory").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpLocCountryRegion = jsonObj.get("Emp.Loc.CountryRegion").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpLocState = jsonObj.get("Emp.Loc.State").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + val EmpLocCity = jsonObj.get("Emp.Loc.City").fold[Either[String, Option[String]]](Right(None))(_.as(JsonDecoder.option(JsonDecoder.string))) + if (jobcandidateid.isRight && EmpStartDate.isRight && EmpEndDate.isRight && EmpOrgName.isRight && EmpJobTitle.isRight && EmpResponsibility.isRight && EmpFunctionCategory.isRight && EmpIndustryCategory.isRight && EmpLocCountryRegion.isRight && EmpLocState.isRight && EmpLocCity.isRight) + Right(VjobcandidateemploymentViewRow(jobcandidateid = jobcandidateid.toOption.get, EmpStartDate = EmpStartDate.toOption.get, EmpEndDate = EmpEndDate.toOption.get, EmpOrgName = EmpOrgName.toOption.get, EmpJobTitle = EmpJobTitle.toOption.get, EmpResponsibility = EmpResponsibility.toOption.get, EmpFunctionCategory = EmpFunctionCategory.toOption.get, EmpIndustryCategory = EmpIndustryCategory.toOption.get, EmpLocCountryRegion = EmpLocCountryRegion.toOption.get, EmpLocState = EmpLocState.toOption.get, EmpLocCity = EmpLocCity.toOption.get)) + else Left(List[Either[String, Any]](jobcandidateid, EmpStartDate, EmpEndDate, EmpOrgName, EmpJobTitle, EmpResponsibility, EmpFunctionCategory, EmpIndustryCategory, EmpLocCountryRegion, EmpLocState, EmpLocCity).flatMap(_.left.toOption).mkString(", ")) } implicit lazy val jsonEncoder: JsonEncoder[VjobcandidateemploymentViewRow] = new JsonEncoder[VjobcandidateemploymentViewRow] { override def unsafeEncode(a: VjobcandidateemploymentViewRow, indent: Option[Int], out: Write): Unit = { @@ -72,34 +72,34 @@ object VjobcandidateemploymentViewRow { JobcandidateId.jsonEncoder.unsafeEncode(a.jobcandidateid, indent, out) out.write(",") out.write(""""Emp.StartDate":""") - JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.`Emp.StartDate`, indent, out) + JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.EmpStartDate, indent, out) out.write(",") out.write(""""Emp.EndDate":""") - JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.`Emp.EndDate`, indent, out) + JsonEncoder.option(TypoLocalDate.jsonEncoder).unsafeEncode(a.EmpEndDate, indent, out) out.write(",") out.write(""""Emp.OrgName":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.OrgName`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpOrgName, indent, out) out.write(",") out.write(""""Emp.JobTitle":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.JobTitle`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpJobTitle, indent, out) out.write(",") out.write(""""Emp.Responsibility":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.Responsibility`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpResponsibility, indent, out) out.write(",") out.write(""""Emp.FunctionCategory":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.FunctionCategory`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpFunctionCategory, indent, out) out.write(",") out.write(""""Emp.IndustryCategory":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.IndustryCategory`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpIndustryCategory, indent, out) out.write(",") out.write(""""Emp.Loc.CountryRegion":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.Loc.CountryRegion`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpLocCountryRegion, indent, out) out.write(",") out.write(""""Emp.Loc.State":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.Loc.State`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpLocState, indent, out) out.write(",") out.write(""""Emp.Loc.City":""") - JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.`Emp.Loc.City`, indent, out) + JsonEncoder.option(JsonEncoder.string).unsafeEncode(a.EmpLocCity, indent, out) out.write("}") } } diff --git a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala index 21af2c6559..249a29af29 100644 --- a/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala +++ b/typo-tester-zio-jdbc/generated-and-checked-in/adventureworks/humanresources/vjobcandidateemployment/VjobcandidateemploymentViewStructure.scala @@ -19,19 +19,19 @@ class VjobcandidateemploymentViewStructure[Row](val prefix: Option[String], val with VjobcandidateemploymentViewFields[Row] { outer => override val jobcandidateid = new Field[JobcandidateId, Row](prefix, "jobcandidateid", None, None)(x => extract(x).jobcandidateid, (row, value) => merge(row, extract(row).copy(jobcandidateid = value))) - override val `Emp.StartDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).`Emp.StartDate`, (row, value) => merge(row, extract(row).copy(`Emp.StartDate` = value))) - override val `Emp.EndDate` = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).`Emp.EndDate`, (row, value) => merge(row, extract(row).copy(`Emp.EndDate` = value))) - override val `Emp.OrgName` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).`Emp.OrgName`, (row, value) => merge(row, extract(row).copy(`Emp.OrgName` = value))) - override val `Emp.JobTitle` = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).`Emp.JobTitle`, (row, value) => merge(row, extract(row).copy(`Emp.JobTitle` = value))) - override val `Emp.Responsibility` = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).`Emp.Responsibility`, (row, value) => merge(row, extract(row).copy(`Emp.Responsibility` = value))) - override val `Emp.FunctionCategory` = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).`Emp.FunctionCategory`, (row, value) => merge(row, extract(row).copy(`Emp.FunctionCategory` = value))) - override val `Emp.IndustryCategory` = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).`Emp.IndustryCategory`, (row, value) => merge(row, extract(row).copy(`Emp.IndustryCategory` = value))) - override val `Emp.Loc.CountryRegion` = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).`Emp.Loc.CountryRegion`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.CountryRegion` = value))) - override val `Emp.Loc.State` = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).`Emp.Loc.State`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.State` = value))) - override val `Emp.Loc.City` = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).`Emp.Loc.City`, (row, value) => merge(row, extract(row).copy(`Emp.Loc.City` = value))) + override val EmpStartDate = new OptField[TypoLocalDate, Row](prefix, "Emp.StartDate", Some("text"), None)(x => extract(x).EmpStartDate, (row, value) => merge(row, extract(row).copy(EmpStartDate = value))) + override val EmpEndDate = new OptField[TypoLocalDate, Row](prefix, "Emp.EndDate", Some("text"), None)(x => extract(x).EmpEndDate, (row, value) => merge(row, extract(row).copy(EmpEndDate = value))) + override val EmpOrgName = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.OrgName", None, None)(x => extract(x).EmpOrgName, (row, value) => merge(row, extract(row).copy(EmpOrgName = value))) + override val EmpJobTitle = new OptField[/* max 100 chars */ String, Row](prefix, "Emp.JobTitle", None, None)(x => extract(x).EmpJobTitle, (row, value) => merge(row, extract(row).copy(EmpJobTitle = value))) + override val EmpResponsibility = new OptField[String, Row](prefix, "Emp.Responsibility", None, None)(x => extract(x).EmpResponsibility, (row, value) => merge(row, extract(row).copy(EmpResponsibility = value))) + override val EmpFunctionCategory = new OptField[String, Row](prefix, "Emp.FunctionCategory", None, None)(x => extract(x).EmpFunctionCategory, (row, value) => merge(row, extract(row).copy(EmpFunctionCategory = value))) + override val EmpIndustryCategory = new OptField[String, Row](prefix, "Emp.IndustryCategory", None, None)(x => extract(x).EmpIndustryCategory, (row, value) => merge(row, extract(row).copy(EmpIndustryCategory = value))) + override val EmpLocCountryRegion = new OptField[String, Row](prefix, "Emp.Loc.CountryRegion", None, None)(x => extract(x).EmpLocCountryRegion, (row, value) => merge(row, extract(row).copy(EmpLocCountryRegion = value))) + override val EmpLocState = new OptField[String, Row](prefix, "Emp.Loc.State", None, None)(x => extract(x).EmpLocState, (row, value) => merge(row, extract(row).copy(EmpLocState = value))) + override val EmpLocCity = new OptField[String, Row](prefix, "Emp.Loc.City", None, None)(x => extract(x).EmpLocCity, (row, value) => merge(row, extract(row).copy(EmpLocCity = value))) override val columns: List[FieldLikeNoHkt[?, Row]] = - List[FieldLikeNoHkt[?, Row]](jobcandidateid, `Emp.StartDate`, `Emp.EndDate`, `Emp.OrgName`, `Emp.JobTitle`, `Emp.Responsibility`, `Emp.FunctionCategory`, `Emp.IndustryCategory`, `Emp.Loc.CountryRegion`, `Emp.Loc.State`, `Emp.Loc.City`) + List[FieldLikeNoHkt[?, Row]](jobcandidateid, EmpStartDate, EmpEndDate, EmpOrgName, EmpJobTitle, EmpResponsibility, EmpFunctionCategory, EmpIndustryCategory, EmpLocCountryRegion, EmpLocState, EmpLocCity) override def copy[NewRow](prefix: Option[String], extract: NewRow => VjobcandidateemploymentViewRow, merge: (NewRow, VjobcandidateemploymentViewRow) => NewRow): VjobcandidateemploymentViewStructure[NewRow] = new VjobcandidateemploymentViewStructure(prefix, extract, merge) diff --git a/typo/src/scala/typo/Naming.scala b/typo/src/scala/typo/Naming.scala index ac231218ae..8181647bcd 100644 --- a/typo/src/scala/typo/Naming.scala +++ b/typo/src/scala/typo/Naming.scala @@ -4,17 +4,20 @@ class Naming(val pkg: sc.QIdent) { protected def fragments(source: Source): (sc.QIdent, String) = { def forRelPath(relPath: RelPath): (sc.QIdent, String) = ( - pkg / relPath.segments.init.map(sc.Ident.apply), + pkg / relPath.segments.init.map(pkgSafe), relPath.segments.last.replace(".sql", "") ) source match { case relation: Source.Relation => - (pkg / relation.name.schema.toList.map(sc.Ident.apply), relation.name.name) + (pkg / relation.name.schema.toList.map(pkgSafe), relation.name.name) case Source.SqlFile(relPath) => forRelPath(relPath) } } + // not enough, but covers a common case + def pkgSafe(str: String): sc.Ident = sc.Ident(str.replace('-', '_')) + def suffixFor(source: Source): String = source match { case Source.Table(_) => "" @@ -26,7 +29,7 @@ class Naming(val pkg: sc.QIdent) { protected def relation(source: Source, suffix: String): sc.QIdent = { val (init, name) = fragments(source) val suffix0 = suffixFor(source) - init / sc.Ident(name) / sc.Ident(Naming.titleCase(name)).appended(suffix0 + suffix) + init / pkgSafe(name) / sc.Ident(Naming.titleCase(name)).appended(suffix0 + suffix) } protected def tpe(name: db.RelationName, suffix: String): sc.QIdent = @@ -66,8 +69,13 @@ object Naming { def camelCaseIdent(strings: Array[String]): sc.Ident = sc.Ident(camelCase(strings)) + def splitOnSymbol(str: String): Array[String] = + str.split("[\\-_.]") + def camelCase(strings: Array[String]): String = - strings.zipWithIndex + strings + .flatMap(splitOnSymbol) + .zipWithIndex .map { case (s, 0) => s case (s, _) => s.capitalize @@ -81,5 +89,5 @@ object Naming { titleCase(name.split('_')) def titleCase(strings: Array[String]): String = - strings.map(_.capitalize).mkString("") + strings.flatMap(splitOnSymbol).map(_.capitalize).mkString("") }