Skip to content

preserve annotations when calling toRecord on a Tuple: fixes #212 #213

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

Merged
merged 2 commits into from
Mar 1, 2022
Merged

preserve annotations when calling toRecord on a Tuple: fixes #212 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14d9c02
preserve annotations when calling toRecord on a Tuple: fixes #212
TobiasPfeifer Feb 27, 2022
762dde2
apply scalafixAll
TobiasPfeifer Mar 1, 2022
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
18 changes: 13 additions & 5 deletions tests/shared/src/test/scala/zio/schema/SchemaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package zio.schema

import scala.collection.immutable.ListMap

import zio.Chunk
import zio.schema.CaseSet._
import zio.test.Assertion._
import zio.test.{ ZSpec, _ }
Expand All @@ -17,26 +18,33 @@ object SchemaSpec extends DefaultRunnableSpec {
assert(Schema.chunk(schemaUnit))(equalTo(Schema.chunk(schemaUnit)))
},
test("tuple") {
assert(Schema.Tuple(schemaUnit, schemaUnit))(equalTo(Schema.Tuple(schemaUnit, schemaUnit)))
assert(Schema.Tuple(schemaUnit, schemaUnit))(equalTo(Schema.Tuple(schemaUnit, schemaUnit))) &&
assert(Schema.Tuple(schemaTransform, schemaTransform))(equalTo(Schema.Tuple(schemaTransform, schemaTransform)))
},
test("record") {
assert(schemaRecord("key"))(equalTo(schemaRecord("key")))
assert(schemaRecord("key"))(equalTo(schemaRecord("key"))) &&
assert(schemaRecord("key1"))(not(equalTo(schemaRecord("key2"))))
},
test("transform") {
assert(schemaTransform)(equalTo(schemaTransform))
assert(schemaTransform)(equalTo(schemaTransform)) &&
assert(schemaTransformMethod)(equalTo(schemaTransformMethod))
},
test("optional") {
assert(Schema.Optional(schemaUnit))(equalTo(Schema.Optional(schemaUnit)))
},
test("enumeration") {
assert(schemaEnum("key"))(equalTo(schemaEnum("key")))
assert(schemaEnum("key"))(equalTo(schemaEnum("key"))) &&
assert(schemaEnum("key1"))(not(equalTo(schemaEnum("key2"))))

}
)
),
test("Tuple.toRecord should preserve annotations") {
val left = Schema.primitive(StandardType.StringType)
val right = Schema.primitive(StandardType.StringType)
val tupleSchema = Schema.Tuple(left, right, Chunk("some Annotation"))
val record = tupleSchema.toRecord
assert(record.annotations)(hasFirst(equalTo("some Annotation")))
}
)

def schemaUnit: Schema[Unit] = Schema[Unit]
Expand Down
3 changes: 2 additions & 1 deletion zio-schema/shared/src/main/scala/zio/schema/Schema.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,8 @@ object Schema extends TupleSchemas with RecordSchemas with EnumSchemas with Sche
field2 = Field("_2", right),
construct = (a, b) => (a, b),
extractField1 = _._1,
extractField2 = _._2
extractField2 = _._2,
annotations
)

override def defaultValue: Either[String, (A, B)] =
Expand Down