Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve naming #80

Merged
merged 3 commits into from
Dec 31, 2023
+556 −538
Merged

Improve naming #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e377bf
naming: split on '-' and '_'
oyvindberg Dec 31, 2023
fea10dc
naming: replace '-' with '_' in package names
oyvindberg Dec 31, 2023
2a91901
naming: also split names on '.'
oyvindberg Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions tests/src/scala/typo/NamingTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"))
}
}
20 changes: 10 additions & 10 deletions ...-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewFields.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
80 changes: 40 additions & 40 deletions ...ted-and-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewRow.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] */
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
22 changes: 11 additions & 11 deletions ...d-checked-in/adventureworks/humanresources/vjobcandidate/VjobcandidateViewStructure.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 12 additions & 12 deletions ...ventureworks/humanresources/vjobcandidateeducation/VjobcandidateeducationViewFields.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Loading