diff --git a/go/vt/sqlparser/sql.go b/go/vt/sqlparser/sql.go index 1ee805a2bb4..26659d7e5b1 100644 --- a/go/vt/sqlparser/sql.go +++ b/go/vt/sqlparser/sql.go @@ -7660,11 +7660,7 @@ var yyPgo = [...]int{ 0, 1001, 125, 2565, 206, } -<<<<<<< HEAD -//line sql.y:8454 -======= -//line sql.y:8644 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8455 type yySymType struct { union any empty struct{} @@ -18085,22 +18081,14 @@ yydefault: } case 1089: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:5619 -======= -//line sql.y:5652 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5620 { yyVAL.identifierCI = yyDollar[1].identifierCI } case 1090: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL *WindowSpecification -<<<<<<< HEAD -//line sql.y:5625 -======= -//line sql.y:5658 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5626 { yyLOCAL = &WindowSpecification{Name: yyDollar[1].identifierCI, PartitionClause: yyDollar[2].exprsUnion(), OrderClause: yyDollar[3].orderByUnion(), FrameClause: yyDollar[4].frameClauseUnion()} } @@ -18108,11 +18096,7 @@ yydefault: case 1091: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL *OverClause -<<<<<<< HEAD -//line sql.y:5631 -======= -//line sql.y:5664 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5632 { yyLOCAL = &OverClause{WindowSpec: yyDollar[3].windowSpecificationUnion()} } @@ -18120,57 +18104,23 @@ yydefault: case 1092: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *OverClause -<<<<<<< HEAD -//line sql.y:5635 -======= -//line sql.y:5668 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5636 { yyLOCAL = &OverClause{WindowName: yyDollar[2].identifierCI} } yyVAL.union = yyLOCAL -<<<<<<< HEAD case 1093: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL *NullTreatmentClause -//line sql.y:5640 -======= - case 1098: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL *OverClause -//line sql.y:5674 - { - yyLOCAL = yyDollar[1].overClauseUnion() - } - yyVAL.union = yyLOCAL - case 1099: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *OverClause -//line sql.y:5678 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5641 { yyLOCAL = nil } yyVAL.union = yyLOCAL -<<<<<<< HEAD case 1095: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *NullTreatmentClause -//line sql.y:5647 -======= - case 1100: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *NullTreatmentClause -//line sql.y:5684 - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL - case 1102: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL *NullTreatmentClause -//line sql.y:5691 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5648 { yyLOCAL = &NullTreatmentClause{yyDollar[1].nullTreatmentTypeUnion()} } @@ -18178,11 +18128,7 @@ yydefault: case 1096: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL NullTreatmentType -<<<<<<< HEAD -//line sql.y:5653 -======= -//line sql.y:5697 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5654 { yyLOCAL = RespectNullsType } @@ -18190,11 +18136,7 @@ yydefault: case 1097: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL NullTreatmentType -<<<<<<< HEAD -//line sql.y:5657 -======= -//line sql.y:5701 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5658 { yyLOCAL = IgnoreNullsType } @@ -18202,11 +18144,7 @@ yydefault: case 1098: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL FirstOrLastValueExprType -<<<<<<< HEAD -//line sql.y:5663 -======= -//line sql.y:5707 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5664 { yyLOCAL = FirstValueExprType } @@ -18214,11 +18152,7 @@ yydefault: case 1099: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL FirstOrLastValueExprType -<<<<<<< HEAD -//line sql.y:5667 -======= -//line sql.y:5711 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5668 { yyLOCAL = LastValueExprType } @@ -18226,11 +18160,7 @@ yydefault: case 1100: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL FromFirstLastType -<<<<<<< HEAD -//line sql.y:5673 -======= -//line sql.y:5717 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5674 { yyLOCAL = FromFirstType } @@ -18238,11 +18168,7 @@ yydefault: case 1101: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL FromFirstLastType -<<<<<<< HEAD -//line sql.y:5677 -======= -//line sql.y:5721 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5678 { yyLOCAL = FromLastType } @@ -18250,11 +18176,7 @@ yydefault: case 1102: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL *FromFirstLastClause -<<<<<<< HEAD -//line sql.y:5682 -======= -//line sql.y:5726 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5683 { yyLOCAL = nil } @@ -18262,11 +18184,7 @@ yydefault: case 1104: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *FromFirstLastClause -<<<<<<< HEAD -//line sql.y:5689 -======= -//line sql.y:5733 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5690 { yyLOCAL = &FromFirstLastClause{yyDollar[1].fromFirstLastTypeUnion()} } @@ -18274,11 +18192,7 @@ yydefault: case 1105: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL LagLeadExprType -<<<<<<< HEAD -//line sql.y:5695 -======= -//line sql.y:5739 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5696 { yyLOCAL = LagExprType } @@ -18286,11 +18200,7 @@ yydefault: case 1106: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL LagLeadExprType -<<<<<<< HEAD -//line sql.y:5699 -======= -//line sql.y:5743 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5700 { yyLOCAL = LeadExprType } @@ -18298,11 +18208,7 @@ yydefault: case 1107: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL *WindowDefinition -<<<<<<< HEAD -//line sql.y:5705 -======= -//line sql.y:5749 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5706 { yyLOCAL = &WindowDefinition{Name: yyDollar[1].identifierCI, WindowSpec: yyDollar[4].windowSpecificationUnion()} } @@ -18310,54 +18216,34 @@ yydefault: case 1108: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL WindowDefinitions -<<<<<<< HEAD -//line sql.y:5711 -======= -//line sql.y:5755 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5712 { yyLOCAL = WindowDefinitions{yyDollar[1].windowDefinitionUnion()} } yyVAL.union = yyLOCAL case 1109: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:5715 -======= -//line sql.y:5759 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5716 { yySLICE := (*WindowDefinitions)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].windowDefinitionUnion()) } case 1110: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:5721 -======= -//line sql.y:5765 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5722 { yyVAL.str = "" } case 1111: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:5725 -======= -//line sql.y:5769 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5726 { yyVAL.str = string(yyDollar[2].identifierCI.String()) } case 1112: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL BoolVal -<<<<<<< HEAD -//line sql.y:5731 -======= -//line sql.y:5775 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5732 { yyLOCAL = BoolVal(true) } @@ -18365,11 +18251,7 @@ yydefault: case 1113: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL BoolVal -<<<<<<< HEAD -//line sql.y:5735 -======= -//line sql.y:5779 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5736 { yyLOCAL = BoolVal(false) } @@ -18377,11 +18259,7 @@ yydefault: case 1114: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IsExprOperator -<<<<<<< HEAD -//line sql.y:5742 -======= -//line sql.y:5786 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5743 { yyLOCAL = IsTrueOp } @@ -18389,11 +18267,7 @@ yydefault: case 1115: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL IsExprOperator -<<<<<<< HEAD -//line sql.y:5746 -======= -//line sql.y:5790 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5747 { yyLOCAL = IsNotTrueOp } @@ -18401,11 +18275,7 @@ yydefault: case 1116: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IsExprOperator -<<<<<<< HEAD -//line sql.y:5750 -======= -//line sql.y:5794 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5751 { yyLOCAL = IsFalseOp } @@ -18413,11 +18283,7 @@ yydefault: case 1117: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL IsExprOperator -<<<<<<< HEAD -//line sql.y:5754 -======= -//line sql.y:5798 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5755 { yyLOCAL = IsNotFalseOp } @@ -18425,11 +18291,7 @@ yydefault: case 1118: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5760 -======= -//line sql.y:5804 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5761 { yyLOCAL = EqualOp } @@ -18437,11 +18299,7 @@ yydefault: case 1119: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5764 -======= -//line sql.y:5808 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5765 { yyLOCAL = LessThanOp } @@ -18449,11 +18307,7 @@ yydefault: case 1120: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5768 -======= -//line sql.y:5812 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5769 { yyLOCAL = GreaterThanOp } @@ -18461,11 +18315,7 @@ yydefault: case 1121: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5772 -======= -//line sql.y:5816 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5773 { yyLOCAL = LessEqualOp } @@ -18473,11 +18323,7 @@ yydefault: case 1122: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5776 -======= -//line sql.y:5820 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5777 { yyLOCAL = GreaterEqualOp } @@ -18485,11 +18331,7 @@ yydefault: case 1123: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5780 -======= -//line sql.y:5824 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5781 { yyLOCAL = NotEqualOp } @@ -18497,11 +18339,7 @@ yydefault: case 1124: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ComparisonExprOperator -<<<<<<< HEAD -//line sql.y:5784 -======= -//line sql.y:5828 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5785 { yyLOCAL = NullSafeEqualOp } @@ -18509,11 +18347,7 @@ yydefault: case 1125: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ColTuple -<<<<<<< HEAD -//line sql.y:5790 -======= -//line sql.y:5834 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5791 { yyLOCAL = yyDollar[1].valTupleUnion() } @@ -18521,11 +18355,7 @@ yydefault: case 1126: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ColTuple -<<<<<<< HEAD -//line sql.y:5794 -======= -//line sql.y:5838 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5795 { yyLOCAL = yyDollar[1].subqueryUnion() } @@ -18533,11 +18363,7 @@ yydefault: case 1127: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ColTuple -<<<<<<< HEAD -//line sql.y:5798 -======= -//line sql.y:5842 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5799 { yyLOCAL = ListArg(yyDollar[1].str[2:]) markBindVariable(yylex, yyDollar[1].str[2:]) @@ -18546,11 +18372,7 @@ yydefault: case 1128: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *Subquery -<<<<<<< HEAD -//line sql.y:5805 -======= -//line sql.y:5849 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5806 { yyLOCAL = &Subquery{yyDollar[1].selStmtUnion()} } @@ -18558,22 +18380,14 @@ yydefault: case 1129: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Exprs -<<<<<<< HEAD -//line sql.y:5811 -======= -//line sql.y:5855 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5812 { yyLOCAL = Exprs{yyDollar[1].exprUnion()} } yyVAL.union = yyLOCAL case 1130: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:5815 -======= -//line sql.y:5859 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5816 { yySLICE := (*Exprs)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].exprUnion()) @@ -18581,11 +18395,7 @@ yydefault: case 1131: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5825 -======= -//line sql.y:5869 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5826 { yyLOCAL = &FuncExpr{Name: yyDollar[1].identifierCI, Exprs: yyDollar[3].selectExprsUnion()} } @@ -18593,7 +18403,7 @@ yydefault: case 1132: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:5829 +//line sql.y:5830 { yyLOCAL = &FuncExpr{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCI, Exprs: yyDollar[5].selectExprsUnion()} } @@ -18601,7 +18411,7 @@ yydefault: case 1133: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:5839 +//line sql.y:5840 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].selectExprsUnion()} } @@ -18609,7 +18419,7 @@ yydefault: case 1134: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:5843 +//line sql.y:5844 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].selectExprsUnion()} } @@ -18617,7 +18427,7 @@ yydefault: case 1135: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:5847 +//line sql.y:5848 { yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()} } @@ -18625,7 +18435,7 @@ yydefault: case 1136: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:5851 +//line sql.y:5852 { yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()} } @@ -18633,7 +18443,7 @@ yydefault: case 1137: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:5855 +//line sql.y:5856 { yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()} } @@ -18641,7 +18451,7 @@ yydefault: case 1138: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:5859 +//line sql.y:5860 { yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()} } @@ -18649,11 +18459,7 @@ yydefault: case 1139: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5863 -======= -//line sql.y:5873 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5864 { yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()} } @@ -18661,75 +18467,7 @@ yydefault: case 1140: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5867 -======= -//line sql.y:5883 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("left"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1141: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:5887 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("right"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1142: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:5891 - { - yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1143: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:5895 - { - yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1144: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:5899 - { - yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1145: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:5903 - { - yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion(), To: yyDollar[7].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1146: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:5907 - { - yyLOCAL = &SubstrExpr{Name: yyDollar[3].exprUnion(), From: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1147: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL Expr -//line sql.y:5911 - { - yyLOCAL = &CaseExpr{Expr: yyDollar[2].exprUnion(), Whens: yyDollar[3].whensUnion(), Else: yyDollar[4].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1148: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:5915 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5868 { yyLOCAL = &ValuesFuncExpr{Name: yyDollar[3].colNameUnion()} } @@ -18737,11 +18475,7 @@ yydefault: case 1141: yyDollar = yyS[yypt-10 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5871 -======= -//line sql.y:5919 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5872 { yyLOCAL = &InsertExpr{Str: yyDollar[3].exprUnion(), Pos: yyDollar[5].exprUnion(), Len: yyDollar[7].exprUnion(), NewStr: yyDollar[9].exprUnion()} } @@ -18749,11 +18483,7 @@ yydefault: case 1142: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5875 -======= -//line sql.y:5923 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5876 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI(yyDollar[1].str)} } @@ -18761,11 +18491,7 @@ yydefault: case 1143: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5886 -======= -//line sql.y:5934 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5887 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI("utc_date")} } @@ -18773,11 +18499,7 @@ yydefault: case 1144: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5890 -======= -//line sql.y:5938 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5891 { yyLOCAL = yyDollar[1].exprUnion() } @@ -18785,11 +18507,7 @@ yydefault: case 1145: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5896 -======= -//line sql.y:5944 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5897 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI("current_date")} } @@ -18797,11 +18515,7 @@ yydefault: case 1146: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5900 -======= -//line sql.y:5948 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5901 { yyLOCAL = &FuncExpr{Name: NewIdentifierCI("curdate")} } @@ -18809,11 +18523,7 @@ yydefault: case 1147: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5904 -======= -//line sql.y:5952 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5905 { yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("utc_time"), Fsp: yyDollar[2].exprUnion()} } @@ -18821,7 +18531,7 @@ yydefault: case 1148: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -//line sql.y:5909 +//line sql.y:5910 { yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("curtime"), Fsp: yyDollar[2].exprUnion()} } @@ -18829,7 +18539,7 @@ yydefault: case 1149: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -//line sql.y:5914 +//line sql.y:5915 { yyLOCAL = &CurTimeFuncExpr{Name: NewIdentifierCI("current_time"), Fsp: yyDollar[2].exprUnion()} } @@ -18837,7 +18547,7 @@ yydefault: case 1150: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:5918 +//line sql.y:5919 { yyLOCAL = &CountStar{} } @@ -18845,7 +18555,7 @@ yydefault: case 1151: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:5922 +//line sql.y:5923 { yyLOCAL = &Count{Distinct: yyDollar[3].booleanUnion(), Args: yyDollar[4].exprsUnion()} } @@ -18853,7 +18563,7 @@ yydefault: case 1152: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:5926 +//line sql.y:5927 { yyLOCAL = &Max{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion()} } @@ -18861,7 +18571,7 @@ yydefault: case 1153: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:5930 +//line sql.y:5931 { yyLOCAL = &Min{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion()} } @@ -18869,7 +18579,7 @@ yydefault: case 1154: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:5934 +//line sql.y:5935 { yyLOCAL = &Sum{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion()} } @@ -18877,7 +18587,7 @@ yydefault: case 1155: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:5938 +//line sql.y:5939 { yyLOCAL = &Avg{Distinct: yyDollar[3].booleanUnion(), Arg: yyDollar[4].exprUnion()} } @@ -18885,11 +18595,7 @@ yydefault: case 1156: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5942 -======= -//line sql.y:5957 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5943 { yyLOCAL = &BitAnd{Arg: yyDollar[3].exprUnion()} } @@ -18897,11 +18603,7 @@ yydefault: case 1157: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5946 -======= -//line sql.y:5962 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5947 { yyLOCAL = &BitOr{Arg: yyDollar[3].exprUnion()} } @@ -18909,11 +18611,7 @@ yydefault: case 1158: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5950 -======= -//line sql.y:5966 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5951 { yyLOCAL = &BitXor{Arg: yyDollar[3].exprUnion()} } @@ -18921,11 +18619,7 @@ yydefault: case 1159: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5954 -======= -//line sql.y:5970 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5955 { yyLOCAL = &Std{Arg: yyDollar[3].exprUnion()} } @@ -18933,11 +18627,7 @@ yydefault: case 1160: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5958 -======= -//line sql.y:5974 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5959 { yyLOCAL = &StdDev{Arg: yyDollar[3].exprUnion()} } @@ -18945,11 +18635,7 @@ yydefault: case 1161: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5962 -======= -//line sql.y:5978 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5963 { yyLOCAL = &StdPop{Arg: yyDollar[3].exprUnion()} } @@ -18957,11 +18643,7 @@ yydefault: case 1162: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5966 -======= -//line sql.y:5982 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5967 { yyLOCAL = &StdSamp{Arg: yyDollar[3].exprUnion()} } @@ -18969,11 +18651,7 @@ yydefault: case 1163: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5970 -======= -//line sql.y:5986 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5971 { yyLOCAL = &VarPop{Arg: yyDollar[3].exprUnion()} } @@ -18981,11 +18659,7 @@ yydefault: case 1164: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5974 -======= -//line sql.y:5990 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5975 { yyLOCAL = &VarSamp{Arg: yyDollar[3].exprUnion()} } @@ -18993,11 +18667,7 @@ yydefault: case 1165: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5978 -======= -//line sql.y:5994 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5979 { yyLOCAL = &Variance{Arg: yyDollar[3].exprUnion()} } @@ -19005,11 +18675,7 @@ yydefault: case 1166: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5982 -======= -//line sql.y:5998 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5983 { yyLOCAL = &GroupConcatExpr{Distinct: yyDollar[3].booleanUnion(), Exprs: yyDollar[4].exprsUnion(), OrderBy: yyDollar[5].orderByUnion(), Separator: yyDollar[6].str, Limit: yyDollar[7].limitUnion()} } @@ -19017,11 +18683,7 @@ yydefault: case 1167: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5986 -======= -//line sql.y:6002 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5987 { yyLOCAL = &TimestampFuncExpr{Name: string("timestampadd"), Unit: yyDollar[3].identifierCI.String(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()} } @@ -19029,11 +18691,7 @@ yydefault: case 1168: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5990 -======= -//line sql.y:6006 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5991 { yyLOCAL = &TimestampFuncExpr{Name: string("timestampdiff"), Unit: yyDollar[3].identifierCI.String(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()} } @@ -19041,11 +18699,7 @@ yydefault: case 1169: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5994 -======= -//line sql.y:6010 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5995 { yyLOCAL = &ExtractFuncExpr{IntervalTypes: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()} } @@ -19053,11 +18707,7 @@ yydefault: case 1170: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:5998 -======= -//line sql.y:6014 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:5999 { yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()} } @@ -19065,11 +18715,7 @@ yydefault: case 1171: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6002 -======= -//line sql.y:6018 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6003 { yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()} } @@ -19077,11 +18723,7 @@ yydefault: case 1172: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6006 -======= -//line sql.y:6022 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6007 { yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()} } @@ -19089,11 +18731,7 @@ yydefault: case 1173: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6010 -======= -//line sql.y:6026 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6011 { yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()} } @@ -19101,11 +18739,7 @@ yydefault: case 1174: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6014 -======= -//line sql.y:6030 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6015 { yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()} } @@ -19113,83 +18747,7 @@ yydefault: case 1175: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6018 -======= -//line sql.y:6034 - { - yyLOCAL = &AnyValue{Arg: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1176: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6038 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprTimestampadd, Date: yyDollar[7].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: yyDollar[3].intervalTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1177: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6042 - { - yyLOCAL = &TimestampDiffExpr{Unit: yyDollar[3].intervalTypeUnion(), Expr1: yyDollar[5].exprUnion(), Expr2: yyDollar[7].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1178: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6046 - { - yyLOCAL = &ExtractFuncExpr{IntervalType: yyDollar[3].intervalTypeUnion(), Expr: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1179: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL Expr -//line sql.y:6050 - { - yyLOCAL = &WeightStringFuncExpr{Expr: yyDollar[3].exprUnion(), As: yyDollar[4].convertTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1180: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6054 - { - yyLOCAL = &JSONPrettyExpr{JSONVal: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1181: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6058 - { - yyLOCAL = &JSONStorageFreeExpr{JSONVal: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1182: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6062 - { - yyLOCAL = &JSONStorageSizeExpr{JSONVal: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1183: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6066 - { - yyLOCAL = &TrimFuncExpr{TrimFuncType: LTrimType, Type: LeadingTrimType, StringArg: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1184: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6070 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6019 { yyLOCAL = &TrimFuncExpr{TrimFuncType: RTrimType, Type: TrailingTrimType, StringArg: yyDollar[3].exprUnion()} } @@ -19197,11 +18755,7 @@ yydefault: case 1176: yyDollar = yyS[yypt-7 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6022 -======= -//line sql.y:6074 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6023 { yyLOCAL = &TrimFuncExpr{Type: yyDollar[3].trimTypeUnion(), TrimArg: yyDollar[4].exprUnion(), StringArg: yyDollar[6].exprUnion()} } @@ -19209,7 +18763,7 @@ yydefault: case 1177: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:6026 +//line sql.y:6027 { yyLOCAL = &TrimFuncExpr{StringArg: yyDollar[3].exprUnion()} } @@ -19217,7 +18771,7 @@ yydefault: case 1178: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:6030 +//line sql.y:6031 { yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion()} } @@ -19225,7 +18779,7 @@ yydefault: case 1179: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6034 +//line sql.y:6035 { yyLOCAL = &CharExpr{Exprs: yyDollar[3].exprsUnion(), Charset: yyDollar[5].str} } @@ -19233,7 +18787,7 @@ yydefault: case 1180: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6038 +//line sql.y:6039 { yyLOCAL = &TrimFuncExpr{TrimArg: yyDollar[3].exprUnion(), StringArg: yyDollar[5].exprUnion()} } @@ -19241,7 +18795,7 @@ yydefault: case 1181: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6042 +//line sql.y:6043 { yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()} } @@ -19249,7 +18803,7 @@ yydefault: case 1182: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:6046 +//line sql.y:6047 { yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion(), Pos: yyDollar[7].exprUnion()} } @@ -19257,7 +18811,7 @@ yydefault: case 1183: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6050 +//line sql.y:6051 { yyLOCAL = &LocateExpr{SubStr: yyDollar[3].exprUnion(), Str: yyDollar[5].exprUnion()} } @@ -19265,7 +18819,7 @@ yydefault: case 1184: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6054 +//line sql.y:6055 { yyLOCAL = &LockingFunc{Type: GetLock, Name: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()} } @@ -19273,7 +18827,7 @@ yydefault: case 1185: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -//line sql.y:6058 +//line sql.y:6059 { yyLOCAL = &LockingFunc{Type: IsFreeLock, Name: yyDollar[3].exprUnion()} } @@ -19281,11 +18835,7 @@ yydefault: case 1186: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6062 -======= -//line sql.y:6078 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6063 { yyLOCAL = &LockingFunc{Type: IsUsedLock, Name: yyDollar[3].exprUnion()} } @@ -19293,11 +18843,7 @@ yydefault: case 1187: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6066 -======= -//line sql.y:6082 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6067 { yyLOCAL = &LockingFunc{Type: ReleaseAllLocks} } @@ -19305,11 +18851,7 @@ yydefault: case 1188: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6070 -======= -//line sql.y:6086 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6071 { yyLOCAL = &LockingFunc{Type: ReleaseLock, Name: yyDollar[3].exprUnion()} } @@ -19317,11 +18859,7 @@ yydefault: case 1189: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6074 -======= -//line sql.y:6090 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6075 { yyLOCAL = &JSONSchemaValidFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()} } @@ -19329,11 +18867,7 @@ yydefault: case 1190: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6078 -======= -//line sql.y:6094 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6079 { yyLOCAL = &JSONSchemaValidationReportFuncExpr{Schema: yyDollar[3].exprUnion(), Document: yyDollar[5].exprUnion()} } @@ -19341,11 +18875,7 @@ yydefault: case 1191: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6082 -======= -//line sql.y:6098 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6083 { yyLOCAL = &JSONArrayExpr{Params: yyDollar[3].exprsUnion()} } @@ -19353,11 +18883,7 @@ yydefault: case 1192: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6086 -======= -//line sql.y:6102 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6087 { yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion()} } @@ -19365,11 +18891,7 @@ yydefault: case 1193: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6090 -======= -//line sql.y:6106 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6091 { yyLOCAL = &GeomFormatExpr{FormatType: BinaryFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()} } @@ -19377,11 +18899,7 @@ yydefault: case 1194: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6094 -======= -//line sql.y:6110 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6095 { yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion()} } @@ -19389,11 +18907,7 @@ yydefault: case 1195: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6098 -======= -//line sql.y:6114 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6099 { yyLOCAL = &GeomFormatExpr{FormatType: TextFormat, Geom: yyDollar[3].exprUnion(), AxisOrderOpt: yyDollar[5].exprUnion()} } @@ -19401,11 +18915,7 @@ yydefault: case 1196: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6102 -======= -//line sql.y:6118 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6103 { yyLOCAL = &GeomPropertyFuncExpr{Property: IsEmpty, Geom: yyDollar[3].exprUnion()} } @@ -19413,11 +18923,7 @@ yydefault: case 1197: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6106 -======= -//line sql.y:6122 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6107 { yyLOCAL = &GeomPropertyFuncExpr{Property: IsSimple, Geom: yyDollar[3].exprUnion()} } @@ -19425,11 +18931,7 @@ yydefault: case 1198: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6110 -======= -//line sql.y:6126 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6111 { yyLOCAL = &GeomPropertyFuncExpr{Property: Dimension, Geom: yyDollar[3].exprUnion()} } @@ -19437,11 +18939,7 @@ yydefault: case 1199: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6114 -======= -//line sql.y:6130 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6115 { yyLOCAL = &GeomPropertyFuncExpr{Property: Envelope, Geom: yyDollar[3].exprUnion()} } @@ -19449,11 +18947,7 @@ yydefault: case 1200: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6118 -======= -//line sql.y:6134 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6119 { yyLOCAL = &GeomPropertyFuncExpr{Property: GeometryType, Geom: yyDollar[3].exprUnion()} } @@ -19461,11 +18955,7 @@ yydefault: case 1201: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6122 -======= -//line sql.y:6138 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6123 { yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion()} } @@ -19473,11 +18963,7 @@ yydefault: case 1202: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6126 -======= -//line sql.y:6142 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6127 { yyLOCAL = &PointPropertyFuncExpr{Property: Latitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()} } @@ -19485,11 +18971,7 @@ yydefault: case 1203: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6130 -======= -//line sql.y:6146 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6131 { yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion()} } @@ -19497,11 +18979,7 @@ yydefault: case 1204: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6134 -======= -//line sql.y:6150 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6135 { yyLOCAL = &PointPropertyFuncExpr{Property: Longitude, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()} } @@ -19509,11 +18987,7 @@ yydefault: case 1205: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6138 -======= -//line sql.y:6154 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6139 { yyLOCAL = &LinestrPropertyFuncExpr{Property: EndPoint, Linestring: yyDollar[3].exprUnion()} } @@ -19521,11 +18995,7 @@ yydefault: case 1206: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6142 -======= -//line sql.y:6158 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6143 { yyLOCAL = &LinestrPropertyFuncExpr{Property: IsClosed, Linestring: yyDollar[3].exprUnion()} } @@ -19533,11 +19003,7 @@ yydefault: case 1207: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6146 -======= -//line sql.y:6162 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6147 { yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion()} } @@ -19545,11 +19011,7 @@ yydefault: case 1208: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6150 -======= -//line sql.y:6166 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6151 { yyLOCAL = &LinestrPropertyFuncExpr{Property: Length, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()} } @@ -19557,11 +19019,7 @@ yydefault: case 1209: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6154 -======= -//line sql.y:6170 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6155 { yyLOCAL = &LinestrPropertyFuncExpr{Property: NumPoints, Linestring: yyDollar[3].exprUnion()} } @@ -19569,11 +19027,7 @@ yydefault: case 1210: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6158 -======= -//line sql.y:6174 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6159 { yyLOCAL = &LinestrPropertyFuncExpr{Property: PointN, Linestring: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()} } @@ -19581,11 +19035,7 @@ yydefault: case 1211: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6162 -======= -//line sql.y:6178 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6163 { yyLOCAL = &LinestrPropertyFuncExpr{Property: StartPoint, Linestring: yyDollar[3].exprUnion()} } @@ -19593,11 +19043,7 @@ yydefault: case 1212: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6166 -======= -//line sql.y:6182 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6167 { yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion()} } @@ -19605,11 +19051,7 @@ yydefault: case 1213: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6170 -======= -//line sql.y:6186 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6171 { yyLOCAL = &PointPropertyFuncExpr{Property: XCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()} } @@ -19617,11 +19059,7 @@ yydefault: case 1214: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6174 -======= -//line sql.y:6190 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6175 { yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion()} } @@ -19629,11 +19067,7 @@ yydefault: case 1215: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6178 -======= -//line sql.y:6194 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6179 { yyLOCAL = &PointPropertyFuncExpr{Property: YCordinate, Point: yyDollar[3].exprUnion(), ValueToSet: yyDollar[5].exprUnion()} } @@ -19641,11 +19075,7 @@ yydefault: case 1216: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6182 -======= -//line sql.y:6198 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6183 { yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion()} } @@ -19653,11 +19083,7 @@ yydefault: case 1217: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6186 -======= -//line sql.y:6202 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6187 { yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19665,11 +19091,7 @@ yydefault: case 1218: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6190 -======= -//line sql.y:6206 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6191 { yyLOCAL = &GeomFromTextExpr{Type: GeometryFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19677,11 +19099,7 @@ yydefault: case 1219: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6194 -======= -//line sql.y:6210 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6195 { yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion()} } @@ -19689,11 +19107,7 @@ yydefault: case 1220: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6198 -======= -//line sql.y:6214 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6199 { yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19701,11 +19115,7 @@ yydefault: case 1221: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6202 -======= -//line sql.y:6218 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6203 { yyLOCAL = &GeomFromTextExpr{Type: GeometryCollectionFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19713,11 +19123,7 @@ yydefault: case 1222: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6206 -======= -//line sql.y:6222 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6207 { yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion()} } @@ -19725,11 +19131,7 @@ yydefault: case 1223: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6210 -======= -//line sql.y:6226 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6211 { yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19737,11 +19139,7 @@ yydefault: case 1224: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6214 -======= -//line sql.y:6230 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6215 { yyLOCAL = &GeomFromTextExpr{Type: LineStringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19749,11 +19147,7 @@ yydefault: case 1225: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6218 -======= -//line sql.y:6234 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6219 { yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion()} } @@ -19761,11 +19155,7 @@ yydefault: case 1226: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6222 -======= -//line sql.y:6238 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6223 { yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19773,11 +19163,7 @@ yydefault: case 1227: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6226 -======= -//line sql.y:6242 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6227 { yyLOCAL = &GeomFromTextExpr{Type: MultiLinestringFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19785,11 +19171,7 @@ yydefault: case 1228: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6230 -======= -//line sql.y:6246 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6231 { yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion()} } @@ -19797,11 +19179,7 @@ yydefault: case 1229: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6234 -======= -//line sql.y:6250 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6235 { yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19809,11 +19187,7 @@ yydefault: case 1230: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6238 -======= -//line sql.y:6254 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6239 { yyLOCAL = &GeomFromTextExpr{Type: MultiPointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19821,11 +19195,7 @@ yydefault: case 1231: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6242 -======= -//line sql.y:6258 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6243 { yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion()} } @@ -19833,11 +19203,7 @@ yydefault: case 1232: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6246 -======= -//line sql.y:6262 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6247 { yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19845,11 +19211,7 @@ yydefault: case 1233: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6250 -======= -//line sql.y:6266 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6251 { yyLOCAL = &GeomFromTextExpr{Type: MultiPolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19857,11 +19219,7 @@ yydefault: case 1234: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6254 -======= -//line sql.y:6270 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6255 { yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion()} } @@ -19869,11 +19227,7 @@ yydefault: case 1235: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6258 -======= -//line sql.y:6274 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6259 { yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19881,11 +19235,7 @@ yydefault: case 1236: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6262 -======= -//line sql.y:6278 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6263 { yyLOCAL = &GeomFromTextExpr{Type: PointFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19893,11 +19243,7 @@ yydefault: case 1237: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6266 -======= -//line sql.y:6282 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6267 { yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion()} } @@ -19905,11 +19251,7 @@ yydefault: case 1238: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6270 -======= -//line sql.y:6286 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6271 { yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19917,11 +19259,7 @@ yydefault: case 1239: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6274 -======= -//line sql.y:6290 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6275 { yyLOCAL = &GeomFromTextExpr{Type: PolygonFromText, WktText: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19929,11 +19267,7 @@ yydefault: case 1240: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6278 -======= -//line sql.y:6294 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6279 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -19941,11 +19275,7 @@ yydefault: case 1241: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6282 -======= -//line sql.y:6298 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6283 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19953,11 +19283,7 @@ yydefault: case 1242: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6286 -======= -//line sql.y:6302 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6287 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -19965,11 +19291,7 @@ yydefault: case 1243: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6290 -======= -//line sql.y:6306 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6291 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -19977,11 +19299,7 @@ yydefault: case 1244: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6294 -======= -//line sql.y:6310 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6295 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -19989,11 +19307,7 @@ yydefault: case 1245: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6298 -======= -//line sql.y:6314 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6299 { yyLOCAL = &GeomFromWKBExpr{Type: GeometryCollectionFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20001,11 +19315,7 @@ yydefault: case 1246: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6302 -======= -//line sql.y:6318 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6303 { yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20013,11 +19323,7 @@ yydefault: case 1247: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6306 -======= -//line sql.y:6322 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6307 { yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20025,11 +19331,7 @@ yydefault: case 1248: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6310 -======= -//line sql.y:6326 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6311 { yyLOCAL = &GeomFromWKBExpr{Type: LineStringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20037,11 +19339,7 @@ yydefault: case 1249: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6314 -======= -//line sql.y:6330 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6315 { yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20049,11 +19347,7 @@ yydefault: case 1250: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6318 -======= -//line sql.y:6334 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6319 { yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20061,11 +19355,7 @@ yydefault: case 1251: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6322 -======= -//line sql.y:6338 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6323 { yyLOCAL = &GeomFromWKBExpr{Type: MultiLinestringFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20073,11 +19363,7 @@ yydefault: case 1252: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6326 -======= -//line sql.y:6342 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6327 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20085,11 +19371,7 @@ yydefault: case 1253: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6330 -======= -//line sql.y:6346 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6331 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20097,11 +19379,7 @@ yydefault: case 1254: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6334 -======= -//line sql.y:6350 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6335 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20109,11 +19387,7 @@ yydefault: case 1255: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6338 -======= -//line sql.y:6354 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6339 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20121,11 +19395,7 @@ yydefault: case 1256: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6342 -======= -//line sql.y:6358 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6343 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20133,11 +19403,7 @@ yydefault: case 1257: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6346 -======= -//line sql.y:6362 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6347 { yyLOCAL = &GeomFromWKBExpr{Type: MultiPolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20145,11 +19411,7 @@ yydefault: case 1258: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6350 -======= -//line sql.y:6366 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6351 { yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20157,11 +19419,7 @@ yydefault: case 1259: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6354 -======= -//line sql.y:6370 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6355 { yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20169,11 +19427,7 @@ yydefault: case 1260: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6358 -======= -//line sql.y:6374 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6359 { yyLOCAL = &GeomFromWKBExpr{Type: PointFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20181,11 +19435,7 @@ yydefault: case 1261: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6362 -======= -//line sql.y:6378 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6363 { yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion()} } @@ -20193,11 +19443,7 @@ yydefault: case 1262: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6366 -======= -//line sql.y:6382 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6367 { yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion()} } @@ -20205,11 +19451,7 @@ yydefault: case 1263: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6370 -======= -//line sql.y:6386 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6371 { yyLOCAL = &GeomFromWKBExpr{Type: PolygonFromWKB, WkbBlob: yyDollar[3].exprUnion(), Srid: yyDollar[5].exprUnion(), AxisOrderOpt: yyDollar[7].exprUnion()} } @@ -20217,11 +19459,7 @@ yydefault: case 1264: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6374 -======= -//line sql.y:6390 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6375 { yyLOCAL = &PolygonPropertyFuncExpr{Property: Area, Polygon: yyDollar[3].exprUnion()} } @@ -20229,11 +19467,7 @@ yydefault: case 1265: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6378 -======= -//line sql.y:6394 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6379 { yyLOCAL = &PolygonPropertyFuncExpr{Property: Centroid, Polygon: yyDollar[3].exprUnion()} } @@ -20241,11 +19475,7 @@ yydefault: case 1266: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6382 -======= -//line sql.y:6398 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6383 { yyLOCAL = &PolygonPropertyFuncExpr{Property: ExteriorRing, Polygon: yyDollar[3].exprUnion()} } @@ -20253,11 +19483,7 @@ yydefault: case 1267: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6386 -======= -//line sql.y:6402 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6387 { yyLOCAL = &PolygonPropertyFuncExpr{Property: InteriorRingN, Polygon: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()} } @@ -20265,11 +19491,7 @@ yydefault: case 1268: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6390 -======= -//line sql.y:6406 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6391 { yyLOCAL = &PolygonPropertyFuncExpr{Property: NumInteriorRings, Polygon: yyDollar[3].exprUnion()} } @@ -20277,11 +19499,7 @@ yydefault: case 1269: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6394 -======= -//line sql.y:6410 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6395 { yyLOCAL = &GeomCollPropertyFuncExpr{Property: GeometryN, GeomColl: yyDollar[3].exprUnion(), PropertyDefArg: yyDollar[5].exprUnion()} } @@ -20289,11 +19507,7 @@ yydefault: case 1270: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6398 -======= -//line sql.y:6414 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6399 { yyLOCAL = &GeomCollPropertyFuncExpr{Property: NumGeometries, GeomColl: yyDollar[3].exprUnion()} } @@ -20301,11 +19515,7 @@ yydefault: case 1271: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6402 -======= -//line sql.y:6418 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6403 { yyLOCAL = &GeoHashFromLatLongExpr{Longitude: yyDollar[3].exprUnion(), Latitude: yyDollar[5].exprUnion(), MaxLength: yyDollar[7].exprUnion()} } @@ -20313,11 +19523,7 @@ yydefault: case 1272: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6406 -======= -//line sql.y:6422 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6407 { yyLOCAL = &GeoHashFromPointExpr{Point: yyDollar[3].exprUnion(), MaxLength: yyDollar[5].exprUnion()} } @@ -20325,11 +19531,7 @@ yydefault: case 1273: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6410 -======= -//line sql.y:6426 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6411 { yyLOCAL = &GeomFromGeoHashExpr{GeomType: LatitudeFromHash, GeoHash: yyDollar[3].exprUnion()} } @@ -20337,11 +19539,7 @@ yydefault: case 1274: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6414 -======= -//line sql.y:6430 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6415 { yyLOCAL = &GeomFromGeoHashExpr{GeomType: LongitudeFromHash, GeoHash: yyDollar[3].exprUnion()} } @@ -20349,11 +19547,7 @@ yydefault: case 1275: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6418 -======= -//line sql.y:6434 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6419 { yyLOCAL = &GeomFromGeoHashExpr{GeomType: PointFromHash, GeoHash: yyDollar[3].exprUnion(), SridOpt: yyDollar[5].exprUnion()} } @@ -20361,11 +19555,7 @@ yydefault: case 1276: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6422 -======= -//line sql.y:6438 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6423 { yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion()} } @@ -20373,11 +19563,7 @@ yydefault: case 1277: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6426 -======= -//line sql.y:6442 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6427 { yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion()} } @@ -20385,11 +19571,7 @@ yydefault: case 1278: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6430 -======= -//line sql.y:6446 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6431 { yyLOCAL = &GeomFromGeoJSONExpr{GeoJSON: yyDollar[3].exprUnion(), HigherDimHandlerOpt: yyDollar[5].exprUnion(), Srid: yyDollar[7].exprUnion()} } @@ -20397,11 +19579,7 @@ yydefault: case 1279: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6434 -======= -//line sql.y:6450 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6435 { yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion()} } @@ -20409,11 +19587,7 @@ yydefault: case 1280: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6438 -======= -//line sql.y:6454 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6439 { yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion()} } @@ -20421,11 +19595,7 @@ yydefault: case 1281: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6442 -======= -//line sql.y:6458 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6443 { yyLOCAL = &GeoJSONFromGeomExpr{Geom: yyDollar[3].exprUnion(), MaxDecimalDigits: yyDollar[5].exprUnion(), Bitmask: yyDollar[7].exprUnion()} } @@ -20433,11 +19603,7 @@ yydefault: case 1282: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6446 -======= -//line sql.y:6462 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6447 { yyLOCAL = &JSONObjectExpr{Params: yyDollar[3].jsonObjectParamsUnion()} } @@ -20445,11 +19611,7 @@ yydefault: case 1283: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6450 -======= -//line sql.y:6466 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6451 { yyLOCAL = &JSONQuoteExpr{StringArg: yyDollar[3].exprUnion()} } @@ -20457,11 +19619,7 @@ yydefault: case 1284: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6454 -======= -//line sql.y:6470 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6455 { yyLOCAL = &JSONContainsExpr{Target: yyDollar[3].exprUnion(), Candidate: yyDollar[5].exprsUnion()[0], PathList: yyDollar[5].exprsUnion()[1:]} } @@ -20469,11 +19627,7 @@ yydefault: case 1285: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6458 -======= -//line sql.y:6474 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6459 { yyLOCAL = &JSONContainsPathExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), PathList: yyDollar[7].exprsUnion()} } @@ -20481,11 +19635,7 @@ yydefault: case 1286: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6462 -======= -//line sql.y:6478 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6463 { yyLOCAL = &JSONExtractExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()} } @@ -20493,11 +19643,7 @@ yydefault: case 1287: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6466 -======= -//line sql.y:6482 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6467 { yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()} } @@ -20505,11 +19651,7 @@ yydefault: case 1288: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6470 -======= -//line sql.y:6486 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6471 { yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()} } @@ -20517,11 +19659,7 @@ yydefault: case 1289: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6474 -======= -//line sql.y:6490 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6475 { yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()} } @@ -20529,11 +19667,7 @@ yydefault: case 1290: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6478 -======= -//line sql.y:6494 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6479 { yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()} } @@ -20541,11 +19675,7 @@ yydefault: case 1291: yyDollar = yyS[yypt-10 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6482 -======= -//line sql.y:6498 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6483 { yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]} } @@ -20553,11 +19683,7 @@ yydefault: case 1292: yyDollar = yyS[yypt-7 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6486 -======= -//line sql.y:6502 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6487 { yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()} } @@ -20565,11 +19691,7 @@ yydefault: case 1293: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6490 -======= -//line sql.y:6506 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6491 { yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()} } @@ -20577,11 +19699,7 @@ yydefault: case 1294: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6494 -======= -//line sql.y:6510 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6495 { yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()} } @@ -20589,11 +19707,7 @@ yydefault: case 1295: yyDollar = yyS[yypt-9 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6498 -======= -//line sql.y:6514 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6499 { yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()} } @@ -20601,83 +19715,7 @@ yydefault: case 1296: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6502 -======= -//line sql.y:6518 - { - yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1297: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6522 - { - yyLOCAL = &JSONKeysExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1298: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6526 - { - yyLOCAL = &JSONOverlapsExpr{JSONDoc1: yyDollar[3].exprUnion(), JSONDoc2: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1299: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6530 - { - yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1300: - yyDollar = yyS[yypt-10 : yypt+1] - var yyLOCAL Expr -//line sql.y:6534 - { - yyLOCAL = &JSONSearchExpr{JSONDoc: yyDollar[3].exprUnion(), OneOrAll: yyDollar[5].exprUnion(), SearchStr: yyDollar[7].exprUnion(), EscapeChar: yyDollar[9].exprsUnion()[0], PathList: yyDollar[9].exprsUnion()[1:]} - } - yyVAL.union = yyLOCAL - case 1301: - yyDollar = yyS[yypt-7 : yypt+1] - var yyLOCAL Expr -//line sql.y:6538 - { - yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1302: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6542 - { - yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion()} - } - yyVAL.union = yyLOCAL - case 1303: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6546 - { - yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), ErrorOnResponse: yyDollar[7].jtOnResponseUnion()} - } - yyVAL.union = yyLOCAL - case 1304: - yyDollar = yyS[yypt-9 : yypt+1] - var yyLOCAL Expr -//line sql.y:6550 - { - yyLOCAL = &JSONValueExpr{JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion(), ReturningType: yyDollar[6].convertTypeUnion(), EmptyOnResponse: yyDollar[7].jtOnResponseUnion(), ErrorOnResponse: yyDollar[8].jtOnResponseUnion()} - } - yyVAL.union = yyLOCAL - case 1305: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6554 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6503 { yyLOCAL = &JSONAttributesExpr{Type: DepthAttributeType, JSONDoc: yyDollar[3].exprUnion()} } @@ -20685,11 +19723,7 @@ yydefault: case 1297: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6506 -======= -//line sql.y:6558 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6507 { yyLOCAL = &JSONAttributesExpr{Type: ValidAttributeType, JSONDoc: yyDollar[3].exprUnion()} } @@ -20697,11 +19731,7 @@ yydefault: case 1298: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6510 -======= -//line sql.y:6562 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6511 { yyLOCAL = &JSONAttributesExpr{Type: TypeAttributeType, JSONDoc: yyDollar[3].exprUnion()} } @@ -20709,11 +19739,7 @@ yydefault: case 1299: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6514 -======= -//line sql.y:6566 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6515 { yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion()} } @@ -20721,7 +19747,7 @@ yydefault: case 1300: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6518 +//line sql.y:6519 { yyLOCAL = &JSONAttributesExpr{Type: LengthAttributeType, JSONDoc: yyDollar[3].exprUnion(), Path: yyDollar[5].exprUnion()} } @@ -20729,7 +19755,7 @@ yydefault: case 1301: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6522 +//line sql.y:6523 { yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayAppendType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()} } @@ -20737,7 +19763,7 @@ yydefault: case 1302: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6526 +//line sql.y:6527 { yyLOCAL = &JSONValueModifierExpr{Type: JSONArrayInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()} } @@ -20745,7 +19771,7 @@ yydefault: case 1303: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6530 +//line sql.y:6531 { yyLOCAL = &JSONValueModifierExpr{Type: JSONInsertType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()} } @@ -20753,7 +19779,7 @@ yydefault: case 1304: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6534 +//line sql.y:6535 { yyLOCAL = &JSONValueModifierExpr{Type: JSONReplaceType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()} } @@ -20761,7 +19787,7 @@ yydefault: case 1305: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6538 +//line sql.y:6539 { yyLOCAL = &JSONValueModifierExpr{Type: JSONSetType, JSONDoc: yyDollar[3].exprUnion(), Params: yyDollar[5].jsonObjectParamsUnion()} } @@ -20769,7 +19795,7 @@ yydefault: case 1306: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6542 +//line sql.y:6543 { yyLOCAL = &JSONValueMergeExpr{Type: JSONMergeType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()} } @@ -20777,7 +19803,7 @@ yydefault: case 1307: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6546 +//line sql.y:6547 { yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePatchType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()} } @@ -20785,7 +19811,7 @@ yydefault: case 1308: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6550 +//line sql.y:6551 { yyLOCAL = &JSONValueMergeExpr{Type: JSONMergePreserveType, JSONDoc: yyDollar[3].exprUnion(), JSONDocList: yyDollar[5].exprsUnion()} } @@ -20793,11 +19819,7 @@ yydefault: case 1309: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6554 -======= -//line sql.y:6570 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6555 { yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()} } @@ -20805,11 +19827,7 @@ yydefault: case 1310: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6558 -======= -//line sql.y:6574 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6559 { yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()} } @@ -20817,11 +19835,7 @@ yydefault: case 1311: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6562 -======= -//line sql.y:6578 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6563 { yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()} } @@ -20829,11 +19843,7 @@ yydefault: case 1312: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6566 -======= -//line sql.y:6582 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6567 { yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()} } @@ -20841,11 +19851,7 @@ yydefault: case 1313: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6570 -======= -//line sql.y:6586 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6571 { yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()} } @@ -20853,11 +19859,7 @@ yydefault: case 1314: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6574 -======= -//line sql.y:6590 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6575 { yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()} } @@ -20865,11 +19867,7 @@ yydefault: case 1315: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6578 -======= -//line sql.y:6594 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6579 { yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()} } @@ -20877,11 +19875,7 @@ yydefault: case 1316: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6582 -======= -//line sql.y:6598 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6583 { yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()} } @@ -20889,11 +19883,7 @@ yydefault: case 1317: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6586 -======= -//line sql.y:6602 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6587 { yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()} } @@ -20901,159 +19891,63 @@ yydefault: case 1318: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6590 -======= -//line sql.y:6606 +//line sql.y:6591 { - yyLOCAL = &JSONRemoveExpr{JSONDoc: yyDollar[3].exprUnion(), PathList: yyDollar[5].exprsUnion()} + yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()} } yyVAL.union = yyLOCAL case 1319: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Expr -//line sql.y:6610 +//line sql.y:6595 { - yyLOCAL = &JSONUnquoteExpr{JSONValue: yyDollar[3].exprUnion()} + yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()} } yyVAL.union = yyLOCAL case 1320: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-9 : yypt+1] var yyLOCAL Expr -//line sql.y:6614 +//line sql.y:6599 { - yyLOCAL = &MultiPolygonExpr{PolygonParams: yyDollar[3].exprsUnion()} + yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()} } yyVAL.union = yyLOCAL case 1321: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6618 +//line sql.y:6603 { - yyLOCAL = &MultiPointExpr{PointParams: yyDollar[3].exprsUnion()} + yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()} } yyVAL.union = yyLOCAL case 1322: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-9 : yypt+1] var yyLOCAL Expr -//line sql.y:6622 +//line sql.y:6607 { - yyLOCAL = &MultiLinestringExpr{LinestringParams: yyDollar[3].exprsUnion()} + yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()} } yyVAL.union = yyLOCAL case 1323: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:6626 +//line sql.y:6611 { - yyLOCAL = &PolygonExpr{LinestringParams: yyDollar[3].exprsUnion()} + yyLOCAL = &DateAddExpr{Type: AdddateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} } yyVAL.union = yyLOCAL case 1324: - yyDollar = yyS[yypt-4 : yypt+1] + yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6630 +//line sql.y:6615 { - yyLOCAL = &LineStringExpr{PointParams: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1325: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6634 - { - yyLOCAL = &PointExpr{XCordinate: yyDollar[3].exprUnion(), YCordinate: yyDollar[5].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1326: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6638 - { - yyLOCAL = &ArgumentLessWindowExpr{Type: yyDollar[1].argumentLessWindowExprTypeUnion(), OverClause: yyDollar[4].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1327: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6642 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &FirstOrLastValueExpr{Type: yyDollar[1].firstOrLastValueExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1319: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6594 -======= -//line sql.y:6646 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &NtileExpr{N: yyDollar[3].exprUnion(), OverClause: yyDollar[5].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1320: - yyDollar = yyS[yypt-9 : yypt+1] - var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6598 -======= -//line sql.y:6650 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &NTHValueExpr{Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), FromFirstLastClause: yyDollar[7].fromFirstLastClauseUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1321: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6602 -======= -//line sql.y:6654 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), NullTreatmentClause: yyDollar[5].nullTreatmentClauseUnion(), OverClause: yyDollar[6].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1322: - yyDollar = yyS[yypt-9 : yypt+1] - var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6606 -======= -//line sql.y:6658 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &LagLeadExpr{Type: yyDollar[1].lagLeadExprTypeUnion(), Expr: yyDollar[3].exprUnion(), N: yyDollar[5].exprUnion(), Default: yyDollar[6].exprUnion(), NullTreatmentClause: yyDollar[8].nullTreatmentClauseUnion(), OverClause: yyDollar[9].overClauseUnion()} - } - yyVAL.union = yyLOCAL - case 1323: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6610 -======= -//line sql.y:6662 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &DateAddExpr{Type: AdddateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1324: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6614 - { - yyLOCAL = &DateAddExpr{Type: AdddateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[5].exprUnion()} + yyLOCAL = &DateAddExpr{Type: AdddateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[5].exprUnion()} } yyVAL.union = yyLOCAL case 1325: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:6618 +//line sql.y:6619 { yyLOCAL = &DateAddExpr{Type: DateAddType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} } @@ -21061,7 +19955,7 @@ yydefault: case 1326: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:6622 +//line sql.y:6623 { yyLOCAL = &DateSubExpr{Type: DateSubType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} } @@ -21069,7 +19963,7 @@ yydefault: case 1327: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -//line sql.y:6626 +//line sql.y:6627 { yyLOCAL = &DateSubExpr{Type: SubdateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} } @@ -21077,61 +19971,15 @@ yydefault: case 1328: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -//line sql.y:6630 +//line sql.y:6631 { yyLOCAL = &DateSubExpr{Type: SubdateType, Date: yyDollar[3].exprUnion(), Expr: yyDollar[5].exprUnion()} } yyVAL.union = yyLOCAL case 1333: -<<<<<<< HEAD yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -//line sql.y:6640 -======= - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6666 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprAdddate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone} - } - yyVAL.union = yyLOCAL - case 1334: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6670 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateAdd, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1335: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6674 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprDateSub, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1336: - yyDollar = yyS[yypt-8 : yypt+1] - var yyLOCAL Expr -//line sql.y:6678 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[6].exprUnion(), Unit: yyDollar[7].intervalTypeUnion()} - } - yyVAL.union = yyLOCAL - case 1337: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL Expr -//line sql.y:6682 - { - yyLOCAL = &IntervalDateExpr{Syntax: IntervalDateExprSubdate, Date: yyDollar[3].exprUnion(), Interval: yyDollar[5].exprUnion(), Unit: IntervalNone} - } - yyVAL.union = yyLOCAL - case 1342: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL Expr -//line sql.y:6692 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6641 { yyLOCAL = yyDollar[1].exprUnion() } @@ -21139,11 +19987,7 @@ yydefault: case 1334: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6644 -======= -//line sql.y:6696 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6645 { yyLOCAL = NewIntLiteral(yyDollar[1].str) } @@ -21151,11 +19995,7 @@ yydefault: case 1335: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6648 -======= -//line sql.y:6700 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6649 { yyLOCAL = yyDollar[1].variableUnion() } @@ -21163,11 +20003,7 @@ yydefault: case 1336: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6652 -======= -//line sql.y:6704 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6653 { yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:]) } @@ -21175,11 +20011,7 @@ yydefault: case 1337: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6657 -======= -//line sql.y:6709 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6658 { yyLOCAL = nil } @@ -21187,11 +20019,7 @@ yydefault: case 1338: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6661 -======= -//line sql.y:6713 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6662 { yyLOCAL = yyDollar[2].exprUnion() } @@ -21199,11 +20027,7 @@ yydefault: case 1339: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6667 -======= -//line sql.y:6719 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6668 { yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()} } @@ -21211,11 +20035,7 @@ yydefault: case 1340: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6671 -======= -//line sql.y:6723 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6672 { yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()} } @@ -21223,11 +20043,7 @@ yydefault: case 1341: yyDollar = yyS[yypt-10 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6675 -======= -//line sql.y:6727 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6676 { yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()} } @@ -21235,11 +20051,7 @@ yydefault: case 1342: yyDollar = yyS[yypt-12 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6679 -======= -//line sql.y:6731 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6680 { yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion()} } @@ -21247,11 +20059,7 @@ yydefault: case 1343: yyDollar = yyS[yypt-14 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6683 -======= -//line sql.y:6735 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6684 { // Match type is kept expression as TRIM( ' m ') is accepted yyLOCAL = &RegexpInstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), ReturnOption: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()} @@ -21260,11 +20068,7 @@ yydefault: case 1344: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6688 -======= -//line sql.y:6740 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6689 { yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()} } @@ -21272,11 +20076,7 @@ yydefault: case 1345: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6692 -======= -//line sql.y:6744 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6693 { yyLOCAL = &RegexpLikeExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), MatchType: yyDollar[7].exprUnion()} } @@ -21284,11 +20084,7 @@ yydefault: case 1346: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6696 -======= -//line sql.y:6748 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6697 { yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion()} } @@ -21296,11 +20092,7 @@ yydefault: case 1347: yyDollar = yyS[yypt-10 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6700 -======= -//line sql.y:6752 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6701 { yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion()} } @@ -21308,11 +20100,7 @@ yydefault: case 1348: yyDollar = yyS[yypt-12 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6704 -======= -//line sql.y:6756 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6705 { yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion()} } @@ -21320,11 +20108,7 @@ yydefault: case 1349: yyDollar = yyS[yypt-14 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6708 -======= -//line sql.y:6760 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6709 { // Match type is kept expression as TRIM( ' m ') is accepted yyLOCAL = &RegexpReplaceExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Repl: yyDollar[7].exprUnion(), Position: yyDollar[9].exprUnion(), Occurrence: yyDollar[11].exprUnion(), MatchType: yyDollar[13].exprUnion()} @@ -21333,11 +20117,7 @@ yydefault: case 1350: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6713 -======= -//line sql.y:6765 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6714 { yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion()} } @@ -21345,11 +20125,7 @@ yydefault: case 1351: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6717 -======= -//line sql.y:6769 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6718 { yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion()} } @@ -21357,11 +20133,7 @@ yydefault: case 1352: yyDollar = yyS[yypt-10 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6721 -======= -//line sql.y:6773 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6722 { yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion()} } @@ -21369,11 +20141,7 @@ yydefault: case 1353: yyDollar = yyS[yypt-12 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6725 -======= -//line sql.y:6777 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6726 { // Match type is kept expression as TRIM( ' m ') is accepted yyLOCAL = &RegexpSubstrExpr{Expr: yyDollar[3].exprUnion(), Pattern: yyDollar[5].exprUnion(), Position: yyDollar[7].exprUnion(), Occurrence: yyDollar[9].exprUnion(), MatchType: yyDollar[11].exprUnion()} @@ -21382,11 +20150,7 @@ yydefault: case 1354: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6732 -======= -//line sql.y:6784 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6733 { yyLOCAL = &ExtractValueExpr{Fragment: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion()} } @@ -21394,11 +20158,7 @@ yydefault: case 1355: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6736 -======= -//line sql.y:6788 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6737 { yyLOCAL = &UpdateXMLExpr{Target: yyDollar[3].exprUnion(), XPathExpr: yyDollar[5].exprUnion(), NewXML: yyDollar[7].exprUnion()} } @@ -21406,11 +20166,7 @@ yydefault: case 1356: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6742 -======= -//line sql.y:6794 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6743 { yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatBytesType, Argument: yyDollar[3].exprUnion()} } @@ -21418,11 +20174,7 @@ yydefault: case 1357: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6746 -======= -//line sql.y:6798 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6747 { yyLOCAL = &PerformanceSchemaFuncExpr{Type: FormatPicoTimeType, Argument: yyDollar[3].exprUnion()} } @@ -21430,11 +20182,7 @@ yydefault: case 1358: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6750 -======= -//line sql.y:6802 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6751 { yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsCurrentThreadIDType} } @@ -21442,11 +20190,7 @@ yydefault: case 1359: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6754 -======= -//line sql.y:6806 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6755 { yyLOCAL = &PerformanceSchemaFuncExpr{Type: PsThreadIDType, Argument: yyDollar[3].exprUnion()} } @@ -21454,11 +20198,7 @@ yydefault: case 1360: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6760 -======= -//line sql.y:6812 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6761 { yyLOCAL = >IDFuncExpr{Type: GTIDSubsetType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()} } @@ -21466,11 +20206,7 @@ yydefault: case 1361: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6764 -======= -//line sql.y:6816 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6765 { yyLOCAL = >IDFuncExpr{Type: GTIDSubtractType, Set1: yyDollar[3].exprUnion(), Set2: yyDollar[5].exprUnion()} } @@ -21478,11 +20214,7 @@ yydefault: case 1362: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6768 -======= -//line sql.y:6820 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6769 { yyLOCAL = >IDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion()} } @@ -21490,11 +20222,7 @@ yydefault: case 1363: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6772 -======= -//line sql.y:6824 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6773 { yyLOCAL = >IDFuncExpr{Type: WaitForExecutedGTIDSetType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()} } @@ -21502,11 +20230,7 @@ yydefault: case 1364: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6776 -======= -//line sql.y:6828 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6777 { yyLOCAL = >IDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion()} } @@ -21514,11 +20238,7 @@ yydefault: case 1365: yyDollar = yyS[yypt-6 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6780 -======= -//line sql.y:6832 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6781 { yyLOCAL = >IDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion()} } @@ -21526,11 +20246,7 @@ yydefault: case 1366: yyDollar = yyS[yypt-8 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:6784 -======= -//line sql.y:6836 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6785 { yyLOCAL = >IDFuncExpr{Type: WaitUntilSQLThreadAfterGTIDSType, Set1: yyDollar[3].exprUnion(), Timeout: yyDollar[5].exprUnion(), Channel: yyDollar[7].exprUnion()} } @@ -21538,11 +20254,7 @@ yydefault: case 1367: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6789 -======= -//line sql.y:6841 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6790 { yyLOCAL = nil } @@ -21550,180 +20262,111 @@ yydefault: case 1368: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6793 -======= -//line sql.y:6845 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6794 { yyLOCAL = yyDollar[2].convertTypeUnion() } yyVAL.union = yyLOCAL case 1369: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6799 -======= - var yyLOCAL IntervalType -//line sql.y:6851 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6800 { yyLOCAL = IntervalDayHour } yyVAL.union = yyLOCAL case 1370: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6803 -======= - var yyLOCAL IntervalType -//line sql.y:6855 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6804 { yyLOCAL = IntervalDayMicrosecond } yyVAL.union = yyLOCAL case 1371: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6807 -======= - var yyLOCAL IntervalType -//line sql.y:6859 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6808 { yyLOCAL = IntervalDayMinute } yyVAL.union = yyLOCAL case 1372: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6811 -======= - var yyLOCAL IntervalType -//line sql.y:6863 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6812 { yyLOCAL = IntervalDaySecond } yyVAL.union = yyLOCAL case 1373: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6815 -======= - var yyLOCAL IntervalType -//line sql.y:6867 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6816 { yyLOCAL = IntervalHourMicrosecond } yyVAL.union = yyLOCAL case 1374: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6819 -======= - var yyLOCAL IntervalType -//line sql.y:6871 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6820 { yyLOCAL = IntervalHourMinute } yyVAL.union = yyLOCAL case 1375: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6823 -======= - var yyLOCAL IntervalType -//line sql.y:6875 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6824 { yyLOCAL = IntervalHourSecond } yyVAL.union = yyLOCAL case 1376: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6827 -======= - var yyLOCAL IntervalType -//line sql.y:6879 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6828 { yyLOCAL = IntervalMinuteMicrosecond } yyVAL.union = yyLOCAL case 1377: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6831 -======= - var yyLOCAL IntervalType -//line sql.y:6883 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6832 { yyLOCAL = IntervalMinuteSecond } yyVAL.union = yyLOCAL case 1378: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6835 -======= - var yyLOCAL IntervalType -//line sql.y:6887 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6836 { yyLOCAL = IntervalSecondMicrosecond } yyVAL.union = yyLOCAL case 1379: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6839 -======= - var yyLOCAL IntervalType -//line sql.y:6891 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6840 { yyLOCAL = IntervalYearMonth } yyVAL.union = yyLOCAL case 1380: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6843 -======= - var yyLOCAL IntervalType -//line sql.y:6895 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6844 { yyLOCAL = IntervalDay } yyVAL.union = yyLOCAL case 1381: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD var yyLOCAL IntervalTypes -//line sql.y:6847 -======= - var yyLOCAL IntervalType -//line sql.y:6899 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:6848 { yyLOCAL = IntervalWeek } @@ -21731,7 +20374,7 @@ yydefault: case 1382: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6851 +//line sql.y:6852 { yyLOCAL = IntervalHour } @@ -21739,7 +20382,7 @@ yydefault: case 1383: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6855 +//line sql.y:6856 { yyLOCAL = IntervalMinute } @@ -21747,7 +20390,7 @@ yydefault: case 1384: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6859 +//line sql.y:6860 { yyLOCAL = IntervalMonth } @@ -21755,7 +20398,7 @@ yydefault: case 1385: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6863 +//line sql.y:6864 { yyLOCAL = IntervalQuarter } @@ -21763,7 +20406,7 @@ yydefault: case 1386: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6867 +//line sql.y:6868 { yyLOCAL = IntervalSecond } @@ -21771,7 +20414,7 @@ yydefault: case 1387: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6871 +//line sql.y:6872 { yyLOCAL = IntervalMicrosecond } @@ -21779,601 +20422,227 @@ yydefault: case 1388: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL IntervalTypes -//line sql.y:6875 +//line sql.y:6876 { yyLOCAL = IntervalYear } yyVAL.union = yyLOCAL case 1391: -<<<<<<< HEAD yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Expr -//line sql.y:6885 -======= - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6903 +//line sql.y:6886 { - yyLOCAL = IntervalHour + yyLOCAL = nil } yyVAL.union = yyLOCAL case 1392: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6907 + yyDollar = yyS[yypt-2 : yypt+1] + var yyLOCAL Expr +//line sql.y:6890 { - yyLOCAL = IntervalMinute + yyLOCAL = nil } yyVAL.union = yyLOCAL case 1393: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6911 + yyDollar = yyS[yypt-3 : yypt+1] + var yyLOCAL Expr +//line sql.y:6894 { - yyLOCAL = IntervalMonth + yyLOCAL = NewIntLiteral(yyDollar[2].str) } yyVAL.union = yyLOCAL case 1394: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6915 + yyDollar = yyS[yypt-3 : yypt+1] + var yyLOCAL Expr +//line sql.y:6898 { - yyLOCAL = IntervalQuarter + yyLOCAL = parseBindVariable(yylex, yyDollar[2].str[1:]) } yyVAL.union = yyLOCAL case 1395: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6919 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL Expr +//line sql.y:6908 { - yyLOCAL = IntervalSecond + yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].selectExprsUnion()} } yyVAL.union = yyLOCAL case 1396: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6923 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL Expr +//line sql.y:6912 { - yyLOCAL = IntervalMicrosecond + yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].selectExprsUnion()} } yyVAL.union = yyLOCAL case 1397: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6927 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL Expr +//line sql.y:6916 { - yyLOCAL = IntervalYear + yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].selectExprsUnion()} } yyVAL.union = yyLOCAL case 1398: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6933 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL Expr +//line sql.y:6920 { - yyLOCAL = IntervalDay + yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].selectExprsUnion()} } yyVAL.union = yyLOCAL case 1399: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6937 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL Expr +//line sql.y:6924 { - yyLOCAL = IntervalWeek + yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].selectExprsUnion()} } yyVAL.union = yyLOCAL case 1400: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6941 + yyDollar = yyS[yypt-0 : yypt+1] + var yyLOCAL MatchExprOption +//line sql.y:6930 { - yyLOCAL = IntervalHour + yyLOCAL = NoOption } yyVAL.union = yyLOCAL case 1401: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6945 + yyDollar = yyS[yypt-3 : yypt+1] + var yyLOCAL MatchExprOption +//line sql.y:6934 { - yyLOCAL = IntervalMinute + yyLOCAL = BooleanModeOpt } yyVAL.union = yyLOCAL case 1402: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6949 + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL MatchExprOption +//line sql.y:6938 { - yyLOCAL = IntervalMonth + yyLOCAL = NaturalLanguageModeOpt } yyVAL.union = yyLOCAL case 1403: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6953 + yyDollar = yyS[yypt-7 : yypt+1] + var yyLOCAL MatchExprOption +//line sql.y:6942 { - yyLOCAL = IntervalQuarter + yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt } yyVAL.union = yyLOCAL case 1404: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6957 + yyDollar = yyS[yypt-3 : yypt+1] + var yyLOCAL MatchExprOption +//line sql.y:6946 { - yyLOCAL = IntervalSecond + yyLOCAL = QueryExpansionOpt } yyVAL.union = yyLOCAL case 1405: yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6961 +//line sql.y:6952 { - yyLOCAL = IntervalMicrosecond + yyVAL.str = string(yyDollar[1].identifierCI.String()) } - yyVAL.union = yyLOCAL case 1406: yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6965 +//line sql.y:6956 { - yyLOCAL = IntervalYear + yyVAL.str = string(yyDollar[1].str) } - yyVAL.union = yyLOCAL case 1407: yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6969 +//line sql.y:6960 { - yyLOCAL = IntervalDay + yyVAL.str = string(yyDollar[1].str) } - yyVAL.union = yyLOCAL case 1408: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6973 + yyDollar = yyS[yypt-0 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6966 { - yyLOCAL = IntervalWeek + yyLOCAL = nil } yyVAL.union = yyLOCAL case 1409: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6977 + yyDollar = yyS[yypt-5 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6970 { - yyLOCAL = IntervalHour + yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: NewIntLiteral(yyDollar[4].str)} } yyVAL.union = yyLOCAL case 1410: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6981 + yyDollar = yyS[yypt-5 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6974 { - yyLOCAL = IntervalMinute + yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: NewIntLiteral(yyDollar[4].str)} } yyVAL.union = yyLOCAL case 1411: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6985 + yyDollar = yyS[yypt-2 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6980 { - yyLOCAL = IntervalMonth + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} } yyVAL.union = yyLOCAL case 1412: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6989 + yyDollar = yyS[yypt-3 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6984 { - yyLOCAL = IntervalQuarter + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion(), Charset: yyDollar[3].columnCharset} } yyVAL.union = yyLOCAL case 1413: yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6993 + var yyLOCAL *ConvertType +//line sql.y:6988 { - yyLOCAL = IntervalSecond + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } yyVAL.union = yyLOCAL case 1414: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:6997 + yyDollar = yyS[yypt-2 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6992 { - yyLOCAL = IntervalMicrosecond + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} } yyVAL.union = yyLOCAL case 1415: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL IntervalType -//line sql.y:7001 + yyDollar = yyS[yypt-2 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:6996 { - yyLOCAL = IntervalYear + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} + yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length + yyLOCAL.Scale = yyDollar[2].LengthScaleOption.Scale } yyVAL.union = yyLOCAL - case 1418: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL int -//line sql.y:7011 + case 1416: + yyDollar = yyS[yypt-1 : yypt+1] + var yyLOCAL *ConvertType +//line sql.y:7002 { - yyLOCAL = 0 + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } yyVAL.union = yyLOCAL - case 1419: + case 1417: yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL int -//line sql.y:7015 + var yyLOCAL *ConvertType +//line sql.y:7006 { - yyLOCAL = 0 - } - yyVAL.union = yyLOCAL - case 1420: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL int -//line sql.y:7019 - { - yyLOCAL = convertStringToInt(yyDollar[2].str) - } - yyVAL.union = yyLOCAL - case 1421: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:7029 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1422: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:7033 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1423: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:7037 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1424: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:7041 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1425: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:7045 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].exprsUnion()} - } - yyVAL.union = yyLOCAL - case 1426: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:7051 - { - yyLOCAL = NoOption - } - yyVAL.union = yyLOCAL - case 1427: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:7055 - { - yyLOCAL = BooleanModeOpt - } - yyVAL.union = yyLOCAL - case 1428: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:7059 - { - yyLOCAL = NaturalLanguageModeOpt - } - yyVAL.union = yyLOCAL - case 1429: - yyDollar = yyS[yypt-7 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:7063 - { - yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt - } - yyVAL.union = yyLOCAL - case 1430: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:7067 - { - yyLOCAL = QueryExpansionOpt - } - yyVAL.union = yyLOCAL - case 1431: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7073 - { - yyVAL.str = string(yyDollar[1].identifierCI.String()) - } - case 1432: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7077 - { - yyVAL.str = string(yyDollar[1].str) - } - case 1433: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7081 - { - yyVAL.str = string(yyDollar[1].str) - } - case 1434: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:7087 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL -<<<<<<< HEAD - case 1392: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL Expr -//line sql.y:6889 -======= - case 1435: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:7091 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL -<<<<<<< HEAD - case 1393: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL Expr -//line sql.y:6893 -======= - case 1436: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:7095 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = NewIntLiteral(yyDollar[2].str) - } - yyVAL.union = yyLOCAL - case 1394: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL Expr -//line sql.y:6897 - { - yyLOCAL = parseBindVariable(yylex, yyDollar[2].str[1:]) - } - yyVAL.union = yyLOCAL - case 1395: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6907 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("if"), Exprs: yyDollar[3].selectExprsUnion()} - } - yyVAL.union = yyLOCAL - case 1396: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6911 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("database"), Exprs: yyDollar[3].selectExprsUnion()} - } - yyVAL.union = yyLOCAL - case 1397: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6915 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("schema"), Exprs: yyDollar[3].selectExprsUnion()} - } - yyVAL.union = yyLOCAL - case 1398: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6919 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("mod"), Exprs: yyDollar[3].selectExprsUnion()} - } - yyVAL.union = yyLOCAL - case 1399: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Expr -//line sql.y:6923 - { - yyLOCAL = &FuncExpr{Name: NewIdentifierCI("replace"), Exprs: yyDollar[3].selectExprsUnion()} - } - yyVAL.union = yyLOCAL - case 1400: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:6929 - { - yyLOCAL = NoOption - } - yyVAL.union = yyLOCAL - case 1401: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:6933 - { - yyLOCAL = BooleanModeOpt - } - yyVAL.union = yyLOCAL - case 1402: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:6937 - { - yyLOCAL = NaturalLanguageModeOpt - } - yyVAL.union = yyLOCAL - case 1403: - yyDollar = yyS[yypt-7 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:6941 - { - yyLOCAL = NaturalLanguageModeWithQueryExpansionOpt - } - yyVAL.union = yyLOCAL - case 1404: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL MatchExprOption -//line sql.y:6945 - { - yyLOCAL = QueryExpansionOpt - } - yyVAL.union = yyLOCAL - case 1405: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:6951 - { - yyVAL.str = string(yyDollar[1].identifierCI.String()) - } - case 1406: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:6955 - { - yyVAL.str = string(yyDollar[1].str) - } - case 1407: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:6959 - { - yyVAL.str = string(yyDollar[1].str) - } - case 1408: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:6965 - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL - case 1409: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:6969 - { - yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: NewIntLiteral(yyDollar[4].str)} - } - yyVAL.union = yyLOCAL - case 1410: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *ConvertType -//line sql.y:6973 - { - yyLOCAL = &ConvertType{Type: string(yyDollar[2].str), Length: NewIntLiteral(yyDollar[4].str)} - } - yyVAL.union = yyLOCAL - case 1411: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6979 -======= -//line sql.y:7101 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} - } - yyVAL.union = yyLOCAL - case 1412: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6983 -======= -//line sql.y:7105 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion(), Charset: yyDollar[3].columnCharset} - } - yyVAL.union = yyLOCAL - case 1413: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6987 -======= -//line sql.y:7109 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} - } - yyVAL.union = yyLOCAL - case 1414: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6991 -======= -//line sql.y:7113 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} - } - yyVAL.union = yyLOCAL - case 1415: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:6995 -======= -//line sql.y:7117 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} - yyLOCAL.Length = yyDollar[2].LengthScaleOption.Length - yyLOCAL.Scale = yyDollar[2].LengthScaleOption.Scale - } - yyVAL.union = yyLOCAL - case 1416: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7001 -======= -//line sql.y:7123 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} - } - yyVAL.union = yyLOCAL - case 1417: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7005 -======= -//line sql.y:7127 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} + yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} } yyVAL.union = yyLOCAL case 1418: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7009 -======= -//line sql.y:7131 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7010 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22381,11 +20650,7 @@ yydefault: case 1419: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7013 -======= -//line sql.y:7135 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7014 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22393,11 +20658,7 @@ yydefault: case 1420: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7017 -======= -//line sql.y:7139 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7018 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} } @@ -22405,11 +20666,7 @@ yydefault: case 1421: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7021 -======= -//line sql.y:7143 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7022 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22417,11 +20674,7 @@ yydefault: case 1422: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7025 -======= -//line sql.y:7147 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7026 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22429,11 +20682,7 @@ yydefault: case 1423: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7029 -======= -//line sql.y:7151 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7030 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str), Length: yyDollar[2].literalUnion()} } @@ -22441,11 +20690,7 @@ yydefault: case 1424: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7033 -======= -//line sql.y:7155 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7034 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22453,11 +20698,7 @@ yydefault: case 1425: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ConvertType -<<<<<<< HEAD -//line sql.y:7037 -======= -//line sql.y:7159 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7038 { yyLOCAL = &ConvertType{Type: string(yyDollar[1].str)} } @@ -22465,11 +20706,7 @@ yydefault: case 1426: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7043 -======= -//line sql.y:7165 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7044 { yyLOCAL = false } @@ -22477,11 +20714,7 @@ yydefault: case 1427: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7047 -======= -//line sql.y:7169 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7048 { yyLOCAL = true } @@ -22489,11 +20722,7 @@ yydefault: case 1428: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7052 -======= -//line sql.y:7174 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7053 { yyLOCAL = nil } @@ -22501,54 +20730,34 @@ yydefault: case 1429: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7056 -======= -//line sql.y:7178 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7057 { yyLOCAL = yyDollar[1].exprUnion() } yyVAL.union = yyLOCAL case 1430: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7061 -======= -//line sql.y:7183 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7062 { yyVAL.str = string("") } case 1431: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7065 -======= -//line sql.y:7187 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7066 { yyVAL.str = encodeSQLString(yyDollar[2].str) } case 1432: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL []*When -<<<<<<< HEAD -//line sql.y:7071 -======= -//line sql.y:7193 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7072 { yyLOCAL = []*When{yyDollar[1].whenUnion()} } yyVAL.union = yyLOCAL case 1433: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7075 -======= -//line sql.y:7197 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7076 { yySLICE := (*[]*When)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[2].whenUnion()) @@ -22556,11 +20765,7 @@ yydefault: case 1434: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL *When -<<<<<<< HEAD -//line sql.y:7081 -======= -//line sql.y:7203 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7082 { yyLOCAL = &When{Cond: yyDollar[2].exprUnion(), Val: yyDollar[4].exprUnion()} } @@ -22568,11 +20773,7 @@ yydefault: case 1435: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7086 -======= -//line sql.y:7208 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7087 { yyLOCAL = nil } @@ -22580,11 +20781,7 @@ yydefault: case 1436: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7090 -======= -//line sql.y:7212 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7091 { yyLOCAL = yyDollar[2].exprUnion() } @@ -22592,11 +20789,7 @@ yydefault: case 1437: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ColName -<<<<<<< HEAD -//line sql.y:7096 -======= -//line sql.y:7218 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7097 { yyLOCAL = &ColName{Name: yyDollar[1].identifierCI} } @@ -22604,11 +20797,7 @@ yydefault: case 1438: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *ColName -<<<<<<< HEAD -//line sql.y:7100 -======= -//line sql.y:7222 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7101 { yyLOCAL = &ColName{Name: NewIdentifierCI(string(yyDollar[1].str))} } @@ -22616,11 +20805,7 @@ yydefault: case 1439: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL *ColName -<<<<<<< HEAD -//line sql.y:7104 -======= -//line sql.y:7226 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7105 { yyLOCAL = &ColName{Qualifier: TableName{Name: yyDollar[1].identifierCS}, Name: yyDollar[3].identifierCI} } @@ -22628,11 +20813,7 @@ yydefault: case 1440: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL *ColName -<<<<<<< HEAD -//line sql.y:7108 -======= -//line sql.y:7230 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7109 { yyLOCAL = &ColName{Qualifier: TableName{Qualifier: yyDollar[1].identifierCS, Name: yyDollar[3].identifierCS}, Name: yyDollar[5].identifierCI} } @@ -22640,11 +20821,7 @@ yydefault: case 1441: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7114 -======= -//line sql.y:7236 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7115 { yyLOCAL = yyDollar[1].colNameUnion() } @@ -22652,11 +20829,7 @@ yydefault: case 1442: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7118 -======= -//line sql.y:7240 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7119 { yyLOCAL = &Offset{V: convertStringToInt(yyDollar[1].str)} } @@ -22664,11 +20837,7 @@ yydefault: case 1443: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7124 -======= -//line sql.y:7246 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7125 { // TODO(sougou): Deprecate this construct. if yyDollar[1].identifierCI.Lowered() != "value" { @@ -22681,11 +20850,7 @@ yydefault: case 1444: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7133 -======= -//line sql.y:7255 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7134 { yyLOCAL = NewIntLiteral(yyDollar[1].str) } @@ -22693,11 +20858,7 @@ yydefault: case 1445: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7137 -======= -//line sql.y:7259 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7138 { yyLOCAL = parseBindVariable(yylex, yyDollar[1].str[1:]) } @@ -22705,11 +20866,7 @@ yydefault: case 1446: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Exprs -<<<<<<< HEAD -//line sql.y:7142 -======= -//line sql.y:7264 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7143 { yyLOCAL = nil } @@ -22717,11 +20874,7 @@ yydefault: case 1447: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL Exprs -<<<<<<< HEAD -//line sql.y:7146 -======= -//line sql.y:7268 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7147 { yyLOCAL = yyDollar[3].exprsUnion() } @@ -22729,11 +20882,7 @@ yydefault: case 1448: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7151 -======= -//line sql.y:7273 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7152 { yyLOCAL = nil } @@ -22741,11 +20890,7 @@ yydefault: case 1449: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7155 -======= -//line sql.y:7277 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7156 { yyLOCAL = yyDollar[2].exprUnion() } @@ -22753,11 +20898,7 @@ yydefault: case 1450: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *NamedWindow -<<<<<<< HEAD -//line sql.y:7161 -======= -//line sql.y:7283 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7162 { yyLOCAL = &NamedWindow{yyDollar[2].windowDefinitionsUnion()} } @@ -22765,22 +20906,14 @@ yydefault: case 1451: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL NamedWindows -<<<<<<< HEAD -//line sql.y:7167 -======= -//line sql.y:7289 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7168 { yyLOCAL = NamedWindows{yyDollar[1].namedWindowUnion()} } yyVAL.union = yyLOCAL case 1452: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7171 -======= -//line sql.y:7293 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7172 { yySLICE := (*NamedWindows)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].namedWindowUnion()) @@ -22788,11 +20921,7 @@ yydefault: case 1453: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL NamedWindows -<<<<<<< HEAD -//line sql.y:7176 -======= -//line sql.y:7298 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7177 { yyLOCAL = nil } @@ -22800,11 +20929,7 @@ yydefault: case 1454: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL NamedWindows -<<<<<<< HEAD -//line sql.y:7180 -======= -//line sql.y:7302 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7181 { yyLOCAL = yyDollar[1].namedWindowsUnion() } @@ -22812,11 +20937,7 @@ yydefault: case 1455: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL OrderBy -<<<<<<< HEAD -//line sql.y:7185 -======= -//line sql.y:7307 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7186 { yyLOCAL = nil } @@ -22824,11 +20945,7 @@ yydefault: case 1456: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL OrderBy -<<<<<<< HEAD -//line sql.y:7189 -======= -//line sql.y:7311 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7190 { yyLOCAL = yyDollar[1].orderByUnion() } @@ -22836,11 +20953,7 @@ yydefault: case 1457: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL OrderBy -<<<<<<< HEAD -//line sql.y:7195 -======= -//line sql.y:7317 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7196 { yyLOCAL = yyDollar[3].orderByUnion() } @@ -22848,22 +20961,14 @@ yydefault: case 1458: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL OrderBy -<<<<<<< HEAD -//line sql.y:7201 -======= -//line sql.y:7323 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7202 { yyLOCAL = OrderBy{yyDollar[1].orderUnion()} } yyVAL.union = yyLOCAL case 1459: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7205 -======= -//line sql.y:7327 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7206 { yySLICE := (*OrderBy)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].orderUnion()) @@ -22871,11 +20976,7 @@ yydefault: case 1460: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *Order -<<<<<<< HEAD -//line sql.y:7211 -======= -//line sql.y:7333 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7212 { yyLOCAL = &Order{Expr: yyDollar[1].exprUnion(), Direction: yyDollar[2].orderDirectionUnion()} } @@ -22883,11 +20984,7 @@ yydefault: case 1461: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL OrderDirection -<<<<<<< HEAD -//line sql.y:7216 -======= -//line sql.y:7338 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7217 { yyLOCAL = AscOrder } @@ -22895,473 +20992,253 @@ yydefault: case 1462: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL OrderDirection -<<<<<<< HEAD -//line sql.y:7220 -======= -//line sql.y:7342 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7221 { yyLOCAL = AscOrder } - yyVAL.union = yyLOCAL - case 1463: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL OrderDirection -<<<<<<< HEAD -//line sql.y:7224 -======= -//line sql.y:7346 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = DescOrder - } - yyVAL.union = yyLOCAL - case 1464: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *Limit -<<<<<<< HEAD -//line sql.y:7229 -======= -//line sql.y:7351 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL - case 1465: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL *Limit -<<<<<<< HEAD -//line sql.y:7233 -======= -//line sql.y:7355 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = yyDollar[1].limitUnion() - } - yyVAL.union = yyLOCAL - case 1466: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *Limit -<<<<<<< HEAD -//line sql.y:7239 -======= -//line sql.y:7361 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &Limit{Rowcount: yyDollar[2].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1467: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL *Limit -<<<<<<< HEAD -//line sql.y:7243 -======= -//line sql.y:7365 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &Limit{Offset: yyDollar[2].exprUnion(), Rowcount: yyDollar[4].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1468: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL *Limit -<<<<<<< HEAD -//line sql.y:7247 -======= -//line sql.y:7369 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) - { - yyLOCAL = &Limit{Offset: yyDollar[4].exprUnion(), Rowcount: yyDollar[2].exprUnion()} - } - yyVAL.union = yyLOCAL - case 1469: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL []AlterOption -<<<<<<< HEAD -//line sql.y:7252 - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL - case 1470: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL []AlterOption -//line sql.y:7256 - { - yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()} - } - yyVAL.union = yyLOCAL - case 1471: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL []AlterOption -//line sql.y:7260 - { - yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()} - } - yyVAL.union = yyLOCAL - case 1472: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL []AlterOption -//line sql.y:7264 - { - yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()} - } - yyVAL.union = yyLOCAL - case 1473: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL []AlterOption -//line sql.y:7268 - { - yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()} - } - yyVAL.union = yyLOCAL - case 1474: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7275 - { - yyLOCAL = &LockOption{Type: DefaultType} - } - yyVAL.union = yyLOCAL - case 1475: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7279 - { - yyLOCAL = &LockOption{Type: NoneType} - } - yyVAL.union = yyLOCAL - case 1476: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7283 - { - yyLOCAL = &LockOption{Type: SharedType} - } - yyVAL.union = yyLOCAL - case 1477: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7287 - { - yyLOCAL = &LockOption{Type: ExclusiveType} - } - yyVAL.union = yyLOCAL - case 1478: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7293 - { - yyLOCAL = AlgorithmValue(yyDollar[3].str) - } - yyVAL.union = yyLOCAL - case 1479: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7297 - { - yyLOCAL = AlgorithmValue(yyDollar[3].str) - } - yyVAL.union = yyLOCAL - case 1480: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7301 - { - yyLOCAL = AlgorithmValue(yyDollar[3].str) - } - yyVAL.union = yyLOCAL - case 1481: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL AlterOption -//line sql.y:7305 - { - yyLOCAL = AlgorithmValue(yyDollar[3].str) - } - yyVAL.union = yyLOCAL - case 1482: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7310 - { - yyVAL.str = "" - } - case 1483: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7314 - { - yyVAL.str = string(yyDollar[3].str) - } - case 1484: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7318 - { - yyVAL.str = string(yyDollar[3].str) - } - case 1485: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7322 - { - yyVAL.str = string(yyDollar[3].str) - } - case 1486: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7327 - { - yyVAL.str = "" - } - case 1487: - yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7331 - { - yyVAL.str = yyDollar[3].str - } - case 1488: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7337 - { - yyVAL.str = string(yyDollar[1].str) - } - case 1489: + yyVAL.union = yyLOCAL + case 1463: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7341 + var yyLOCAL OrderDirection +//line sql.y:7225 { - yyVAL.str = string(yyDollar[1].str) + yyLOCAL = DescOrder } - case 1490: + yyVAL.union = yyLOCAL + case 1464: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7346 + var yyLOCAL *Limit +//line sql.y:7230 { - yyVAL.str = "" + yyLOCAL = nil } - case 1491: - yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:7350 + yyVAL.union = yyLOCAL + case 1465: + yyDollar = yyS[yypt-1 : yypt+1] + var yyLOCAL *Limit +//line sql.y:7234 { - yyVAL.str = yyDollar[2].str + yyLOCAL = yyDollar[1].limitUnion() } - case 1492: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7355 + yyVAL.union = yyLOCAL + case 1466: + yyDollar = yyS[yypt-2 : yypt+1] + var yyLOCAL *Limit +//line sql.y:7240 { - yyVAL.str = "cascaded" + yyLOCAL = &Limit{Rowcount: yyDollar[2].exprUnion()} } - case 1493: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7359 + yyVAL.union = yyLOCAL + case 1467: + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL *Limit +//line sql.y:7244 { - yyVAL.str = string(yyDollar[1].str) + yyLOCAL = &Limit{Offset: yyDollar[2].exprUnion(), Rowcount: yyDollar[4].exprUnion()} } - case 1494: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7363 + yyVAL.union = yyLOCAL + case 1468: + yyDollar = yyS[yypt-4 : yypt+1] + var yyLOCAL *Limit +//line sql.y:7248 { - yyVAL.str = string(yyDollar[1].str) + yyLOCAL = &Limit{Offset: yyDollar[4].exprUnion(), Rowcount: yyDollar[2].exprUnion()} } - case 1495: + yyVAL.union = yyLOCAL + case 1469: yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL *Definer -//line sql.y:7368 -======= -//line sql.y:7374 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) + var yyLOCAL []AlterOption +//line sql.y:7253 { yyLOCAL = nil } yyVAL.union = yyLOCAL - case 1496: -<<<<<<< HEAD - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL *Definer -//line sql.y:7372 -======= + case 1470: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL []AlterOption -//line sql.y:7378 +//line sql.y:7257 { yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()} } yyVAL.union = yyLOCAL - case 1497: + case 1471: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL []AlterOption -//line sql.y:7382 +//line sql.y:7261 { yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion(), yyDollar[2].alterOptionUnion()} } yyVAL.union = yyLOCAL - case 1498: + case 1472: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL []AlterOption -//line sql.y:7386 +//line sql.y:7265 { yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()} } yyVAL.union = yyLOCAL - case 1499: + case 1473: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL []AlterOption -//line sql.y:7390 +//line sql.y:7269 { yyLOCAL = []AlterOption{yyDollar[1].alterOptionUnion()} } yyVAL.union = yyLOCAL - case 1500: + case 1474: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7397 +//line sql.y:7276 { yyLOCAL = &LockOption{Type: DefaultType} } yyVAL.union = yyLOCAL - case 1501: + case 1475: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7401 +//line sql.y:7280 { yyLOCAL = &LockOption{Type: NoneType} } yyVAL.union = yyLOCAL - case 1502: + case 1476: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7405 +//line sql.y:7284 { yyLOCAL = &LockOption{Type: SharedType} } yyVAL.union = yyLOCAL - case 1503: + case 1477: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7409 +//line sql.y:7288 { yyLOCAL = &LockOption{Type: ExclusiveType} } yyVAL.union = yyLOCAL - case 1504: + case 1478: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7415 +//line sql.y:7294 { yyLOCAL = AlgorithmValue(yyDollar[3].str) } yyVAL.union = yyLOCAL - case 1505: + case 1479: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7419 +//line sql.y:7298 { yyLOCAL = AlgorithmValue(yyDollar[3].str) } yyVAL.union = yyLOCAL - case 1506: + case 1480: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7423 +//line sql.y:7302 { yyLOCAL = AlgorithmValue(yyDollar[3].str) } yyVAL.union = yyLOCAL - case 1507: + case 1481: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL AlterOption -//line sql.y:7427 +//line sql.y:7306 { yyLOCAL = AlgorithmValue(yyDollar[3].str) } yyVAL.union = yyLOCAL - case 1508: + case 1482: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7432 +//line sql.y:7311 { yyVAL.str = "" } - case 1509: + case 1483: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7436 +//line sql.y:7315 { yyVAL.str = string(yyDollar[3].str) } - case 1510: + case 1484: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7440 +//line sql.y:7319 { yyVAL.str = string(yyDollar[3].str) } - case 1511: + case 1485: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7444 +//line sql.y:7323 { yyVAL.str = string(yyDollar[3].str) } - case 1512: + case 1486: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7449 +//line sql.y:7328 { yyVAL.str = "" } - case 1513: + case 1487: yyDollar = yyS[yypt-3 : yypt+1] -//line sql.y:7453 +//line sql.y:7332 { yyVAL.str = yyDollar[3].str } - case 1514: + case 1488: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7459 +//line sql.y:7338 { yyVAL.str = string(yyDollar[1].str) } - case 1515: + case 1489: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7463 +//line sql.y:7342 { yyVAL.str = string(yyDollar[1].str) } - case 1516: + case 1490: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7468 +//line sql.y:7347 { yyVAL.str = "" } - case 1517: + case 1491: yyDollar = yyS[yypt-4 : yypt+1] -//line sql.y:7472 +//line sql.y:7351 { yyVAL.str = yyDollar[2].str } - case 1518: + case 1492: yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:7477 +//line sql.y:7356 { yyVAL.str = "cascaded" } - case 1519: + case 1493: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7481 +//line sql.y:7360 { yyVAL.str = string(yyDollar[1].str) } - case 1520: + case 1494: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:7485 +//line sql.y:7364 { yyVAL.str = string(yyDollar[1].str) } - case 1521: + case 1495: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL *Definer -//line sql.y:7490 +//line sql.y:7369 { yyLOCAL = nil } yyVAL.union = yyLOCAL - case 1522: + case 1496: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL *Definer -//line sql.y:7494 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7373 { yyLOCAL = yyDollar[3].definerUnion() } @@ -23369,11 +21246,7 @@ yydefault: case 1497: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *Definer -<<<<<<< HEAD -//line sql.y:7378 -======= -//line sql.y:7500 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7379 { yyLOCAL = &Definer{ Name: string(yyDollar[1].str), @@ -23383,11 +21256,7 @@ yydefault: case 1498: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL *Definer -<<<<<<< HEAD -//line sql.y:7384 -======= -//line sql.y:7506 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7385 { yyLOCAL = &Definer{ Name: string(yyDollar[1].str), @@ -23397,11 +21266,7 @@ yydefault: case 1499: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *Definer -<<<<<<< HEAD -//line sql.y:7390 -======= -//line sql.y:7512 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7391 { yyLOCAL = &Definer{ Name: yyDollar[1].str, @@ -23411,107 +21276,40 @@ yydefault: yyVAL.union = yyLOCAL case 1500: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7399 -======= -//line sql.y:7521 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7400 { yyVAL.str = encodeSQLString(yyDollar[1].str) } case 1501: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7403 -======= -//line sql.y:7525 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7404 { yyVAL.str = formatIdentifier(yyDollar[1].str) } case 1502: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7408 -======= -//line sql.y:7530 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7409 { yyVAL.str = "" } case 1503: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7412 -======= -//line sql.y:7534 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7413 { yyVAL.str = formatAddress(yyDollar[1].str) } case 1504: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL Lock -<<<<<<< HEAD -//line sql.y:7418 -======= -//line sql.y:7540 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7419 { yyLOCAL = ForUpdateLock } yyVAL.union = yyLOCAL -<<<<<<< HEAD case 1505: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL Lock -//line sql.y:7422 -======= - case 1531: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL Lock -//line sql.y:7544 - { - yyLOCAL = ForUpdateLockNoWait - } - yyVAL.union = yyLOCAL - case 1532: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Lock -//line sql.y:7548 - { - yyLOCAL = ForUpdateLockSkipLocked - } - yyVAL.union = yyLOCAL - case 1533: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL Lock -//line sql.y:7552 - { - yyLOCAL = ForShareLock - } - yyVAL.union = yyLOCAL - case 1534: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL Lock -//line sql.y:7556 - { - yyLOCAL = ForShareLockNoWait - } - yyVAL.union = yyLOCAL - case 1535: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Lock -//line sql.y:7560 - { - yyLOCAL = ForShareLockSkipLocked - } - yyVAL.union = yyLOCAL - case 1536: - yyDollar = yyS[yypt-4 : yypt+1] - var yyLOCAL Lock -//line sql.y:7564 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7423 { yyLOCAL = ShareModeLock } @@ -23519,11 +21317,7 @@ yydefault: case 1506: yyDollar = yyS[yypt-9 : yypt+1] var yyLOCAL *SelectInto -<<<<<<< HEAD -//line sql.y:7428 -======= -//line sql.y:7570 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7429 { yyLOCAL = &SelectInto{Type: IntoOutfileS3, FileName: encodeSQLString(yyDollar[4].str), Charset: yyDollar[5].columnCharset, FormatOption: yyDollar[6].str, ExportOption: yyDollar[7].str, Manifest: yyDollar[8].str, Overwrite: yyDollar[9].str} } @@ -23531,11 +21325,7 @@ yydefault: case 1507: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL *SelectInto -<<<<<<< HEAD -//line sql.y:7432 -======= -//line sql.y:7574 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7433 { yyLOCAL = &SelectInto{Type: IntoDumpfile, FileName: encodeSQLString(yyDollar[3].str), Charset: ColumnCharset{}, FormatOption: "", ExportOption: "", Manifest: "", Overwrite: ""} } @@ -23543,293 +21333,177 @@ yydefault: case 1508: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL *SelectInto -<<<<<<< HEAD -//line sql.y:7436 -======= -//line sql.y:7578 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7437 { yyLOCAL = &SelectInto{Type: IntoOutfile, FileName: encodeSQLString(yyDollar[3].str), Charset: yyDollar[4].columnCharset, FormatOption: "", ExportOption: yyDollar[5].str, Manifest: "", Overwrite: ""} } yyVAL.union = yyLOCAL case 1509: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7441 -======= -//line sql.y:7583 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7442 { yyVAL.str = "" } case 1510: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7445 -======= -//line sql.y:7587 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7446 { yyVAL.str = " format csv" + yyDollar[3].str } case 1511: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7449 -======= -//line sql.y:7591 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7450 { yyVAL.str = " format text" + yyDollar[3].str } case 1512: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7454 -======= -//line sql.y:7596 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7455 { yyVAL.str = "" } case 1513: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7458 -======= -//line sql.y:7600 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7459 { yyVAL.str = " header" } case 1514: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7463 -======= -//line sql.y:7605 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7464 { yyVAL.str = "" } case 1515: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7467 -======= -//line sql.y:7609 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7468 { yyVAL.str = " manifest on" } case 1516: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7471 -======= -//line sql.y:7613 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7472 { yyVAL.str = " manifest off" } case 1517: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7476 -======= -//line sql.y:7618 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7477 { yyVAL.str = "" } case 1518: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7480 -======= -//line sql.y:7622 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7481 { yyVAL.str = " overwrite on" } case 1519: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7484 -======= -//line sql.y:7626 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7485 { yyVAL.str = " overwrite off" } case 1520: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7490 -======= -//line sql.y:7632 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7491 { yyVAL.str = yyDollar[1].str + yyDollar[2].str } case 1521: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7495 -======= -//line sql.y:7637 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7496 { yyVAL.str = "" } case 1522: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7499 -======= -//line sql.y:7641 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7500 { yyVAL.str = " lines" + yyDollar[2].str } case 1523: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7505 -======= -//line sql.y:7647 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7506 { yyVAL.str = yyDollar[1].str } case 1524: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7509 -======= -//line sql.y:7651 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7510 { yyVAL.str = yyDollar[1].str + yyDollar[2].str } case 1525: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7515 -======= -//line sql.y:7657 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7516 { yyVAL.str = " starting by " + encodeSQLString(yyDollar[3].str) } case 1526: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7519 -======= -//line sql.y:7661 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7520 { yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str) } case 1527: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7524 -======= -//line sql.y:7666 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7525 { yyVAL.str = "" } case 1528: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7528 -======= -//line sql.y:7670 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7529 { yyVAL.str = " " + yyDollar[1].str + yyDollar[2].str } case 1529: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7534 -======= -//line sql.y:7676 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7535 { yyVAL.str = yyDollar[1].str } case 1530: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7538 -======= -//line sql.y:7680 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7539 { yyVAL.str = yyDollar[1].str + yyDollar[2].str } case 1531: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7544 -======= -//line sql.y:7686 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7545 { yyVAL.str = " terminated by " + encodeSQLString(yyDollar[3].str) } case 1532: yyDollar = yyS[yypt-4 : yypt+1] -<<<<<<< HEAD -//line sql.y:7548 -======= -//line sql.y:7690 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7549 { yyVAL.str = yyDollar[1].str + " enclosed by " + encodeSQLString(yyDollar[4].str) } case 1533: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7552 -======= -//line sql.y:7694 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7553 { yyVAL.str = " escaped by " + encodeSQLString(yyDollar[3].str) } case 1534: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7557 -======= -//line sql.y:7699 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7558 { yyVAL.str = "" } case 1535: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7561 -======= -//line sql.y:7703 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7562 { yyVAL.str = " optionally" } case 1536: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *Insert -<<<<<<< HEAD -//line sql.y:7574 -======= -//line sql.y:7716 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7575 { yyLOCAL = &Insert{Rows: yyDollar[2].valuesUnion()} } @@ -23837,34 +21511,15 @@ yydefault: case 1537: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL *Insert -<<<<<<< HEAD -//line sql.y:7578 -======= -//line sql.y:7720 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7579 { yyLOCAL = &Insert{Rows: yyDollar[1].selStmtUnion()} } yyVAL.union = yyLOCAL -<<<<<<< HEAD case 1538: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL *Insert -//line sql.y:7582 -======= - case 1569: - yyDollar = yyS[yypt-6 : yypt+1] - var yyLOCAL *Insert -//line sql.y:7724 - { - yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[5].valuesUnion(), RowAlias: yyDollar[6].rowAliasUnion()} - } - yyVAL.union = yyLOCAL - case 1570: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *Insert -//line sql.y:7728 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7583 { yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[5].valuesUnion()} } @@ -23872,8 +21527,7 @@ yydefault: case 1539: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL *Insert -<<<<<<< HEAD -//line sql.y:7586 +//line sql.y:7587 { yyLOCAL = &Insert{Columns: []IdentifierCI{}, Rows: yyDollar[4].valuesUnion()} } @@ -23881,10 +21535,7 @@ yydefault: case 1540: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL *Insert -//line sql.y:7590 -======= -//line sql.y:7732 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7591 { yyLOCAL = &Insert{Columns: yyDollar[2].columnsUnion(), Rows: yyDollar[4].selStmtUnion()} } @@ -23892,11 +21543,7 @@ yydefault: case 1541: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Columns -<<<<<<< HEAD -//line sql.y:7596 -======= -//line sql.y:7738 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7597 { yyLOCAL = Columns{yyDollar[1].identifierCI} } @@ -23904,85 +21551,37 @@ yydefault: case 1542: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL Columns -<<<<<<< HEAD -//line sql.y:7600 -======= -//line sql.y:7742 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7601 { yyLOCAL = Columns{yyDollar[3].identifierCI} } yyVAL.union = yyLOCAL case 1543: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7604 -======= -//line sql.y:7746 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7605 { yySLICE := (*Columns)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].identifierCI) } case 1544: yyDollar = yyS[yypt-5 : yypt+1] -<<<<<<< HEAD -//line sql.y:7608 -======= -//line sql.y:7750 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7609 { yySLICE := (*Columns)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[5].identifierCI) } case 1545: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD var yyLOCAL UpdateExprs -//line sql.y:7613 -======= - var yyLOCAL *RowAlias -//line sql.y:7755 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7614 { yyLOCAL = nil } yyVAL.union = yyLOCAL -<<<<<<< HEAD case 1546: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL UpdateExprs -//line sql.y:7617 -======= - case 1577: - yyDollar = yyS[yypt-2 : yypt+1] - var yyLOCAL *RowAlias -//line sql.y:7759 - { - yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS} - } - yyVAL.union = yyLOCAL - case 1578: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL *RowAlias -//line sql.y:7763 - { - yyLOCAL = &RowAlias{TableName: yyDollar[2].identifierCS, Columns: yyDollar[4].columnsUnion()} - } - yyVAL.union = yyLOCAL - case 1579: - yyDollar = yyS[yypt-0 : yypt+1] - var yyLOCAL UpdateExprs -//line sql.y:7768 - { - yyLOCAL = nil - } - yyVAL.union = yyLOCAL - case 1580: - yyDollar = yyS[yypt-5 : yypt+1] - var yyLOCAL UpdateExprs -//line sql.y:7772 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7618 { yyLOCAL = yyDollar[5].updateExprsUnion() } @@ -23990,22 +21589,14 @@ yydefault: case 1547: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Values -<<<<<<< HEAD -//line sql.y:7623 -======= -//line sql.y:7778 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7624 { yyLOCAL = Values{yyDollar[1].valTupleUnion()} } yyVAL.union = yyLOCAL case 1548: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7627 -======= -//line sql.y:7782 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7628 { yySLICE := (*Values)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].valTupleUnion()) @@ -24013,11 +21604,7 @@ yydefault: case 1549: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL ValTuple -<<<<<<< HEAD -//line sql.y:7633 -======= -//line sql.y:7788 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7634 { yyLOCAL = yyDollar[1].valTupleUnion() } @@ -24025,11 +21612,7 @@ yydefault: case 1550: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL ValTuple -<<<<<<< HEAD -//line sql.y:7637 -======= -//line sql.y:7792 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7638 { yyLOCAL = ValTuple{} } @@ -24037,11 +21620,7 @@ yydefault: case 1551: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL ValTuple -<<<<<<< HEAD -//line sql.y:7643 -======= -//line sql.y:7798 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7644 { yyLOCAL = ValTuple(yyDollar[2].exprsUnion()) } @@ -24049,11 +21628,7 @@ yydefault: case 1552: yyDollar = yyS[yypt-4 : yypt+1] var yyLOCAL ValTuple -<<<<<<< HEAD -//line sql.y:7647 -======= -//line sql.y:7802 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7648 { yyLOCAL = ValTuple(yyDollar[3].exprsUnion()) } @@ -24061,11 +21636,7 @@ yydefault: case 1553: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7652 -======= -//line sql.y:7807 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7653 { if len(yyDollar[1].valTupleUnion()) == 1 { yyLOCAL = yyDollar[1].valTupleUnion()[0] @@ -24077,22 +21648,14 @@ yydefault: case 1554: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL UpdateExprs -<<<<<<< HEAD -//line sql.y:7662 -======= -//line sql.y:7817 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7663 { yyLOCAL = UpdateExprs{yyDollar[1].updateExprUnion()} } yyVAL.union = yyLOCAL case 1555: yyDollar = yyS[yypt-3 : yypt+1] -<<<<<<< HEAD -//line sql.y:7666 -======= -//line sql.y:7821 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7667 { yySLICE := (*UpdateExprs)(yyIaddr(yyVAL.union)) *yySLICE = append(*yySLICE, yyDollar[3].updateExprUnion()) @@ -24100,33 +21663,21 @@ yydefault: case 1556: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL *UpdateExpr -<<<<<<< HEAD -//line sql.y:7672 -======= -//line sql.y:7827 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7673 { yyLOCAL = &UpdateExpr{Name: yyDollar[1].colNameUnion(), Expr: yyDollar[3].exprUnion()} } yyVAL.union = yyLOCAL case 1558: yyDollar = yyS[yypt-2 : yypt+1] -<<<<<<< HEAD -//line sql.y:7679 -======= -//line sql.y:7834 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7680 { yyVAL.str = "charset" } case 1561: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7689 -======= -//line sql.y:7844 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7690 { yyLOCAL = NewStrLiteral(yyDollar[1].identifierCI.String()) } @@ -24134,11 +21685,7 @@ yydefault: case 1562: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7693 -======= -//line sql.y:7848 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7694 { yyLOCAL = NewStrLiteral(yyDollar[1].str) } @@ -24146,11 +21693,7 @@ yydefault: case 1563: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Expr -<<<<<<< HEAD -//line sql.y:7697 -======= -//line sql.y:7852 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7698 { yyLOCAL = &Default{} } @@ -24158,11 +21701,7 @@ yydefault: case 1566: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7706 -======= -//line sql.y:7861 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7707 { yyLOCAL = false } @@ -24170,11 +21709,7 @@ yydefault: case 1567: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7708 -======= -//line sql.y:7863 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7709 { yyLOCAL = true } @@ -24182,11 +21717,7 @@ yydefault: case 1568: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7711 -======= -//line sql.y:7866 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7712 { yyLOCAL = false } @@ -24194,11 +21725,7 @@ yydefault: case 1569: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7713 -======= -//line sql.y:7868 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7714 { yyLOCAL = true } @@ -24206,11 +21733,7 @@ yydefault: case 1570: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7716 -======= -//line sql.y:7871 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7717 { yyLOCAL = false } @@ -24218,11 +21741,7 @@ yydefault: case 1571: yyDollar = yyS[yypt-3 : yypt+1] var yyLOCAL bool -<<<<<<< HEAD -//line sql.y:7718 -======= -//line sql.y:7873 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7719 { yyLOCAL = true } @@ -24230,11 +21749,7 @@ yydefault: case 1572: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Ignore -<<<<<<< HEAD -//line sql.y:7721 -======= -//line sql.y:7876 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7722 { yyLOCAL = false } @@ -24242,53 +21757,33 @@ yydefault: case 1573: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Ignore -<<<<<<< HEAD -//line sql.y:7723 -======= -//line sql.y:7878 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7724 { yyLOCAL = true } yyVAL.union = yyLOCAL case 1574: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7726 -======= -//line sql.y:7881 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7727 { yyVAL.empty = struct{}{} } case 1575: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7728 -======= -//line sql.y:7883 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7729 { yyVAL.empty = struct{}{} } case 1576: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7730 -======= -//line sql.y:7885 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7731 { yyVAL.empty = struct{}{} } case 1577: yyDollar = yyS[yypt-5 : yypt+1] var yyLOCAL Statement -<<<<<<< HEAD -//line sql.y:7734 -======= -//line sql.y:7889 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7735 { yyLOCAL = &CallProc{Name: yyDollar[2].tableName, Params: yyDollar[4].exprsUnion()} } @@ -24296,11 +21791,7 @@ yydefault: case 1578: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL Exprs -<<<<<<< HEAD -//line sql.y:7739 -======= -//line sql.y:7894 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7740 { yyLOCAL = nil } @@ -24308,11 +21799,7 @@ yydefault: case 1579: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL Exprs -<<<<<<< HEAD -//line sql.y:7743 -======= -//line sql.y:7898 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7744 { yyLOCAL = yyDollar[1].exprsUnion() } @@ -24320,11 +21807,7 @@ yydefault: case 1580: yyDollar = yyS[yypt-0 : yypt+1] var yyLOCAL []*IndexOption -<<<<<<< HEAD -//line sql.y:7748 -======= -//line sql.y:7903 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7749 { yyLOCAL = nil } @@ -24332,11 +21815,7 @@ yydefault: case 1581: yyDollar = yyS[yypt-1 : yypt+1] var yyLOCAL []*IndexOption -<<<<<<< HEAD -//line sql.y:7750 -======= -//line sql.y:7905 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7751 { yyLOCAL = []*IndexOption{yyDollar[1].indexOptionUnion()} } @@ -24344,183 +21823,90 @@ yydefault: case 1582: yyDollar = yyS[yypt-2 : yypt+1] var yyLOCAL *IndexOption -<<<<<<< HEAD -//line sql.y:7754 -======= -//line sql.y:7909 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7755 { yyLOCAL = &IndexOption{Name: string(yyDollar[1].str), String: string(yyDollar[2].identifierCI.String())} } yyVAL.union = yyLOCAL case 1583: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7760 -======= -//line sql.y:7915 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7761 { yyVAL.identifierCI = yyDollar[1].identifierCI } case 1584: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7764 -======= -//line sql.y:7919 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7765 { yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str)) } case 1586: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7771 -======= -//line sql.y:7926 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7772 { yyVAL.identifierCI = NewIdentifierCI(string(yyDollar[1].str)) } case 1587: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7777 -======= -//line sql.y:7932 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7778 { yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str)) } case 1588: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7781 -======= -//line sql.y:7936 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7782 { yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str)) } case 1589: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:7787 -======= -//line sql.y:7942 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7788 { yyVAL.identifierCS = NewIdentifierCS("") } case 1590: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7791 -======= -//line sql.y:7946 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:7792 { yyVAL.identifierCS = yyDollar[1].identifierCS } case 1592: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:7798 +//line sql.y:7799 { yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str)) } case 2197: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:8429 -======= -//line sql.y:7953 - { - yyVAL.identifierCS = NewIdentifierCS(string(yyDollar[1].str)) - } - case 1627: - yyDollar = yyS[yypt-3 : yypt+1] - var yyLOCAL Statement -//line sql.y:7959 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8430 { } case 2198: yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:8434 +//line sql.y:8435 { } case 2199: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:8438 -======= - var yyLOCAL KillType -//line sql.y:7965 - { - yyLOCAL = ConnectionType - } - yyVAL.union = yyLOCAL - case 1629: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL KillType -//line sql.y:7969 - { - yyLOCAL = ConnectionType - } - yyVAL.union = yyLOCAL - case 1630: - yyDollar = yyS[yypt-1 : yypt+1] - var yyLOCAL KillType -//line sql.y:7973 - { - yyLOCAL = QueryType - } - yyVAL.union = yyLOCAL - case 2248: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:8619 - { - } - case 2249: - yyDollar = yyS[yypt-1 : yypt+1] -//line sql.y:8624 - { - } - case 2250: - yyDollar = yyS[yypt-0 : yypt+1] -//line sql.y:8628 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8439 { skipToEnd(yylex) } case 2200: yyDollar = yyS[yypt-0 : yypt+1] -<<<<<<< HEAD -//line sql.y:8443 -======= -//line sql.y:8633 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8444 { skipToEnd(yylex) } case 2201: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:8447 -======= -//line sql.y:8637 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8448 { skipToEnd(yylex) } case 2202: yyDollar = yyS[yypt-1 : yypt+1] -<<<<<<< HEAD -//line sql.y:8451 -======= -//line sql.y:8641 ->>>>>>> ab525d9cd5 (Fix wrong assignment to `sql_id_opt` in the parser (#15862)) +//line sql.y:8452 { skipToEnd(yylex) }