Squeryl-Record now used the precision and scale defined within (Optio…

…nal)DecimalField.
dotoree · Oct 5, 2011 · 7d6325f · 7d6325f
1 parent a499905
commit 7d6325f
Show file tree

Hide file tree

Showing 3 changed files with 167 additions and 132 deletions.
diff --git a/...tence/squeryl-record/src/main/scala/net/liftweb/squerylrecord/RecordMetaDataFactory.scala b/...tence/squeryl-record/src/main/scala/net/liftweb/squerylrecord/RecordMetaDataFactory.scala
@@ -91,11 +91,6 @@ class RecordMetaDataFactory extends FieldMetaDataFactory {
       case _ => error("Unsupported field type. Consider implementing " +
 		      "SquerylRecordField for defining the persistent class." +
 		      "Field: " + metaField)
-    } 
-
-    val overrideColLength = metaField match {
-      case (stringTypedField: StringTypedField) => Some(stringTypedField.maxLength)
-      case _ => None
     }
 
     new FieldMetaData(
@@ -112,7 +107,39 @@ class RecordMetaDataFactory extends FieldMetaDataFactory {
       isOptimisticCounter,
       metaField) {
 
-      override def length = overrideColLength getOrElse super.length
+      override def length = {
+        import java.math.MathContext
+        val fieldLength =
+          metaField match {
+        	  case (stringTypedField: StringTypedField) => Some(stringTypedField.maxLength)
+        	  case decimalField: DecimalField[_] => {
+        	    val precision = decimalField.context.getPrecision();
+        	    if(precision != 0)
+        	      Some(precision)
+        	    else
+        	      None
+        	  }
+        	  case decimalField: OptionalDecimalField[_] => {
+        	    val precision = decimalField.context.getPrecision();
+        	    if(precision != 0)
+        	      Some(precision)
+        	    else
+        	      None
+        	  }
+        	  case _ => None
+        }
+        fieldLength getOrElse super.length
+      }
+
+      override def scale = {
+        val fieldScale = 
+          metaField match {
+        	  case decimalField: DecimalField[_] => Some(decimalField.scale)
+        	  case decimalField: OptionalDecimalField[_] => Some(decimalField.scale)
+        	  case _ => None
+        } 
+        fieldScale getOrElse super.scale
+      }
 
       private def fieldFor(o: AnyRef) = getter.get.invoke(o).asInstanceOf[TypedField[AnyRef]]
 

diff --git a/persistence/squeryl-record/src/test/scala/net/liftweb/squerylrecord/Fixtures.scala b/persistence/squeryl-record/src/test/scala/net/liftweb/squerylrecord/Fixtures.scala
@@ -76,6 +76,7 @@ class Company private () extends Record[Company] with KeyedRecord[Long] with Opt
   val country = new CountryField(this)
   val postCode = new PostalCodeField(this, country)
   val created = new DateTimeField(this)
+  val employeeSatisfaction = new OptionalDecimalField(this, new MathContext(10), 5)
 
   lazy val employees = MySchema.companyToEmployees.left(this)