IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow creation of tables with pure numeric names. Fixes #2284

Browse Source
This commit is contained in:
Murtuza Zabuawala
2017-05-10 09:40:32 +01:00
committed by Dave Page
parent 3ed00d3be7
commit 9452e0699e
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
View File

@@ -1376,6 +1376,28 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
return data return data
def check_and_convert_name_to_string(self, data):
"""
This function will check and covert table to string incase
it is numeric
Args:
data: data dict
Returns:
Updated data dict
"""
# For Python2, it can be int, long, float
if hasattr(str, 'decode'):
if isinstance(data['name'], (int, long, float)):
data['name'] = str(data['name'])
else:
# For Python3, it can be int, float
if isinstance(data['name'], (int, float)):
data['name'] = str(data['name'])
return data
@check_precondition @check_precondition
def create(self, gid, sid, did, scid): def create(self, gid, sid, did, scid):
""" """
@@ -1417,6 +1439,7 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
# Parse & format columns # Parse & format columns
data = self._parse_format_columns(data) data = self._parse_format_columns(data)
data = self.check_and_convert_name_to_string(data)
# 'coll_inherits' is Array but it comes as string from browser # 'coll_inherits' is Array but it comes as string from browser
# We will convert it again to list # We will convert it again to list
@@ -1447,8 +1470,10 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
return internal_server_error(errormsg=res) return internal_server_error(errormsg=res)
# PostgreSQL truncates the table name to 63 characters. # PostgreSQL truncates the table name to 63 characters.
# Have to truncate the name like PostgreSQL to get the proper schema id # Have to truncate the name like PostgreSQL to get the
# proper OID
CONST_MAX_CHAR_COUNT = 63 CONST_MAX_CHAR_COUNT = 63
if len(data['name']) > CONST_MAX_CHAR_COUNT: if len(data['name']) > CONST_MAX_CHAR_COUNT:
data['name'] = data['name'][0:CONST_MAX_CHAR_COUNT] data['name'] = data['name'][0:CONST_MAX_CHAR_COUNT]
@@ -2129,9 +2154,12 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
data['relacl'][mode], self.acl data['relacl'][mode], self.acl
) )
# If name if not present # If name is not present in request data
if 'name' not in data: if 'name' not in data:
data['name'] = old_data['name'] data['name'] = old_data['name']
data = self.check_and_convert_name_to_string(data)
# If name if not present # If name if not present
if 'schema' not in data: if 'schema' not in data:
data['schema'] = old_data['schema'] data['schema'] = old_data['schema']
@@ -2310,6 +2338,7 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
# Parse & format columns # Parse & format columns
data = self._parse_format_columns(data) data = self._parse_format_columns(data)
data = self.check_and_convert_name_to_string(data)
if 'foreign_key' in data: if 'foreign_key' in data:
for c in data['foreign_key']: for c in data['foreign_key']: