ORA-00972: identifier is too long. Oracle 11g #654

JetBrains · Oct 12, 2019 · dc658ca · dc658ca
1 parent db06626
commit dc658ca
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/...sed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/api/IdentifierManagerApi.kt b/...sed-core/src/main/kotlin/org/jetbrains/exposed/sql/statements/api/IdentifierManagerApi.kt
@@ -16,13 +16,17 @@ abstract class IdentifierManagerApi {
     protected abstract fun dbKeywords() : List<String>
     val keywords by lazy { ANSI_SQL_2003_KEYWORDS + VENDORS_KEYWORDS[currentDialect.name].orEmpty() + dbKeywords() }
     protected abstract val extraNameCharacters : String
-    protected abstract val isOracle : Boolean
+    protected abstract val oracleVersion : OracleVersion
     protected abstract val maxColumnNameLength : Int
+
+    protected enum class OracleVersion { Oracle11g, `Oracle12+`, NonOracle }
+
     protected val identifierLengthLimit by lazy {
-        if (isOracle)
-            128
-        else
-            maxColumnNameLength.takeIf { it > 0 } ?: Int.MAX_VALUE
+        when(oracleVersion) {
+            OracleVersion.Oracle11g -> 30
+            OracleVersion.`Oracle12+` -> 128
+            else -> maxColumnNameLength.takeIf { it > 0 } ?: Int.MAX_VALUE
+        }
     }
 
     val checkedIdentities = object : LinkedHashMap<String, Boolean>(100) {
@@ -49,7 +53,7 @@ abstract class IdentifierManagerApi {
             supportsMixedIdentifiers -> false
             alreadyLower && isLowerCaseIdentifiers -> false
             alreadyUpper && isUpperCaseIdentifiers -> false
-            isOracle -> false
+            oracleVersion != OracleVersion.NonOracle -> false
             supportsMixedQuotedIdentifiers && (!alreadyLower && !alreadyUpper) -> true
             else -> false
         }
@@ -62,7 +66,7 @@ abstract class IdentifierManagerApi {
             alreadyQuoted && isUpperCaseQuotedIdentifiers -> identity.toUpperCase()
             alreadyQuoted && isLowerCaseQuotedIdentifiers -> identity.toLowerCase()
             supportsMixedIdentifiers -> identity
-            isOracle -> identity.toUpperCase()
+            oracleVersion != OracleVersion.NonOracle -> identity.toUpperCase()
             isUpperCaseIdentifiers -> identity.toUpperCase()
             isLowerCaseIdentifiers -> identity.toLowerCase()
             else -> identity

diff --git a/...d-jdbc/src/main/kotlin/org/jetbrains/exposed/sql/statements/jdbc/JdbcIdentifierManager.kt b/...d-jdbc/src/main/kotlin/org/jetbrains/exposed/sql/statements/jdbc/JdbcIdentifierManager.kt
@@ -14,6 +14,10 @@ internal class JdbcIdentifierManager(metadata: DatabaseMetaData) : IdentifierMan
     private val _keywords = metadata.sqlKeywords.split(',')
     override fun dbKeywords(): List<String> = _keywords
     override val extraNameCharacters = metadata.extraNameCharacters!!
-    override val isOracle = metadata.databaseProductName == "Oracle"
+    override val oracleVersion = when {
+        metadata.databaseProductName != "Oracle" -> OracleVersion.NonOracle
+        metadata.databaseMajorVersion <= 11 -> OracleVersion.Oracle11g
+        else -> OracleVersion.`Oracle12+`
+    }
     override val maxColumnNameLength: Int = metadata.maxColumnNameLength
 }