fix bug 2177 2168 #2183
Closed
fix bug 2177 2168 #2183
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #2183 +/- ##
==========================================
+ Coverage 75.13% 75.14% +0.01%
==========================================
Files 105 105
Lines 15169 15169
==========================================
+ Hits 11397 11399 +2
+ Misses 3772 3770 -2
☔ View full report in Codecov by Sentry. |
LeoQuote
requested changes
Jun 8, 2023
sql/engines/oracle.py
Outdated
| @@ -609,7 +606,7 @@ def explain_check(self, db_name=None, sql="", close_conn=False): | |||
| ) | |||
| rows = cursor.fetchone() | |||
| conn.rollback() | |||
| if not rows: | |||
| if rows[0] is None or not rows: | |||
There was a problem hiding this comment.
Suggested change
| if rows[0] is None or not rows: | |
| if not rows or not isinstance(rows, list) or not rows[0]: |
| f" ALTER SESSION SET CURRENT_SCHEMA = :db_name ", | ||
| {"db_name": db_name}, | ||
| ) | ||
| cursor.execute(f' ALTER SESSION SET CURRENT_SCHEMA = "{db_name}" ') |
There was a problem hiding this comment.
如果低版本的不支持, 还请麻烦提供其他防止sql注入的手段
Co-authored-by: Leo Q <[email protected]>
|
@LeoQuote 我们可以使用connection.current_schema=db_name代替 cursor.execute(f' ALTER SESSION SET CURRENT_SCHEMA = "{db_name}" ') 参考https://cx-oracle.readthedocs.io/en/latest/api_manual/connection.html?highlight=CURRENT_SCHEMA#Connection.current_schema 官方文档 |
|
@tonyhu214 如果知道方案的话, 还请麻烦提个 pr, 多谢了 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #2168
fix #2177
explain plan for create table test (id number);
select CARDINALITY from (select CARDINALITY from PLAN_TABLE t where id = 0 order by t.timestamp desc) where rownum = 1
注意上面的返回是有结果的，一行数据，但是这一行数据值为null。
所以rows[0] 为None。
此时会走到
result["rows"] = rows[0]
会报：
#2168
[2023-05-23 16:44:22,753][Thread-2:139803802728192][task_id:default][oracle.py:1010][WARNING]- Oracle 语句执行报错，第1个SQL：create table test111(id int);，错误信息Traceback (most recent call last):
File "/backup/Archery-1.9.1/sql/engines/oracle.py", line 836, in execute_check
if result_set["rows"] > 1000:
TypeError: '>' not supported between instances of 'NoneType' and 'int'
fix bug 2177：
11.2.0.4版本中，不支持ddl中绑定变量，故修改为
cursor.execute(f' ALTER SESSION SET CURRENT_SCHEMA = "{db_name}" ')