Navigation Menu

Skip to content

Commit

Permalink
Revert cd8cbea due to broken build.
Browse files Browse the repository at this point in the history 
That change is only applicable to macro-paradise but not to 2.10.0 /
2.10.1 targeted by master.
  • Loading branch information
@szeiger
szeiger committed Mar 27, 2013
1 parent adb4f57 commit bf45e42
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/main/scala/scala/slick/direct/SlickBackend.scala
View file
Expand Up @@ -343,12 +343,10 @@ class SlickBackend( val driver: JdbcDriver, mapper:Mapper ) extends QueryableBac

// Tuples
case Apply(
tupleApply,
Select(Select(Ident(package_), class_), method_),
components
)
if definitions.TupleClass
.map( _.companionSymbol.typeSignature.member(TermName("apply")) )
.contains( tupleApply.symbol )
if package_.decoded == "scala" && class_.decoded.startsWith("Tuple") && method_.decoded == "apply" // FIXME: match smarter than matching strings
=>
sq.ProductNode( components.map(s2sq(_).node) )

Expand Down

1 comment on commit bf45e42

@szeiger
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's a good reason for having a PR validator and for not committing to master.

@cvogt @amirsh We can cherry-pick the original fix back into topic/type-providers. Let's discuss the future of that branch at our next meeting since we should be targeting 2.10/2.11 with most features and only make the actual type macro implementation depend on macro-paradise.

Please sign in to comment.