Fix create/alter TS clauses after merge

Author: Alexander Zhdanov

src/dsql/parse.y

@@ -1557,22 +1557,21 @@ create_clause
 			node->createIfNotExistsOnly = $2;
 			$$ = node;
 		}
-	| unique_opt order_direction INDEX if_not_exists_opt symbol_index_name index_active_opt ON simple_table_name
+	| unique_opt order_direction INDEX if_not_exists_opt symbol_index_name ON simple_table_name
 			{
 				const auto node = newNode<CreateIndexNode>(*$5);
-				node->active = $6;
 				node->unique = $1;
 				node->descending = $2;
 				node->createIfNotExistsOnly = $4;
-				node->relation = $8;
+				node->relation = $7;
 				$$ = node;
 			}
-		index_definition(static_cast<CreateIndexNode*>($9)) tablespace_name_clause_opt
+		index_definition(static_cast<CreateIndexNode*>($8)) tablespace_name_clause_opt
 			{
 				if ($10)
-					static_cast<CreateIndexNode*>($9)->tableSpace = *$11;
+					static_cast<CreateIndexNode*>($8)->tableSpace = *$10;
 
-				$$ = $9;
+				$$ = $8;
 			}
 	| FUNCTION if_not_exists_opt function_clause
 		{
@@ -1777,12 +1776,6 @@ alter_exception_clause
 
 // CREATE INDEX
 
-%type <boolVal> index_active_opt
-index_active_opt
-	: /* nothing */		{ $$ = true; }
-	| index_active		{ $$ = $1; }
-	;
-
 %type <boolVal> unique_opt
 unique_opt
 	: /* nothing */		{ $$ = false; }
@@ -4737,7 +4730,8 @@ drop_behaviour
 
 %type <ddlNode>	alter_index_clause
 alter_index_clause
-	: symbol_index_name index_active	{ $$ = newNode<AlterIndexNode>(*$1, $2); }
+	: symbol_index_name ACTIVE		{ $$ = newNode<AlterIndexNode>(*$1, AlterIndexNode::OP_ACTIVE); }
+	| symbol_index_name INACTIVE	{ $$ = newNode<AlterIndexNode>(*$1, AlterIndexNode::OP_INACTIVE); }
 	| symbol_index_name SET TABLESPACE to_opt symbol_tablespace_name
 		{
 			AlterIndexNode* node = newNode<AlterIndexNode>(*$1, AlterIndexNode::OP_SET_TABLESPACE);
@@ -4746,12 +4740,6 @@ alter_index_clause
 		}
 	;
 
-%type <boolVal> index_active
-index_active
-	: ACTIVE	{ $$ = AlterIndexNode::OP_ACTIVE; }
-	| INACTIVE	{ $$ = AlterIndexNode::OP_INACTIVE; }
-	;
-
 %type <ddlNode>	alter_udf_clause
 alter_udf_clause
 	: symbol_UDF_name entry_op module_op