Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
c8bcd5ca
Commit
c8bcd5ca
authored
21 years ago
by
Tom Lane
Browse files
Options
Downloads
Patches
Plain Diff
Fix problems with dropped columns in pltcl triggers, per report from Patrick Samson.
parent
0152f148
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/src/sgml/pltcl.sgml
+5
-2
5 additions, 2 deletions
doc/src/sgml/pltcl.sgml
src/pl/tcl/pltcl.c
+23
-17
23 additions, 17 deletions
src/pl/tcl/pltcl.c
with
28 additions
and
19 deletions
doc/src/sgml/pltcl.sgml
+
5
−
2
View file @
c8bcd5ca
<!--
$PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.2
8
200
3/11/29 19:51:37 pgsq
l Exp $
$PostgreSQL: pgsql/doc/src/sgml/pltcl.sgml,v 2.2
9
200
4/01/24 23:06:29 tg
l Exp $
-->
<chapter id="pltcl">
...
...
@@ -516,7 +516,10 @@ SELECT 'doesn''t' AS ret
element. So looking up a column name in the list with <application>Tcl</>'s
<function>lsearch</> command returns the element's number starting
with 1 for the first column, the same way the columns are customarily
numbered in <productname>PostgreSQL</productname>.
numbered in <productname>PostgreSQL</productname>. (Empty list
elements also appear in the positions of columns that have been
dropped, so that the attribute numbering is correct for columns
to their right.)
</para>
</listitem>
</varlistentry>
...
...
This diff is collapsed.
Click to expand it.
src/pl/tcl/pltcl.c
+
23
−
17
View file @
c8bcd5ca
...
...
@@ -31,7 +31,7 @@
* ENHANCEMENTS, OR MODIFICATIONS.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.8
1
2004/01/
06
23:
55:1
9 tgl Exp $
* $PostgreSQL: pgsql/src/pl/tcl/pltcl.c,v 1.8
2
2004/01/
24
23:
06:2
9 tgl Exp $
*
**********************************************************************/
...
...
@@ -695,11 +695,15 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
pfree
(
stroid
);
/* A list of attribute names for argument TG_relatts */
/* note: we deliberately include dropped atts here */
Tcl_DStringAppendElement
(
&
tcl_trigtup
,
""
);
for
(
i
=
0
;
i
<
tupdesc
->
natts
;
i
++
)
{
if
(
tupdesc
->
attrs
[
i
]
->
attisdropped
)
Tcl_DStringAppendElement
(
&
tcl_trigtup
,
""
);
else
Tcl_DStringAppendElement
(
&
tcl_trigtup
,
NameStr
(
tupdesc
->
attrs
[
i
]
->
attname
));
}
Tcl_DStringAppendElement
(
&
tcl_cmd
,
Tcl_DStringValue
(
&
tcl_trigtup
));
Tcl_DStringFree
(
&
tcl_trigtup
);
Tcl_DStringInit
(
&
tcl_trigtup
);
...
...
@@ -881,9 +885,10 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
siglongjmp
(
Warn_restart
,
1
);
}
i
=
0
;
while
(
i
<
ret_numvals
)
for
(
i
=
0
;
i
<
ret_numvals
;
i
+=
2
)
{
CONST84
char
*
ret_name
=
ret_values
[
i
];
CONST84
char
*
ret_value
=
ret_values
[
i
+
1
];
int
attnum
;
HeapTuple
typeTup
;
Oid
typinput
;
...
...
@@ -891,24 +896,25 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
FmgrInfo
finfo
;
/************************************************************
* Ignore pseudo elements
with a dot name
* Ignore
".tupno"
pseudo elements
(see pltcl_set_tuple_values)
************************************************************/
if
(
*
(
ret_values
[
i
])
==
'.'
)
{
i
+=
2
;
if
(
strcmp
(
ret_name
,
".tupno"
)
==
0
)
continue
;
}
/************************************************************
* Get the attribute number
************************************************************/
attnum
=
SPI_fnumber
(
tupdesc
,
ret_
values
[
i
++
]
);
attnum
=
SPI_fnumber
(
tupdesc
,
ret_
name
);
if
(
attnum
==
SPI_ERROR_NOATTRIBUTE
)
elog
(
ERROR
,
"invalid attribute
\"
%s
\"
"
,
ret_values
[
--
i
]);
elog
(
ERROR
,
"invalid attribute
\"
%s
\"
"
,
ret_name
);
if
(
attnum
<=
0
)
elog
(
ERROR
,
"cannot set system attribute
\"
%s
\"
"
,
ret_values
[
--
i
]);
elog
(
ERROR
,
"cannot set system attribute
\"
%s
\"
"
,
ret_name
);
/************************************************************
* Ignore dropped columns
************************************************************/
if
(
tupdesc
->
attrs
[
attnum
-
1
]
->
attisdropped
)
continue
;
/************************************************************
* Lookup the attribute type in the syscache
...
...
@@ -932,7 +938,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS)
UTF_BEGIN
;
modvalues
[
attnum
-
1
]
=
FunctionCall3
(
&
finfo
,
CStringGetDatum
(
UTF_U2E
(
ret_value
s
[
i
++
]
)),
CStringGetDatum
(
UTF_U2E
(
ret_value
)),
ObjectIdGetDatum
(
typelem
),
Int32GetDatum
(
tupdesc
->
attrs
[
attnum
-
1
]
->
atttypmod
));
UTF_END
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment