Skip to content

Handling correct typmod for money/smallmoney during coercion and dump-restore #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 5, 2025
Merged

Handling correct typmod for money/smallmoney during coercion and dump-restore #575

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1731f50
Adding base typmod for smallmoney and money
Apr 23, 2025
95dfd4d
handling dump restore
May 5, 2025
45f10cc
minor change
May 5, 2025
ee68f5d
including library
May 5, 2025
162078c
handling for UDT
May 6, 2025
417f145
adding coerce_to_domain handling
May 6, 2025
c4373d0
refactoring
May 6, 2025
5024c5c
handling declare variables
May 7, 2025
84f04e4
declare handling
May 8, 2025
dff8674
Merge remote-tracking branch 'upstream/BABEL_5_X_DEV__PG_17_X' into n…
May 19, 2025
0b00b52
addressing comment
May 26, 2025
5600455
creating hook for basetype typmodin in case of dump-restore
May 28, 2025
7013e0c
removing redundant import
May 28, 2025
8bbb6d8
addressing comments
May 28, 2025
d3b5366
using PGDLLIMPORT instead of PGDLLEXPORT
May 29, 2025
06fe535
updating comment
Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/backend/parser/parse_coerce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,9 @@ coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
strcmp(type_name, "nchar") == 0 ||
strcmp(type_name, "varbinary") == 0 ||
strcmp(type_name, "binary") == 0 ||
strcmp(type_name, "decimal") == 0))
strcmp(type_name, "decimal") == 0 ||
strcmp(type_name, "smallmoney") == 0||
strcmp(type_name, "money") == 0))
result->resulttypmod = baseTypeMod;

return (Node *) result;
Expand Down
18 changes: 18 additions & 0 deletions src/backend/parser/parse_type.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
#include "utils/guc.h"

static int32 typenameTypeMod(ParseState *pstate, const TypeName *typeName,
Type typ);
Expand Down Expand Up @@ -337,11 +338,16 @@ typenameTypeMod(ParseState *pstate, const TypeName *typeName, Type typ)
{
int32 result;
Oid typmodin;
Oid typbasetype;
Oid basetypeid;
Oid typeoid;
Datum *datums;
int n;
ListCell *l;
ArrayType *arrtypmod;
ParseCallbackState pcbstate;
const char *dump_restore = GetConfigOption("babelfishpg_tsql.dump_restore", true, false);
HeapTuple tup;

/* Return prespecified typmod if no typmod expressions */
if (typeName->typmods == NIL)
Expand All @@ -360,6 +366,18 @@ typenameTypeMod(ParseState *pstate, const TypeName *typeName, Type typ)
parser_errposition(pstate, typeName->location)));

typmodin = ((Form_pg_type) GETSTRUCT(typ))->typmodin;
typeoid = ((Form_pg_type) GETSTRUCT(typ))->oid;
typbasetype = ((Form_pg_type) GETSTRUCT(typ))->typbasetype;

if (dump_restore && (strcmp(dump_restore, "on") == 0) && !OidIsValid(typmodin) && OidIsValid(typbasetype))
{
basetypeid = getBaseType(typeoid);
tup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(basetypeid));
if (!HeapTupleIsValid(tup)) /* should not happen */
elog(ERROR, "cache lookup failed for type %u", basetypeid);
typmodin = ((Form_pg_type) GETSTRUCT((Type)tup))->typmodin;
ReleaseSysCache(tup);
}

if (typmodin == InvalidOid)
ereport(ERROR,
Expand Down