hcq/openGauss-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compiler error

Browse Source
This commit is contained in:
chenyanfei
2020-08-06 14:36:45 +08:00
parent b093b4d858
commit f03dec6c3e
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/pl/plpgsql/src/gram.y
View File

@ -2635,7 +2635,7 @@ stmt_commit : K_COMMIT ';'
newp->cmd_type = PLPGSQL_STMT_COMMIT;
newp->lineno = plpgsql_location_to_lineno(@1);
$$ = (PLpgSQL_stmt_commit *)newp;
$$ = (PLpgSQL_stmt *)newp;
}
;
@ -2648,7 +2648,7 @@ stmt_rollback : K_ROLLBACK ';'
newp->cmd_type = PLPGSQL_STMT_ROLLBACK;
newp->lineno = plpgsql_location_to_lineno(@1);
$$ = (PLpgSQL_stmt_rollback *)newp;
$$ = (PLpgSQL_stmt *)newp;
}
;

36
src/common/pl/plpgsql/src/pl_funcs.cpp
View File

@ -222,10 +222,10 @@ const char* plpgsql_stmt_typename(PLpgSQL_stmt* stmt)
return "PERFORM";
case PLPGSQL_STMT_NULL:
return "NULL";
case PLPGSQL_STMT_COMMIT:
return "COMMIT";
case PLPGSQL_STMT_ROLLBACK:
return "ROLLBACK";
case PLPGSQL_STMT_COMMIT:
return "COMMIT";
case PLPGSQL_STMT_ROLLBACK:
return "ROLLBACK";
default:
break;
}
@ -376,12 +376,12 @@ static void free_stmt(PLpgSQL_stmt* stmt)
case PLPGSQL_STMT_NULL:
free_null((PLpgSQL_stmt*)stmt);
break;
case PLPGSQL_STMT_COMMIT:
free_commit((PLpgSQL_stmt_commit*)stmt);
break;
case PLPGSQL_STMT_ROLLBACK:
free_rollback((PLpgSQL_stmt_rollback*)stmt);
break;
case PLPGSQL_STMT_COMMIT:
free_commit((PLpgSQL_stmt_commit*)stmt);
break;
case PLPGSQL_STMT_ROLLBACK:
free_rollback((PLpgSQL_stmt_rollback*)stmt);
break;
default:
ereport(ERROR,
(errmodule(MOD_PLSQL),
@ -798,12 +798,12 @@ static void dump_stmt(PLpgSQL_stmt* stmt)
case PLPGSQL_STMT_NULL:
dump_null((PLpgSQL_stmt*)stmt);
break;
case PLPGSQL_STMT_COMMIT:
dump_commit((PLpgSQL_stmt_commit*)stmt);
break;
case PLPGSQL_STMT_ROLLBACK:
dump_rollback((PLpgSQL_stmt_rollback*)stmt);
break;
case PLPGSQL_STMT_COMMIT:
dump_commit((PLpgSQL_stmt_commit*)stmt);
break;
case PLPGSQL_STMT_ROLLBACK:
dump_rollback((PLpgSQL_stmt_rollback*)stmt);
break;
default:
ereport(ERROR,
(errmodule(MOD_PLSQL),
@ -1167,13 +1167,13 @@ static void dump_null(PLpgSQL_stmt* stmt)
static void dump_commit(PLpgSQL_stmt_commit* stmt)
{
dump_ind();
printf("COMMIT\n");
printf("COMMIT\n");
}
static void dump_rollback(PLpgSQL_stmt_rollback* stmt)
{
dump_ind();
printf("ROLLBACK\n");
printf("ROLLBACK\n");
}
static void dump_exit(PLpgSQL_stmt_exit* stmt)

2
src/include/utils/plpgsql.h
View File

@ -413,7 +413,7 @@ typedef struct PLpgSQL_stmt_commit {
typedef struct PLpgSQL_stmt_rollback {
int cmd_type;
int lineno;
} PLpgSQL_stmt_commit;
} PLpgSQL_stmt_rollback;
typedef struct { /* Get Diagnostics item */
int kind; /* id for diagnostic value desired */

2
src/test/regress/expected/hw_procedure_define.out
View File

@ -373,7 +373,7 @@ END;
-- Test COMMIT/ROLLBACK
-------------------------------------------------------
CREATE TABLE t_transaction(id INTEGER);
CREATE OR REPLACE PROCDURE proc_callas_transaction
CREATE OR REPLACE PROCEDURE proc_callas_transaction
AS
BEGIN
INSERT INTO t_transaction VALUES(1);

2
src/test/regress/sql/hw_procedure_define.sql
View File

@ -270,7 +270,7 @@ END;
-- Test COMMIT/ROLLBACK
-------------------------------------------------------
CREATE TABLE t_transaction(id INTEGER);
CREATE OR REPLACE PROCDURE proc_callas_transaction
CREATE OR REPLACE PROCEDURE proc_callas_transaction
AS
BEGIN
INSERT INTO t_transaction VALUES(1);