10000 char* --> Datum · postgrespro/postgres_cluster@7f97e05 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7f97e05

Browse files
vadim4ovadim4o
committed
char* --> Datum
1 parent 1ea0172 commit 7f97e05

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎contrib/spi/refint.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ check_primary_key()
4242
int nargs; /* # of args specified in CREATE TRIGGER */
4343
char **args; /* arguments: column names and table name */
4444
int nkeys; /* # of key columns (= nargs / 2) */
45-
char **kvals; /* key values */
45+
Datum *kvals; /* key values */
4646
char *relname; /* referenced relation name */
4747
Relation rel; /* triggered relation */
4848
HeapTuple tuple = NULL; /* tuple to return */
@@ -107,7 +107,7 @@ check_primary_key()
107107
* We use SPI plan preparation feature, so allocate space to place key
108108
* values.
109109
*/
110-
kvals = (char **) palloc(nkeys * sizeof(char *));
110+
kvals = (Datum *) palloc(nkeys * sizeof(Datum));
111111

112112
/*
113113
* Construct ident string as TriggerName $ TriggeredRelationId and try
@@ -228,7 +228,7 @@ check_foreign_key()
228228
int nrefs; /* number of references (== # of plans) */
229229
char action; /* 'R'estrict | 'S'etnull | 'C'ascade */
230230
int nkeys; /* # of key columns */
231-
char **kvals; /* key values */
231+
Datum *kvals; /* key values */
232232
char *relname; /* referencing relation name */
233233
Relation rel; /* triggered relation */
234234
HeapTuple trigtuple = NULL; /* tuple to being changed */
@@ -310,7 +310,7 @@ check_foreign_key()
310310
* We use SPI plan preparation feature, so allocate space to place key
311311
* values.
312312
*/
313-
kvals = (char **) palloc(nkeys * sizeof(char *));
313+
kvals = (Datum *) palloc(nkeys * sizeof(Datum));
314314

315315
/*
316316
* Construct ident string as TriggerName $ TriggeredRelationId and try
@@ -494,7 +494,7 @@ check_foreign_key()
494494
elog(WARN, "%s: tuple referenced in %s",
495495
trigger->tgname, relname);
496496
}
497-
#ifndef REFINT_QUIET
497+
#ifdef REFINT_VERBOSE
498498
else
499499
elog(NOTICE, "%s: %d tuple(s) of %s are %s",
500500
trigger->tgname, SPI_processed, relname,

‎src/include/executor/spi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ extern int SPI_result;
7373
extern int SPI_connect(void);
7474
extern int SPI_finish(void);
7575
extern int SPI_exec(char *src, int tcount);
76-
extern int SPI_execp(void *plan, char **values, char *Nulls, int tcount);
76+
extern int SPI_execp(void *plan, Datum *values, char *Nulls, int tcount);
7777
extern void *SPI_prepare(char *src, int nargs, Oid * argtypes);
7878
extern void *SPI_saveplan(void *plan);
7979

0 commit comments

Comments
 (0)
0