#300 Varchar doesn't validate length / Validate length only before ex…

…ecute update
JetBrains · Aug 9, 2018 · 2e2f5de · 2e2f5de
1 parent bb113df
commit 2e2f5de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/main/kotlin/org/jetbrains/exposed/sql/ColumnType.kt b/src/main/kotlin/org/jetbrains/exposed/sql/ColumnType.kt
@@ -226,14 +226,6 @@ open class VarCharColumnType(val colLength: Int = 255, collate: String? = null)
             append(" COLLATE $collate")
         }
     }
-
-    override fun notNullValueToDB(value: Any): Any {
-        val string = super.notNullValueToDB(value)
-        require(string is String && string.length <= colLength) {
-            "Value '$string' can't be stored to database column because exceeds length $colLength"
-        }
-        return string
-    }
 }
 
 open class TextColumnType(collate: String? = null) : StringColumnType(collate) {

diff --git a/src/main/kotlin/org/jetbrains/exposed/sql/statements/UpdateBuilder.kt b/src/main/kotlin/org/jetbrains/exposed/sql/statements/UpdateBuilder.kt
@@ -3,6 +3,7 @@ package org.jetbrains.exposed.sql.statements
 import org.jetbrains.exposed.sql.Column
 import org.jetbrains.exposed.sql.Expression
 import org.jetbrains.exposed.sql.Table
+import org.jetbrains.exposed.sql.VarCharColumnType
 import java.util.*
 
 /**
@@ -19,6 +20,9 @@ abstract class UpdateBuilder<out T>(type: StatementType, targets: List<Table>):
         if (!column.columnType.nullable && value == null) {
             error("Trying to set null to not nullable column $column")
         }
+        if (column.columnType is VarCharColumnType && value is String && value.length > column.columnType.colLength) {
+            error("Value '$value' can't be stored to database column because exceeds length $column.columnType.colLength")
+        }
         values[column] = value
     }