Testing community changes

contrib/babelfishpg_tsql/runtime/functions.c

@@ -3839,6 +3839,12 @@ bbf_pivot(PG_FUNCTION_ARGS)
 	oldcontext = MemoryContextSwitchTo(tsql_outmost_context);
 	PG_TRY();
 	{
+		if (!tsql_outmost_estat->pivot_parsetree_list)
+		{
+			ereport(ERROR,
+					(errcode(ERRCODE_ASSERT_FAILURE),
+					errmsg("Unexpected error while trying to evaluate PIVOT clause")));
+		}
 		per_pivot_list = list_nth_node(List, tsql_outmost_estat->pivot_parsetree_list, tsql_outmost_estat->pivot_number - 1);
 		Assert(list_length(per_pivot_list) >= 2);
 		bbf_pivot_src_sql = list_nth_node(RawStmt, per_pivot_list, 0);

contrib/babelfishpg_tsql/src/backend_parser/gram-tsql-rule.y

@@ -1635,11 +1635,11 @@ tsql_pivot_expr: TSQL_PIVOT '(' func_application FOR ColId IN_P in_expr ')'
 							List 		*l = list_make1(copyObject(n));
 							if (value_col_strlist == NULL || subsel_valuelists == NULL)
 							{
-								value_col_strlist = list_make1(s->sval);
+								value_col_strlist = list_make1(s);
 								subsel_valuelists = list_make1(l);
 							}else
 							{
-								value_col_strlist = lappend(value_col_strlist, s->sval);
+								value_col_strlist = lappend(value_col_strlist, s);
 								subsel_valuelists = lappend(subsel_valuelists, l);
 							}
 						}

contrib/babelfishpg_tsql/src/hooks.c

@@ -4415,7 +4415,7 @@ transform_pivot_clause(ParseState *pstate, SelectStmt *stmt)
 	for(int i = 0; i < stmt->value_col_strlist->length; i++)
 	{
 		ColumnDef	*tempColDef;
-		tempColDef = makeColumnDef((char *) list_nth(stmt->value_col_strlist, i),
+		tempColDef = makeColumnDef(((String *) list_nth(stmt->value_col_strlist, i))->sval,
 									((Aggref *)aggfunc_te->expr)->aggtype, 
 									-1,
 									((Aggref *)aggfunc_te->expr)->aggcollid

test/JDBC/expected/pivot-vu-cleanup.out

@@ -13,6 +13,9 @@ GO
 drop function test_table_valued_function;
 GO
 
+drop view pivot_view;
+GO
+
 drop table StoreReceipt;
 GO
 

test/JDBC/expected/pivot-vu-prepare.out

@@ -856,7 +856,6 @@ RETURN
     ) AS pvt2
 GO
 
--- Cannot create view (Bug)
 create view pivot_view as
 SELECT top 5 ManufactureID, [2] AS STORE2, [3] AS STORE3, [4] AS STORE4, [5] AS STORE5, [6] AS STORE6
 FROM
@@ -869,7 +868,3 @@ PIVOT (
     FOR StoreID in ([2], [3], [4], [5], [6])
 ) AS pvt
 GO
-~~ERROR (Code: 33557097)~~
-
-~~ERROR (Message: a column definition list is required for functions returning "record")~~
-

test/JDBC/expected/pivot-vu-verify.out

@@ -933,6 +933,25 @@ int#!#int#!#int#!#int#!#int#!#int
 ~~END~~
 
 
+-- view test
+select * from pivot_view
+GO
+~~START~~
+int#!#int#!#int#!#int#!#int#!#int
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Unexpected error while trying to evaluate PIVOT clause)~~
+
+
+select * from pivot_view
+GO
+~~START~~
+int#!#int#!#int#!#int#!#int#!#int
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: Unexpected error while trying to evaluate PIVOT clause)~~
+
+
 -- explain pivot
 set BABELFISH_SHOWPLAN_ALL ON;
 SELECT top 5 ManufactureID, [2] AS STORE2, [3] AS STORE3, [4] AS STORE4, [5] AS STORE5, [6] AS STORE6

test/JDBC/input/pivot-vu-cleanup.sql

@@ -13,6 +13,9 @@ GO
 drop function test_table_valued_function;
 GO
 
+drop view pivot_view;
+GO
+
 drop table StoreReceipt;
 GO
 

test/JDBC/input/pivot-vu-prepare.sql

@@ -456,7 +456,6 @@ RETURN
     ) AS pvt2
 GO
 
--- Cannot create view (Bug)
 create view pivot_view as
 SELECT top 5 ManufactureID, [2] AS STORE2, [3] AS STORE3, [4] AS STORE4, [5] AS STORE5, [6] AS STORE6
 FROM

test/JDBC/input/pivot-vu-verify.sql

@@ -221,6 +221,13 @@ GO
 select * from test_table_valued_function(12);
 GO
 
+-- view test
+select * from pivot_view
+GO
+
+select * from pivot_view
+GO
+
 -- explain pivot
 set BABELFISH_SHOWPLAN_ALL ON;
 SELECT top 5 ManufactureID, [2] AS STORE2, [3] AS STORE3, [4] AS STORE4, [5] AS STORE5, [6] AS STORE6