Pick correct collation for Const Node

src/backend/parser/parse_collate.c

@@ -47,6 +47,7 @@
 #include "parser/parse_collate.h"
 #include "parser/parser.h"      /* only needed for GUC variables */
 #include "utils/lsyscache.h"
+#include "utils/guc.h"
 
 
 /*
@@ -799,6 +800,7 @@ merge_collation_state(Oid collation,
 					  int location2,
 					  assign_collations_context *context)
 {
+	const char *dump_restore;
 	/*
 	 * If the collation strength for this node is different from what's
 	 * already in *context, then this node either dominates or is dominated by
@@ -859,18 +861,29 @@ merge_collation_state(Oid collation,
 			case COLLATE_EXPLICIT:
 				if (collation != context->collation)
 				{
-					/*
-					 * Oops, we have a conflict of explicit COLLATE clauses.
-					 * Here we choose to throw error immediately; that is what
-					 * the SQL standard says to do, and there's no good reason
-					 * to be less strict.
-					 */
-					ereport(ERROR,
-							(errcode(ERRCODE_COLLATION_MISMATCH),
-							 errmsg("collation mismatch between explicit collations \"%s\" and \"%s\"",
-									get_collation_name(context->collation),
-									get_collation_name(collation)),
-							 parser_errposition(context->pstate, location)));
+					dump_restore = GetConfigOption("babelfishpg_tsql.dump_restore", true, false);
+					if (dump_restore && strcmp(dump_restore, "on") == 0)
+					{
+						context->collation = collation;
+						context->strength = strength;
+						context->location = location;
+						break;
+					}
+					else
+					{
+						/*
+						* Oops, we have a conflict of explicit COLLATE clauses.
+						* Here we choose to throw error immediately; that is what
+						* the SQL standard says to do, and there's no good reason
+						* to be less strict.
+						*/
+						ereport(ERROR,
+								(errcode(ERRCODE_COLLATION_MISMATCH),
+								errmsg("collation mismatch between explicit collations \"%s\" and \"%s\"",
+										get_collation_name(context->collation),
+										get_collation_name(collation)),
+								parser_errposition(context->pstate, location)));
+					}
 				}
 				break;
 		}

src/backend/parser/parse_type.c

@@ -656,7 +656,7 @@ typeTypeCollation(Type typ)
 
 	if (handle_default_collation_hook)
 	{
-		return (*handle_default_collation_hook)(typ, false);
+		return (*handle_default_collation_hook)(typ);
 	}
 
 	return typtup->typcollation;

src/backend/utils/adt/like_support.c

@@ -1771,7 +1771,7 @@ string_to_const(const char *str, Oid datatype)
 		case TEXTOID:
 		case VARCHAROID:
 		case BPCHAROID:
-			collation = DEFAULT_COLLATION_OID;
+			collation = CLUSTER_COLLATION_OID();
 			constlen = -1;
 			break;
 

src/backend/utils/cache/lsyscache.c

@@ -3055,7 +3055,7 @@ get_typcollation(Oid typid)
 
 		if (handle_default_collation_hook)
 		{
-			result = (*handle_default_collation_hook)((Type) tp, true);
+			result = (*handle_default_collation_hook)((Type) tp);
 		}
 
 		ReleaseSysCache(tp);

src/bin/pg_dump/pg_dump.c

@@ -15854,7 +15854,7 @@ dumpTableSchema(Archive *fout, const TableInfo *tbinfo)
 					{
 						if (tbinfo->attgenerated[j] == ATTRIBUTE_GENERATED_STORED)
 							appendPQExpBuffer(q, " GENERATED ALWAYS AS (%s) STORED",
-											  tbinfo->attrdefs[j]->adef_expr);
+												tbinfo->attrdefs[j]->adef_expr);
 						else
 							appendPQExpBuffer(q, " DEFAULT %s",
 											  tbinfo->attrdefs[j]->adef_expr);

src/include/parser/parse_type.h

@@ -69,7 +69,7 @@ extern PGDLLEXPORT check_or_set_default_typmod_hook_type check_or_set_default_ty
 typedef void (*validate_var_datatype_scale_hook_type)(const TypeName *typeName, Type typ);
 extern PGDLLEXPORT validate_var_datatype_scale_hook_type validate_var_datatype_scale_hook;
 
-typedef Oid (*handle_default_collation_hook_type) (Type typ, bool handle_pg_type);
+typedef Oid (*handle_default_collation_hook_type) (Type typ);
 extern PGDLLEXPORT handle_default_collation_hook_type handle_default_collation_hook;
 
 #endif							/* PARSE_TYPE_H */