fix long idenitfier display issue

Author: anju15bharti

contrib/babelfishpg_tds/src/backend/tds/err_handler.c

@@ -10,6 +10,8 @@
 #include "utils/elog.h"
 #include "utils/hsearch.h"
 #include "utils/palloc.h"		/* Needed for pstrdup() */
+#include "utils/memutils.h"
+#include <dlfcn.h>
 
 #include "src/include/tds_int.h"
 #include "src/include/tds_response.h"
@@ -344,8 +346,38 @@ emit_tds_log(ErrorData *edata)
 			tsql_error_state = 1;
 		}
 
-		TdsSendError(tsql_error_code, tsql_error_state, tsql_error_sev,
-					 edata->message, error_lineno);
+		{
+			/* Rewrite truncated identifiers in error message */
+			char *msg = edata->message;
+
+			{
+				/*
+				 * Rewrite truncated identifiers in error message.
+				 * Truncated names are always [a-z0-9_] with 32-char hex MD5 suffix.
+				 * Search for patterns matching NAMEDATALEN-1 chars that look like
+				 * truncated identifiers and replace with full original from cache.
+				 */
+				typedef char *(*rewrite_fn_t)(const char *);
+				static rewrite_fn_t rewrite_fn = NULL;
+				static bool rewrite_resolved = false;
+
+				if (!rewrite_resolved)
+				{
+					rewrite_fn = (rewrite_fn_t) dlsym(RTLD_DEFAULT, "bbf_rewrite_truncated_identifiers");
+					rewrite_resolved = true;
+				}
+
+				if (rewrite_fn)
+				{
+					char *newmsg = rewrite_fn(msg);
+					if (newmsg)
+						msg = newmsg;
+				}
+			}
+
+			TdsSendError(tsql_error_code, tsql_error_state, tsql_error_sev,
+						 msg, error_lineno);
+		}
 
 		/*
 		 * If we've not reached the main query loop yet, flush the error

contrib/babelfishpg_tds/src/backend/tds/tdsresponse.c

@@ -32,6 +32,9 @@
 #include "parser/parse_type.h"
 #include "parser/parsetree.h"
 #include "utils/fmgroids.h"
+#include "utils/builtins.h"
+#include "rewrite/rewriteHandler.h"
+#include "utils/lsyscache.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
 #include "utils/memdebug.h"
@@ -1234,7 +1237,6 @@ PrepareRowDescription(TupleDesc typeinfo, PlannedStmt *plannedstmt, List *target
 		 */
 		SetParamMetadataCommonInfo(col, finfo);
 		initStringInfo(&(col->colName));
-		appendStringInfoString(&col->colName, NameStr(att->attname));
 
 		/* Do we have a non-resjunk tlist item? */
 		while (tlist_item &&
@@ -1244,13 +1246,85 @@ PrepareRowDescription(TupleDesc typeinfo, PlannedStmt *plannedstmt, List *target
 		{
 			tle = (TargetEntry *) lfirst(tlist_item);
 
+			/*
+			 * Use tle->resname if available and longer than attname,
+			 * since attname is limited to NAMEDATALEN-1 (63 chars).
+			 */
+			if (tle->resname && strlen(tle->resname) > strlen(NameStr(att->attname)))
+				appendStringInfoString(&col->colName, tle->resname);
+			else
+			{
+				appendStringInfoString(&col->colName, NameStr(att->attname));
+
+				/* For SELECT *, try attoptions for full original name */
+				if (col->colName.len >= NAMEDATALEN - 1 && tle->resorigtbl != InvalidOid && tle->resorigcol > 0)
+				{
+					HeapTuple atttup = SearchSysCache2(ATTNUM,
+													   ObjectIdGetDatum(tle->resorigtbl),
+													   Int16GetDatum(tle->resorigcol));
+					if (HeapTupleIsValid(atttup))
+					{
+						bool isnull;
+						Datum opts = SysCacheGetAttr(ATTNUM, atttup, Anum_pg_attribute_attoptions, &isnull);
+						if (!isnull)
+						{
+							ArrayType *arr = DatumGetArrayTypeP(opts);
+							Datum *elems;
+							int n;
+							deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, &elems, NULL, &n);
+							for (int i = 0; i < n; i++)
+							{
+								char *s = text_to_cstring(DatumGetTextP(elems[i]));
+								if (strncmp(s, "bbf_original_name=", 18) == 0)
+								{
+									resetStringInfo(&col->colName);
+									appendStringInfoString(&col->colName, s + 18);
+									break;
+								}
+							}
+						}
+						ReleaseSysCache(atttup);
+					}
+				}
+
+				/* Fallback: for views, lookup pg_rewrite for full column name */
+				if (col->colName.len >= NAMEDATALEN - 1 && tle->resorigtbl != InvalidOid)
+				{
+					char relkind = get_rel_relkind(tle->resorigtbl);
+					if (relkind == RELKIND_VIEW)
+					{
+						Relation vrel = relation_open(tle->resorigtbl, AccessShareLock);
+						Query *vquery = get_view_query(vrel);
+						ListCell *vlc;
+						int vcolno = 0;
+
+						foreach(vlc, vquery->targetList)
+						{
+							TargetEntry *vtle = (TargetEntry *) lfirst(vlc);
+							if (vtle->resjunk)
+								continue;
+							vcolno++;
+							if (vcolno == tle->resorigcol && vtle->resname &&
+								strlen(vtle->resname) > (Size) col->colName.len)
+							{
+								resetStringInfo(&col->colName);
+								appendStringInfoString(&col->colName, vtle->resname);
+								break;
+							}
+						}
+						relation_close(vrel, AccessShareLock);
+					}
+				}
+			}
+
 			col->relOid = tle->resorigtbl;
 			col->attrNum = tle->resorigcol;
 
 			tlist_item = lnext(targetlist, tlist_item);
 		}
 		else
 		{
+			appendStringInfoString(&col->colName, NameStr(att->attname));
 			/* No info available, so send zeroes */
 			col->relOid = 0;
 			col->attrNum = 0;

contrib/babelfishpg_tsql/runtime/functions.c

@@ -2855,7 +2855,32 @@ object_name(PG_FUNCTION_ARGS)
 		if (pg_class_aclcheck(object_id, user_id, ACL_SELECT) == ACLCHECK_OK)
 		{
 			Form_pg_class pg_class = (Form_pg_class) GETSTRUCT(tuple);
-			result_text = cstring_to_text(NameStr(pg_class->relname)); // make a copy before releasing syscache
+			char *relname = NameStr(pg_class->relname);
+
+			/* Try to get original name from reloptions */
+			if (strlen(relname) >= NAMEDATALEN - 1)
+			{
+				bool isnull;
+				Datum opts = SysCacheGetAttr(RELOID, tuple, Anum_pg_class_reloptions, &isnull);
+				if (!isnull)
+				{
+					ArrayType *arr = DatumGetArrayTypeP(opts);
+					Datum *elems;
+					int n;
+					deconstruct_array(arr, TEXTOID, -1, false, TYPALIGN_INT, &elems, NULL, &n);
+					for (int i = 0; i < n; i++)
+					{
+						char *s = text_to_cstring(DatumGetTextP(elems[i]));
+						if (strncmp(s, "bbf_original_rel_name=", 22) == 0)
+						{
+							result_text = cstring_to_text(s + 22);
+							break;
+						}
+					}
+				}
+			}
+			if (result_text == NULL)
+				result_text = cstring_to_text(relname);
 			schema_id = pg_class->relnamespace;
 		}
 		ReleaseSysCache(tuple);