From 6dc60108716bc2aaa1c3be6aeae06b0973524328 Mon Sep 17 00:00:00 2001
From: Stewart Stewart <stewinsalot@gmail.com>
Date: Tue, 28 Feb 2017 09:53:09 -0800
Subject: fix primary key filter in mapper generator

---
 src/main/scala/TypedIdTable.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/TypedIdTable.scala b/src/main/scala/TypedIdTable.scala
index 81a6dcf..08b2b28 100644
--- a/src/main/scala/TypedIdTable.scala
+++ b/src/main/scala/TypedIdTable.scala
@@ -56,8 +56,12 @@ class TypedIdSourceCodeGenerator(
     def PrimaryKeyMapper = new PrimaryKeyMapper { }
 
     class PrimaryKeyMapperDef extends TermDef {
-      def primaryKeyColumn: Option[Column] = table.primaryKey.filter(_.columns.length == 1).flatMap(_.columns.headOption)
-
+      def primaryKeyColumn: Option[Column] = {
+        table.model.columns
+          .filter(_.options.contains(slick.ast.ColumnOption.PrimaryKey))
+          .headOption.map(c => table.columnsByName(c.name))
+      }
+        
       override def enabled = primaryKeyColumn.isDefined
 
       override def doc = s"Implicit for mapping primary key of ${tableName} to a base column"
-- 
cgit v1.2.3