Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHOENIX-6003 Metadata operations via Avatica turn empty string args t… #70

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

PHOENIX-6003 Metadata operations via Avatica turn empty string args t… #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion python-phoenixdb/gen-protobuf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.

set -x
AVATICA_VER=rel/avatica-1.10.0
AVATICA_VER=rel/avatica-1.18.0

set -e

Expand Down
18 changes: 18 additions & 0 deletions python-phoenixdb/phoenixdb/avatica/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,12 @@ def get_schemas(self, connection_id, catalog=None, schemaPattern=None):
request.connection_id = connection_id
if catalog is not None:
request.catalog = catalog
if catalog == '':
request.has_catalog = True
if schemaPattern is not None:
request.schema_pattern = schemaPattern
if schemaPattern == '':
request.has_schema_pattern = True
response_data = self._apply(request, 'ResultSetResponse')
response = responses_pb2.ResultSetResponse()
response.ParseFromString(response_data)
Expand All @@ -266,10 +270,16 @@ def get_tables(self, connection_id, catalog=None, schemaPattern=None, tableNameP
request.connection_id = connection_id
if catalog is not None:
request.catalog = catalog
if catalog == '':
request.has_catalog = True
if schemaPattern is not None:
request.schema_pattern = schemaPattern
if schemaPattern == '':
request.has_schema_pattern = True
if tableNamePattern is not None:
request.table_name_pattern = tableNamePattern
if tableNamePattern == '':
request.has_table_name_pattern = True
if typeList is not None:
request.type_list.extend(typeList)
request.has_type_list = typeList is not None
Expand All @@ -283,12 +293,20 @@ def get_columns(self, connection_id, catalog=None, schemaPattern=None, tableName
request.connection_id = connection_id
if catalog is not None:
request.catalog = catalog
if catalog == '':
request.has_catalog = True
if schemaPattern is not None:
request.schema_pattern = schemaPattern
if schemaPattern == '':
request.has_schema_pattern = True
if tableNamePattern is not None:
request.table_name_pattern = tableNamePattern
if tableNamePattern == '':
request.has_table_name_pattern = True
if columnNamePattern is not None:
request.column_name_pattern = columnNamePattern
if columnNamePattern == '':
request.has_column_name_pattern = True
response_data = self._apply(request, 'ResultSetResponse')
response = responses_pb2.ResultSetResponse()
response.ParseFromString(response_data)
Expand Down
Loading