Skip to content

Commit 11e2ca2

Browse files
committed
Made FMD properly see scala.math.BigDecimal as a BigDecimal when creating column definition
1 parent ea3c40d commit 11e2ca2

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/scala/org/squeryl/internals/FieldMetaData.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ class FieldMetaData(
168168
* the most appropriate column type
169169
*/
170170
def length: Int =
171-
if(columnAnnotation == None || columnAnnotation.get.length == -1)
171+
if(columnAnnotation == None || columnAnnotation.get.length == -1) {
172172
FieldMetaData.defaultFieldLength(wrappedFieldType, this)
173+
}
173174
else
174175
columnAnnotation.get.length
175176

@@ -545,10 +546,12 @@ object FieldMetaData {
545546
def defaultFieldLength(fieldType: Class[_], fmd: FieldMetaData) = {
546547
if(classOf[String].isAssignableFrom(fieldType))
547548
fmd.schema.defaultLengthOfString
548-
else if(classOf[BigDecimal].isAssignableFrom(fieldType))
549+
else if(classOf[java.math.BigDecimal].isAssignableFrom(fieldType) || classOf[scala.math.BigDecimal].isAssignableFrom(fieldType)) {
549550
fmd.schema.defaultSizeOfBigDecimal._1
550-
else
551+
}
552+
else {
551553
fmd.schema.fieldMapper.defaultColumnLength(fieldType)
554+
}
552555
}
553556

554557
def detectScalapOnClasspath(): Boolean = {

0 commit comments

Comments
 (0)