提交 7f97e05b 编写于 作者: V Vadim B. Mikheev

char* --> Datum

上级 1ea01720
...@@ -42,7 +42,7 @@ check_primary_key() ...@@ -42,7 +42,7 @@ check_primary_key()
int nargs; /* # of args specified in CREATE TRIGGER */ int nargs; /* # of args specified in CREATE TRIGGER */
char **args; /* arguments: column names and table name */ char **args; /* arguments: column names and table name */
int nkeys; /* # of key columns (= nargs / 2) */ int nkeys; /* # of key columns (= nargs / 2) */
char **kvals; /* key values */ Datum *kvals; /* key values */
char *relname; /* referenced relation name */ char *relname; /* referenced relation name */
Relation rel; /* triggered relation */ Relation rel; /* triggered relation */
HeapTuple tuple = NULL; /* tuple to return */ HeapTuple tuple = NULL; /* tuple to return */
...@@ -107,7 +107,7 @@ check_primary_key() ...@@ -107,7 +107,7 @@ check_primary_key()
* We use SPI plan preparation feature, so allocate space to place key * We use SPI plan preparation feature, so allocate space to place key
* values. * values.
*/ */
kvals = (char **) palloc(nkeys * sizeof(char *)); kvals = (Datum *) palloc(nkeys * sizeof(Datum));
/* /*
* Construct ident string as TriggerName $ TriggeredRelationId and try * Construct ident string as TriggerName $ TriggeredRelationId and try
...@@ -228,7 +228,7 @@ check_foreign_key() ...@@ -228,7 +228,7 @@ check_foreign_key()
int nrefs; /* number of references (== # of plans) */ int nrefs; /* number of references (== # of plans) */
char action; /* 'R'estrict | 'S'etnull | 'C'ascade */ char action; /* 'R'estrict | 'S'etnull | 'C'ascade */
int nkeys; /* # of key columns */ int nkeys; /* # of key columns */
char **kvals; /* key values */ Datum *kvals; /* key values */
char *relname; /* referencing relation name */ char *relname; /* referencing relation name */
Relation rel; /* triggered relation */ Relation rel; /* triggered relation */
HeapTuple trigtuple = NULL; /* tuple to being changed */ HeapTuple trigtuple = NULL; /* tuple to being changed */
...@@ -310,7 +310,7 @@ check_foreign_key() ...@@ -310,7 +310,7 @@ check_foreign_key()
* We use SPI plan preparation feature, so allocate space to place key * We use SPI plan preparation feature, so allocate space to place key
* values. * values.
*/ */
kvals = (char **) palloc(nkeys * sizeof(char *)); kvals = (Datum *) palloc(nkeys * sizeof(Datum));
/* /*
* Construct ident string as TriggerName $ TriggeredRelationId and try * Construct ident string as TriggerName $ TriggeredRelationId and try
...@@ -494,7 +494,7 @@ check_foreign_key() ...@@ -494,7 +494,7 @@ check_foreign_key()
elog(WARN, "%s: tuple referenced in %s", elog(WARN, "%s: tuple referenced in %s",
trigger->tgname, relname); trigger->tgname, relname);
} }
#ifndef REFINT_QUIET #ifdef REFINT_VERBOSE
else else
elog(NOTICE, "%s: %d tuple(s) of %s are %s", elog(NOTICE, "%s: %d tuple(s) of %s are %s",
trigger->tgname, SPI_processed, relname, trigger->tgname, SPI_processed, relname,
......
...@@ -73,7 +73,7 @@ extern int SPI_result; ...@@ -73,7 +73,7 @@ extern int SPI_result;
extern int SPI_connect(void); extern int SPI_connect(void);
extern int SPI_finish(void); extern int SPI_finish(void);
extern int SPI_exec(char *src, int tcount); extern int SPI_exec(char *src, int tcount);
extern int SPI_execp(void *plan, char **values, char *Nulls, int tcount); extern int SPI_execp(void *plan, Datum *values, char *Nulls, int tcount);
extern void *SPI_prepare(char *src, int nargs, Oid * argtypes); extern void *SPI_prepare(char *src, int nargs, Oid * argtypes);
extern void *SPI_saveplan(void *plan); extern void *SPI_saveplan(void *plan);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册