tuhaihe opened a new pull request, #1938:
URL: https://github.com/apache/cloudberry/pull/1938
analyzedb aborted with UnicodeEncodeError whenever the database held a
schema, table or column whose name is not pure ASCII:
File "analyzedb", line 985, in regclass_schema_tbl
return "to_regclass('%s')" % (pg.escape_string(schema_tbl))
UnicodeEncodeError: 'ascii' codec can't encode characters in
position 13-19: ordinal not in range(128)
The SQL literals were escaped with the module level pg.escape_string() from
PyGreSQL. That function is not bound to a connection, so it has no client
encoding to work with and always encodes str arguments as ASCII -- see
pg_escape_string() in PyGreSQL's pgmodule.c, which passes pg_encoding_ascii.
The connection method conn.escape_string() uses PQclientEncoding() and
PQescapeStringConn() instead, and handles any encoding. This is still the case
in the latest PyGreSQL, so upgrading the bundled version would not have helped.
Add dbconn.escapeString(conn, value), which escapes through the connection,
and use it for all five call sites in analyzedb. get_oid_str() and
regclass_schema_tbl() now take the connection so that they can reach it; every
one of their callers already had one at hand.
Two nearby spots interpolated names into SQL without escaping them at all,
and are now escaped the same way: the schema name given to "analyzedb -s
<schema>", and the schema and table name passed to GET_LEAF_PARTITIONS_SQL.
The behave scenario meant to cover this ("analyzedb can handle the table
name with special utf-8 characters") only created a TEMP table, and temp
schemas are skipped further down in the flow, so it had stopped exercising the
failing path. Extend it with a permanent table, a non-ASCII schema and the -s
path, and assert that those tables really appear in the output rather than only
checking the exit code.
The same pattern is still present in gpload.py and in Escape() and
escapeArrayElement() in gppylib/utils.py, which affect gpload, gpsd and
minirepro. Those are left for a follow-up.
Reported-by: vsbace
Assisted-by: Claude Code
See: Issue#1929 <https://github.com/apache/cloudberry/issues/1929>
<!-- Thank you for your contribution to Apache Cloudberry (Incubating)! -->
Fixes #ISSUE_Number
### What does this PR do?
<!-- Brief overview of the changes, including any major features or fixes -->
### Type of Change
- [ ] Bug fix (non-breaking change)
- [ ] New feature (non-breaking change)
- [ ] Breaking change (fix or feature with breaking changes)
- [ ] Documentation update
### Breaking Changes
<!-- Remove if not applicable. If yes, explain impact and migration path -->
### Test Plan
<!-- How did you test these changes? -->
- [ ] Unit tests added/updated
- [ ] Integration tests added/updated
- [ ] Passed `make installcheck`
- [ ] Passed `make -C src/test installcheck-cbdb-parallel`
### Impact
<!-- Remove sections that don't apply -->
**Performance:**
<!-- Any performance implications? -->
**User-facing changes:**
<!-- Any changes visible to users? -->
**Dependencies:**
<!-- New dependencies or version changes? -->
### Checklist
- [ ] Followed [contribution
guide](https://cloudberry.apache.org/contribute/code)
- [ ] Added/updated documentation
- [ ] Reviewed code for security implications
- [ ] This PR contains AI-assisted code generation
- [ ] Requested review from [cloudberry
committers](https://github.com/orgs/apache/teams/cloudberry-committers)
### Additional Context
<!-- Any other information that would help reviewers? Remove if none -->
### CI Skip Instructions
<!--
To skip CI builds, add the appropriate CI skip identifier to your PR title.
The identifier must:
- Be in square brackets []
- Include the word "ci" and either "skip" or "no"
- Only use for documentation-only changes or when absolutely necessary
-->
---
<!-- Join our community:
- Mailing list:
[[email protected]](https://lists.apache.org/[email protected])
(subscribe: [email protected])
- Discussions: https://github.com/apache/cloudberry/discussions -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
