Fix `getOrElse` type inference issue in Scala 3, closes #2761 #2803

OlegYch · 2023-08-21T18:18:02Z

Note: I have no idea what Unconst is doing but this fixes the issue

nafg · 2023-08-21T23:19:03Z

I'm confused, I thought it's fixed in M4?

nafg · 2023-08-21T23:20:08Z

I don't either know offhand exactly what Unconst is for, but with this change its name is no longer accurate.

github-actions · 2023-08-21T23:24:20Z

Incompatible changes

slick

3 changes since 3.5.0-pre.56.04ce9b09

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

OlegYch · 2023-08-22T11:26:47Z

@nafg #2761 is actually a problem caused by fix to #2674

the change actually aligns scala3 implementation with scala2

slick/slick/src/main/scala-2/slick/lifted/ShapedValue.scala

Line 96 in 503c6c9

type Unconst[P, P2] = P

so i think the name is still accurate

perhaps @szeiger can shed some light on it

OlegYch · 2023-08-22T11:31:54Z

oh, i get it, Unconst means that it removed ConstColumn ...

github-actions · 2023-08-22T18:26:55Z

Incompatible changes

slick

3 changes since 3.5.0-pre.62.ed0ba56a

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

github-actions · 2023-08-29T14:55:28Z

Incompatible changes

slick

3 changes since 3.5.0-pre.66.a3e77c60

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

nafg · 2023-08-30T10:16:27Z

With the new definition of Unconst it seems pointless. Is it really needed?

nafg · 2023-08-30T10:17:47Z

or maybe scala 2 should keep type Unconst[P, P2] = P and scala 3 essentially gets type Unconst[P, P2] = P2 ?

nafg · 2023-08-30T10:20:47Z

Unconst is only used in getOrElse, where it says

 def getOrElse[M, P2 <: P](default: M)(implicit shape: Shape[FlatShapeLevel, M, ?, P2], ol: OptionLift[P2, O]): ShapedValue.Unconst[P, P2] = {
    // P2 != P can only happen if M contains plain values, which pack to ConstColumn instead of Rep.
    // Both have the same packedShape (RepShape), so we can safely cast here:
    val r = fold[P, P](shape.pack(default): P)(identity)(shape.packedShape.asInstanceOf[Shape[FlatShapeLevel, P, ?, P]])
    r.asInstanceOf[ShapedValue.Unconst[P, P2]]
  }

I don't understand the comment.

Also since that's the only place it's used I don't know why it's in ShapedValue.

nafg · 2023-08-30T10:28:35Z

I mean if you always return P then get rid of Unconst and just do r.asInstanceOf[P] over there. In fact it shouldn't even need a cast since r is what's returned from fold[P, P] which is def fold[B, BP]/* ... */: BP

nafg · 2023-08-30T10:32:23Z

You could go for the full implication of this change. But have you tried other ways, like adding other match cases or something?

Also what happens if you keep your change but don't change the P2s to P?

Also what happens if scala 2 would use P2?

OlegYch · 2023-08-30T10:46:01Z

type Unconst[P, P2] = P2 on scala2 breaks #2674
type Unconst[P, P2] = P match { case Rep[t] => Rep[t] case _ => P } and type Unconst[P, P2] = P2 match { case Rep[t] => Rep[t] case _ => P2 } behave the same on scala3

OlegYch · 2023-08-30T10:51:53Z

in fact removing P2 entirely seems to be harmless

github-actions · 2023-08-30T11:12:44Z

Incompatible changes

slick

3 changes since 3.5.0-pre.68.610c46f8

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

github-actions · 2023-09-06T14:03:06Z

Incompatible changes

slick

3 changes since 3.5.0-pre.76.da631720

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

OlegYch · 2023-09-06T14:59:13Z

@nafg i did some cleanup, and think it is ready to be merged

github-actions · 2023-10-24T17:20:59Z

Incompatible changes

slick

3 changes since 3.5.0-pre.110.88b2ffb1

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

nafg

Sorry for the delay, I probably had feedback that I don't recall but I want to do another milestone release so let's just get it in

github-actions · 2023-11-20T22:13:18Z

Incompatible changes

slick

3 changes since 3.5.0-pre.118.137bf069

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

github-actions · 2023-11-20T23:02:00Z

Incompatible changes

slick

3 changes since 3.5.0-pre.122.6896ef03

Code changes

Incompatibility	Symbol	Problem
Backward	`slick.compat.collection.package`	MissingClassProblem class slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$`	MissingClassProblem object slick.compat.collection.package does not have a correspondent in current version
Backward	`slick.compat.collection.package$JavaConverters$`	MissingClassProblem object slick.compat.collection.package#JavaConverters does not have a correspondent in current version

OlegYch mentioned this pull request Aug 21, 2023

Add test for #2674 #2802

Closed

nafg force-pushed the fix-2761 branch from 4e260c8 to 9ac850b Compare August 21, 2023 23:19

nafg force-pushed the fix-2761 branch from 9ac850b to 4a84bb5 Compare August 22, 2023 18:22

OlegYch force-pushed the fix-2761 branch from 4a84bb5 to 37f0b19 Compare August 29, 2023 14:47

OlegYch force-pushed the fix-2761 branch from 37f0b19 to 0a174ed Compare August 30, 2023 11:04

OlegYch force-pushed the fix-2761 branch from 0a174ed to 74cb9b4 Compare September 6, 2023 13:54

nafg linked an issue Nov 20, 2023 that may be closed by this pull request

getOrElse type inference issue in Scala 3 #2761

Closed

nafg approved these changes Nov 20, 2023

View reviewed changes

nafg force-pushed the fix-2761 branch from d4f8831 to 8ceaeee Compare November 20, 2023 22:08

Fix getOrElse type inference issue in Scala 3, closes slick#2761

3a8fa6f

nafg force-pushed the fix-2761 branch from 8ceaeee to 3a8fa6f Compare November 20, 2023 22:57

mergify bot merged commit d56bca8 into slick:main Nov 20, 2023
14 checks passed

nafg added the improvement label Nov 21, 2023

nafg added this to the 3.5.0 milestone Feb 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix `getOrElse` type inference issue in Scala 3, closes #2761 #2803

Fix `getOrElse` type inference issue in Scala 3, closes #2761 #2803

OlegYch commented Aug 21, 2023

nafg commented Aug 21, 2023

nafg commented Aug 21, 2023

github-actions bot commented Aug 21, 2023

OlegYch commented Aug 22, 2023

OlegYch commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

github-actions bot commented Aug 29, 2023

nafg commented Aug 30, 2023

nafg commented Aug 30, 2023

nafg commented Aug 30, 2023 •

edited

Loading

nafg commented Aug 30, 2023 •

edited

Loading

nafg commented Aug 30, 2023

OlegYch commented Aug 30, 2023

OlegYch commented Aug 30, 2023

github-actions bot commented Aug 30, 2023

github-actions bot commented Sep 6, 2023

OlegYch commented Sep 6, 2023

github-actions bot commented Oct 24, 2023

nafg left a comment

github-actions bot commented Nov 20, 2023

github-actions bot commented Nov 20, 2023

Fix getOrElse type inference issue in Scala 3, closes #2761 #2803

Fix getOrElse type inference issue in Scala 3, closes #2761 #2803

Conversation

OlegYch commented Aug 21, 2023

nafg commented Aug 21, 2023

nafg commented Aug 21, 2023

github-actions bot commented Aug 21, 2023

Incompatible changes

slick

Code changes

OlegYch commented Aug 22, 2023

OlegYch commented Aug 22, 2023

github-actions bot commented Aug 22, 2023

Incompatible changes

slick

Code changes

github-actions bot commented Aug 29, 2023

Incompatible changes

slick

Code changes

nafg commented Aug 30, 2023

nafg commented Aug 30, 2023

nafg commented Aug 30, 2023 • edited Loading

nafg commented Aug 30, 2023 • edited Loading

nafg commented Aug 30, 2023

OlegYch commented Aug 30, 2023

OlegYch commented Aug 30, 2023

github-actions bot commented Aug 30, 2023

Incompatible changes

slick

Code changes

github-actions bot commented Sep 6, 2023

Incompatible changes

slick

Code changes

OlegYch commented Sep 6, 2023

github-actions bot commented Oct 24, 2023

Incompatible changes

slick

Code changes

nafg left a comment

Choose a reason for hiding this comment

github-actions bot commented Nov 20, 2023

Incompatible changes

slick

Code changes

github-actions bot commented Nov 20, 2023

Incompatible changes

slick

Code changes

Fix `getOrElse` type inference issue in Scala 3, closes #2761 #2803

Fix `getOrElse` type inference issue in Scala 3, closes #2761 #2803

nafg commented Aug 30, 2023 •

edited

Loading

nafg commented Aug 30, 2023 •

edited

Loading