miland-db commented on code in PR #49427:
URL: https://github.com/apache/spark/pull/49427#discussion_r1938492021
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala:
##########
@@ -159,44 +159,173 @@ class AstBuilder extends DataTypeAstBuilder
script
}
+ private def assertSqlState(sqlState: String): Unit = {
+ val sqlStateRegex = "^[A-Za-z0-9]{5}$".r
+ if (sqlStateRegex.findFirstIn(sqlState).isEmpty
+ || sqlState.startsWith("00")
+ || sqlState.startsWith("01")
+ || sqlState.startsWith("XX")) {
+ throw SqlScriptingErrors.invalidSqlStateValue(CurrentOrigin.get,
sqlState)
+ }
+ }
+
+ private def visitConditionValueImpl(
+ ctx: ConditionValueContext,
+ handlerTriggers: ExceptionHandlerTriggers): Unit = {
+ // Current element is SQLSTATE.
+ Option(ctx.sqlStateValue())
+ .foreach { sqlStateValueContext =>
+ val sqlState = sqlStateValueContext.getText.replace("'", "")
+ assertSqlState(sqlState)
+ handlerTriggers.addUniqueSqlState(sqlState)
+ }
+
+ // Current element is condition.
+ Option(ctx.multipartIdentifier())
+ .foreach { conditionContext =>
+ val conditionNameParts = visitMultipartIdentifier(conditionContext)
+ val conditionNameString =
conditionNameParts.mkString(".").toUpperCase(Locale.ROOT)
Review Comment:
I will add `assertConditionName` check in
`visitDeclareConditionStatementImpl` to only allow A-B, digits and underscore.
Anyway, we check if the condition name in handler declaration is either user
defined or builtin condition name, so for user defined stuff it is ok to just
check it during condition declaration.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
