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

Show tablespace on partitions. Fixes #2551

Browse Source
This commit is contained in:
Harshal Dhumal 2017-07-17 09:50:18 +01:00 committed by Dave Page
parent 4eefc52748
commit 07aa74eaf5
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/partition/sql/10_plus/create.sql
View File

@ -19,9 +19,15 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE {{conn|qtIdent(data
{% endif %} {% endif %}
{{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %} {{ data.partition_value }}{% if data.is_partitioned is defined and data.is_partitioned %}
PARTITION BY {{ data.partition_scheme }}{% endif %}; PARTITION BY {{ data.partition_scheme }}{% endif %}
{### SQL for Tablespace ###}
{% if data.spcname %}
TABLESPACE {{ conn|qtIdent(data.spcname) }};
{% else %}
;
{% endif %}
{### Alter SQL for Owner ###} {### Alter SQL for Owner ###}
{% if data.relowner %} {% if data.relowner %}

37
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
View File

@ -1030,26 +1030,27 @@ class BaseTableView(PGChildNodeView):
if not status: if not status:
return internal_server_error(errormsg=rset) return internal_server_error(errormsg=rset)
sql_header = u"\n-- Partitions SQL" if len(rset['rows']):
partition_sql = '' sql_header = u"\n-- Partitions SQL"
for row in rset['rows']: partition_sql = ''
part_data = dict() for row in rset['rows']:
part_data['partitioned_table_name'] = data['name'] part_data = dict()
part_data['parent_schema'] = data['schema'] part_data['partitioned_table_name'] = data['name']
part_data['schema'] = row['schema_name'] part_data['parent_schema'] = data['schema']
part_data['relispartition'] = True part_data['schema'] = row['schema_name']
part_data['name'] = row['name'] part_data['relispartition'] = True
part_data['partition_value'] = row['partition_value'] part_data['name'] = row['name']
part_data['is_partitioned'] = row ['is_partitioned'] part_data['partition_value'] = row['partition_value']
part_data['partition_scheme'] = row['partition_scheme'] part_data['is_partitioned'] = row ['is_partitioned']
part_data['partition_scheme'] = row['partition_scheme']
partition_sql += render_template("/".join( partition_sql += render_template("/".join(
[self.partition_template_path, 'create.sql']), [self.partition_template_path, 'create.sql']),
data=part_data, conn=self.conn) data=part_data, conn=self.conn)
# Add into main sql # Add into main sql
partition_sql = re.sub('\n{2,}', '\n\n', partition_sql) partition_sql = re.sub('\n{2,}', '\n\n', partition_sql)
main_sql.append(sql_header + '\n\n' + partition_sql.strip('\n')) main_sql.append(sql_header + '\n\n' + partition_sql.strip('\n'))
sql = '\n'.join(main_sql) sql = '\n'.join(main_sql)