Merge pull request IvorySQL#796 from bigplaice/master

gaoxueyu · web-flow · commit 36890cb767f6 · 2025-04-29T14:12:10.000+08:00
Fix issue 763
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -498,7 +498,7 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
 		{
 			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
-			if (strcmp(NameStr(attr->attname), "rowid") == 0 && compatible_db != DB_ORACLE)
+			if (strcmp(NameStr(attr->attname), "rowid") == 0 && compatible_db != ORA_PARSER)
 				continue;
 
 			if (SystemAttributeByName(NameStr(attr->attname)) != NULL)
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
@@ -4325,7 +4325,7 @@ preprocessNamespacePath(const char *searchPath, Oid roleid,
 		char	   *curname = (char *) lfirst(l);
 		Oid			namespaceId;
 
-		if ((compatible_db == DB_ORACLE && enable_case_switch && identifier_case_switch != NORMAL) ?	/* IvorySQL: case sensitive indentify */
+		if ((compatible_db == ORA_PARSER && enable_case_switch && identifier_case_switch != NORMAL) ?	/* IvorySQL: case sensitive indentify */
 			pg_strcasecmp(curname, "$user") == 0 : strcmp(curname, "$user") == 0)
 		{
 			/* $user --- substitute namespace matching user name, if any */
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
@@ -4346,7 +4346,7 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
 			update_path = mtstate->mt_merge_updated;
 			delete_path = mtstate->mt_merge_deleted;
 			skipped_path = total - insert_path - update_path - delete_path;
-			if (compatible_db != DB_ORACLE)
+			if (compatible_db != ORA_PARSER)
 				Assert(skipped_path >= 0);
 
 			if (es->format == EXPLAIN_FORMAT_TEXT)
@@ -4363,7 +4363,7 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
 						appendStringInfo(es->str, " deleted=%.0f", delete_path);
 					if (skipped_path > 0)
 					{
-						if (compatible_db != DB_ORACLE)
+						if (compatible_db != ORA_PARSER)
 							appendStringInfo(es->str, " skipped=%.0f", skipped_path);
 					}
 					appendStringInfoChar(es->str, '\n');
@@ -4374,7 +4374,7 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
 				ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);
 				ExplainPropertyFloat("Tuples Updated", NULL, update_path, 0, es);
 				ExplainPropertyFloat("Tuples Deleted", NULL, delete_path, 0, es);
-				if (compatible_db != DB_ORACLE)
+				if (compatible_db != ORA_PARSER)
 					ExplainPropertyFloat("Tuples Skipped", NULL, skipped_path, 0, es);
 			}
 		}
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
@@ -2477,7 +2477,7 @@ ExecuteDoStmt(ParseState *pstate, DoStmt *stmt, bool atomic)
 			/* anonymous block's language default value is plsql
 			 * in oracle compatibility mode
 			 */
-			if (DB_ORACLE == compatible_db)
+			if (ORA_PARSER == compatible_db)
 				language = "plisql";
 			else
 				language = "plpgsql";
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
@@ -2452,7 +2452,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)
 					 errmsg("sequence must be in same schema as table it is linked to")));
 
 		/* Now, fetch the attribute number from the system cache */
-		if (compatible_db == DB_ORACLE && strcmp(seqname, attrname) != 0)
+		if (compatible_db == ORA_PARSER && strcmp(seqname, attrname) != 0)
 		{
 			attnum = get_attnum(RelationGetRelid(tablerel), attrname);
 			if (attnum == InvalidAttrNumber)
@@ -2461,7 +2461,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)
 						 errmsg("column \"%s\" of relation \"%s\" does not exist",
 								attrname, RelationGetRelationName(tablerel))));
 		}
-		else if (compatible_db == DB_PG)
+		else if (compatible_db == PG_PARSER)
 		{
 			attnum = get_attnum(RelationGetRelid(tablerel), attrname);
 			if (attnum == InvalidAttrNumber)
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -4112,7 +4112,7 @@ ExecEvalXmlExpr(ExprState *state, ExprEvalStep *op)
 
 			if (values != NIL)
 			{
-				if (ora_updatexml_hook && compatible_db == DB_ORACLE)
+				if (ora_updatexml_hook && compatible_db == ORA_PARSER)
 					*op->resvalue = PointerGetDatum((*ora_updatexml_hook)(values));
 				else
 					*op->resvalue = (Datum) 0;
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
@@ -3587,7 +3587,7 @@ fireASTriggers(ModifyTableState *node)
 								 node->mt_transition_capture);
 			break;
 		case CMD_MERGE:
-			if (compatible_db == DB_ORACLE)
+			if (compatible_db == ORA_PARSER)
 			{
 				if (node->mt_merge_subcommands & MERGE_UPDATE)
 					ExecASUpdateTriggers(node->ps.state, resultRelInfo,
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
@@ -2462,7 +2462,7 @@ transformUpdateStmt(ParseState *pstate, UpdateStmt *stmt)
 	qry->returningList = transformReturningList(pstate, stmt->returningList,
 												EXPR_KIND_RETURNING);
 
-	if (DB_ORACLE == compatible_db)
+	if (ORA_PARSER == compatible_db)
 	{
 		ListCell   *o_target;
 
@@ -2542,7 +2542,7 @@ transformUpdateTargetList(ParseState *pstate, List *origTlist)
 
 		attrno = attnameAttNum(pstate->p_target_relation,
 							   origTarget->name, true);
-		if (attrno == InvalidAttrNumber && compatible_db == DB_ORACLE)
+		if (attrno == InvalidAttrNumber && compatible_db == ORA_PARSER)
 		{
 			if (origTarget->indirection)
 			{
@@ -2600,7 +2600,7 @@ transformUpdateTargetList(ParseState *pstate, List *origTlist)
 						 parser_errposition(pstate, origTarget->location)));
 			}
 		}
-		if (attrno == InvalidAttrNumber && compatible_db == DB_PG)
+		if (attrno == InvalidAttrNumber && compatible_db == PG_PARSER)
 		{
 			ereport(ERROR,
 			(errcode(ERRCODE_UNDEFINED_COLUMN),
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
@@ -3920,7 +3920,7 @@ interpretRowidOption(List *defList, bool allowRowid)
 	 * ROWID option was not specified, so use default GUC value,
 	 * but this GUC only valid in DB_ORACLE model
 	 */
-	if (compatible_db == DB_ORACLE)
+	if (compatible_db == ORA_PARSER)
 		return default_with_rowids;
 	else
 		return false;
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -1107,7 +1107,7 @@ transformAExprOp(ParseState *pstate, A_Expr *a)
 		lexpr = transformExprRecurse(pstate, lexpr);
 		ltypeId = exprType(lexpr);
 
-		if (compatible_db == DB_ORACLE && ltypeId == ROWIDOID && nodeTag(rexpr) != T_TypeCast)
+		if (compatible_db == ORA_PARSER && ltypeId == ROWIDOID && nodeTag(rexpr) != T_TypeCast)
 		{
 			TypeCast   *castnode = makeNode(TypeCast);
 			castnode->typeName = makeTypeNameFromNameList(list_make2(makeString("sys"), makeString("rowid")));
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
@@ -303,7 +303,7 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 			case T_ColumnDef:
 				{
 					ColumnDef *col = (ColumnDef *) element;
-					if (compatible_db == DB_ORACLE && strcmp(col->colname, "rowid") == 0)
+					if (compatible_db == ORA_PARSER && strcmp(col->colname, "rowid") == 0)
 						elog(ERROR, "column name \"%s\" conflicts with a system column name", col->colname);
 					else
 						transformColumnDefinition(&cxt, (ColumnDef *) element);
diff --git a/src/backend/tcop/backend_startup.c b/src/backend/tcop/backend_startup.c
@@ -771,7 +771,7 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 				/* Oracle compatibility tranfor upper to lower */
 				char *database_name = pstrdup(valptr);
 
-				if (DB_ORACLE == compatible_db && database_name != NULL)
+				if (ORA_PARSER == compatible_db && database_name != NULL)
 				{
 					if (identifier_case_switch == LOWERCASE &&
 						is_all_upper(database_name, strlen(database_name)))
@@ -824,7 +824,7 @@ ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done)
 				/* Oracle compatibility tranfor upper to lower */
 				char *user_name = pstrdup(valptr);
 
-				if (DB_ORACLE == compatible_db && user_name != NULL)
+				if (ORA_PARSER == compatible_db && user_name != NULL)
 				{
 					if (identifier_case_switch == LOWERCASE &&
 						is_all_upper(user_name, strlen(user_name)))
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
@@ -1879,7 +1879,7 @@ quoteOneName(char *buffer, const char *name)
 	/* Rather than trying to be smart, just always quote it. */
 	*buffer++ = '"';
 
-	if (compatible_db == DB_ORACLE && enable_case_switch
+	if (compatible_db == ORA_PARSER && enable_case_switch
 		 && identifier_case_switch == INTERCHANGE)
 		new_name = identifier_case_transform(name, strlen(name));
 	else
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
@@ -3572,7 +3572,7 @@ SplitIdentifierString(char *rawstring, char separator,
 		/* transform the case for the identifier that is
 		 * quoted by double quotes.
 		 */
-		if (compatible_db == DB_ORACLE && enable_case_switch
+		if (compatible_db == ORA_PARSER && enable_case_switch
 			 && identifier_case_switch == INTERCHANGE && need_case_switch)
 		{
 			char	   *new_name;
@@ -3919,7 +3919,7 @@ SplitGUCList(char *rawstring, char separator,
 		/* transform the case for the identifier that is
 		 * quoted by double quotes.
 		 */
-		if (compatible_db == DB_ORACLE && enable_case_switch
+		if (compatible_db == ORA_PARSER && enable_case_switch
 			 && identifier_case_switch == INTERCHANGE && need_case_switch)
 		{
 			char	   *new_name;
diff --git a/src/backend/utils/misc/ivy_guc.c b/src/backend/utils/misc/ivy_guc.c
@@ -373,15 +373,15 @@ check_compatible_mode(int *newval, void **extra, GucSource source)
 {
 	int		newmode = *newval;
 
-	if (DB_PG == database_mode && newmode == DB_ORACLE)
+	if (DB_PG == database_mode && newmode == ORA_PARSER)
 			ereport(ERROR,
 				(errcode(ERRCODE_CANT_CHANGE_RUNTIME_PARAM),
 				errmsg("parameter ivorysql.compatible_mode cannot be changed in native PG mode.")));
 
 	if(DB_ORACLE == database_mode
 		&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
-		if (newmode == DB_ORACLE)
+		if (newmode == ORA_PARSER)
 		{
 			if (ora_raw_parser == NULL)
 				ereport(ERROR,
@@ -417,7 +417,7 @@ assign_compatible_mode(int newval, void *extra)
 	if(DB_ORACLE == database_mode
 		&&  (IsNormalProcessingMode() || (IsUnderPostmaster && MyProcPort)))
 	{
-		if (newval == DB_ORACLE)
+		if (newval == ORA_PARSER)
 		{
 			sql_raw_parser = ora_raw_parser;
 
@@ -427,7 +427,7 @@ assign_compatible_mode(int newval, void *extra)
 
 			assign_search_path(NULL, NULL);
 		}
-		else if (newval == DB_PG)
+		else if (newval == PG_PARSER)
 		{
 			sql_raw_parser = standard_raw_parser;
 
diff --git a/src/pl/plisql/src/pl_exec.c b/src/pl/plisql/src/pl_exec.c
@@ -7443,7 +7443,7 @@ exec_move_row_from_fields(PLiSQL_execstate *estate,
 
 		var_tupdesc = expanded_record_get_tupdesc(newerh);
 
-		if (compatible_db == DB_ORACLE && (rec->datatype->typoid == ROWIDOID ||
+		if (compatible_db == ORA_PARSER && (rec->datatype->typoid == ROWIDOID ||
 			rec->datatype->typoid == UROWIDOID))
 		{
 			is_rowid_var = true;

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,`
`498`	`498`	`{`
`499`	`499`	`Form_pg_attribute attr = TupleDescAttr(tupdesc, i);`
`500`	`500`
`501`		`- if (strcmp(NameStr(attr->attname), "rowid") == 0 && compatible_db != DB_ORACLE)`
	`501`	`+ if (strcmp(NameStr(attr->attname), "rowid") == 0 && compatible_db != ORA_PARSER)`
`502`	`502`	`continue;`
`503`	`503`
`504`	`504`	`if (SystemAttributeByName(NameStr(attr->attname)) != NULL)`
Original file line number	Diff line number	Diff line change
`@@ -4325,7 +4325,7 @@ preprocessNamespacePath(const char *searchPath, Oid roleid,`
`4325`	`4325`	`char curname = (char ) lfirst(l);`
`4326`	`4326`	`Oid namespaceId;`
`4327`	`4327`
`4328`		`- if ((compatible_db == DB_ORACLE && enable_case_switch && identifier_case_switch != NORMAL) ? /* IvorySQL: case sensitive indentify */`
	`4328`	`+ if ((compatible_db == ORA_PARSER && enable_case_switch && identifier_case_switch != NORMAL) ? /* IvorySQL: case sensitive indentify */`
`4329`	`4329`	`pg_strcasecmp(curname, "$user") == 0 : strcmp(curname, "$user") == 0)`
`4330`	`4330`	`{`
`4331`	`4331`	`/* $user --- substitute namespace matching user name, if any */`
Original file line number	Diff line number	Diff line change
`@@ -4346,7 +4346,7 @@ show_modifytable_info(ModifyTableState mtstate, List ancestors,`
`4346`	`4346`	`update_path = mtstate->mt_merge_updated;`
`4347`	`4347`	`delete_path = mtstate->mt_merge_deleted;`
`4348`	`4348`	`skipped_path = total - insert_path - update_path - delete_path;`
`4349`		`- if (compatible_db != DB_ORACLE)`
	`4349`	`+ if (compatible_db != ORA_PARSER)`
`4350`	`4350`	`Assert(skipped_path >= 0);`
`4351`	`4351`
`4352`	`4352`	`if (es->format == EXPLAIN_FORMAT_TEXT)`
`@@ -4363,7 +4363,7 @@ show_modifytable_info(ModifyTableState mtstate, List ancestors,`
`4363`	`4363`	`appendStringInfo(es->str, " deleted=%.0f", delete_path);`
`4364`	`4364`	`if (skipped_path > 0)`
`4365`	`4365`	`{`
`4366`		`- if (compatible_db != DB_ORACLE)`
	`4366`	`+ if (compatible_db != ORA_PARSER)`
`4367`	`4367`	`appendStringInfo(es->str, " skipped=%.0f", skipped_path);`
`4368`	`4368`	`}`
`4369`	`4369`	`appendStringInfoChar(es->str, '\n');`
`@@ -4374,7 +4374,7 @@ show_modifytable_info(ModifyTableState mtstate, List ancestors,`
`4374`	`4374`	`ExplainPropertyFloat("Tuples Inserted", NULL, insert_path, 0, es);`
`4375`	`4375`	`ExplainPropertyFloat("Tuples Updated", NULL, update_path, 0, es);`
`4376`	`4376`	`ExplainPropertyFloat("Tuples Deleted", NULL, delete_path, 0, es);`
`4377`		`- if (compatible_db != DB_ORACLE)`
	`4377`	`+ if (compatible_db != ORA_PARSER)`
`4378`	`4378`	`ExplainPropertyFloat("Tuples Skipped", NULL, skipped_path, 0, es);`
`4379`	`4379`	`}`
`4380`	`4380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2452,7 +2452,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)`
`2452`	`2452`	`errmsg("sequence must be in same schema as table it is linked to")));`
`2453`	`2453`
`2454`	`2454`	`/* Now, fetch the attribute number from the system cache */`
`2455`		`- if (compatible_db == DB_ORACLE && strcmp(seqname, attrname) != 0)`
	`2455`	`+ if (compatible_db == ORA_PARSER && strcmp(seqname, attrname) != 0)`
`2456`	`2456`	`{`
`2457`	`2457`	`attnum = get_attnum(RelationGetRelid(tablerel), attrname);`
`2458`	`2458`	`if (attnum == InvalidAttrNumber)`
`@@ -2461,7 +2461,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)`
`2461`	`2461`	`errmsg("column \"%s\" of relation \"%s\" does not exist",`
`2462`	`2462`	`attrname, RelationGetRelationName(tablerel))));`
`2463`	`2463`	`}`
`2464`		`- else if (compatible_db == DB_PG)`
	`2464`	`+ else if (compatible_db == PG_PARSER)`
`2465`	`2465`	`{`
`2466`	`2466`	`attnum = get_attnum(RelationGetRelid(tablerel), attrname);`
`2467`	`2467`	`if (attnum == InvalidAttrNumber)`
Original file line number	Diff line number	Diff line change
`@@ -4112,7 +4112,7 @@ ExecEvalXmlExpr(ExprState state, ExprEvalStep op)`
`4112`	`4112`
`4113`	`4113`	`if (values != NIL)`
`4114`	`4114`	`{`
`4115`		`- if (ora_updatexml_hook && compatible_db == DB_ORACLE)`
	`4115`	`+ if (ora_updatexml_hook && compatible_db == ORA_PARSER)`
`4116`	`4116`	`op->resvalue = PointerGetDatum((ora_updatexml_hook)(values));`
`4117`	`4117`	`else`
`4118`	`4118`	`*op->resvalue = (Datum) 0;`
Original file line number	Diff line number	Diff line change
`@@ -3587,7 +3587,7 @@ fireASTriggers(ModifyTableState *node)`
`3587`	`3587`	`node->mt_transition_capture);`
`3588`	`3588`	`break;`
`3589`	`3589`	`case CMD_MERGE:`
`3590`		`- if (compatible_db == DB_ORACLE)`
	`3590`	`+ if (compatible_db == ORA_PARSER)`
`3591`	`3591`	`{`
`3592`	`3592`	`if (node->mt_merge_subcommands & MERGE_UPDATE)`
`3593`	`3593`	`ExecASUpdateTriggers(node->ps.state, resultRelInfo,`
Original file line number	Diff line number	Diff line change
`@@ -2462,7 +2462,7 @@ transformUpdateStmt(ParseState pstate, UpdateStmt stmt)`
`2462`	`2462`	`qry->returningList = transformReturningList(pstate, stmt->returningList,`
`2463`	`2463`	`EXPR_KIND_RETURNING);`
`2464`	`2464`
`2465`		`- if (DB_ORACLE == compatible_db)`
	`2465`	`+ if (ORA_PARSER == compatible_db)`
`2466`	`2466`	`{`
`2467`	`2467`	`ListCell *o_target;`
`2468`	`2468`
`@@ -2542,7 +2542,7 @@ transformUpdateTargetList(ParseState pstate, List origTlist)`
`2542`	`2542`
`2543`	`2543`	`attrno = attnameAttNum(pstate->p_target_relation,`
`2544`	`2544`	`origTarget->name, true);`
`2545`		`- if (attrno == InvalidAttrNumber && compatible_db == DB_ORACLE)`
	`2545`	`+ if (attrno == InvalidAttrNumber && compatible_db == ORA_PARSER)`
`2546`	`2546`	`{`
`2547`	`2547`	`if (origTarget->indirection)`
`2548`	`2548`	`{`
`@@ -2600,7 +2600,7 @@ transformUpdateTargetList(ParseState pstate, List origTlist)`
`2600`	`2600`	`parser_errposition(pstate, origTarget->location)));`
`2601`	`2601`	`}`
`2602`	`2602`	`}`
`2603`		`- if (attrno == InvalidAttrNumber && compatible_db == DB_PG)`
	`2603`	`+ if (attrno == InvalidAttrNumber && compatible_db == PG_PARSER)`
`2604`	`2604`	`{`
`2605`	`2605`	`ereport(ERROR,`
`2606`	`2606`	`(errcode(ERRCODE_UNDEFINED_COLUMN),`
Original file line number	Diff line number	Diff line change
`@@ -1107,7 +1107,7 @@ transformAExprOp(ParseState pstate, A_Expr a)`
`1107`	`1107`	`lexpr = transformExprRecurse(pstate, lexpr);`
`1108`	`1108`	`ltypeId = exprType(lexpr);`
`1109`	`1109`
`1110`		`- if (compatible_db == DB_ORACLE && ltypeId == ROWIDOID && nodeTag(rexpr) != T_TypeCast)`
	`1110`	`+ if (compatible_db == ORA_PARSER && ltypeId == ROWIDOID && nodeTag(rexpr) != T_TypeCast)`
`1111`	`1111`	`{`
`1112`	`1112`	`TypeCast *castnode = makeNode(TypeCast);`
`1113`	`1113`	`castnode->typeName = makeTypeNameFromNameList(list_make2(makeString("sys"), makeString("rowid")));`