subject:"\[pgadmin\-hackers\] \[pgAdmin4\]\[Patch\]\: Fixed RM 2324 \- PostGIS datatypes not showing up properly on SQL tab."

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-13 Thread Dave Page

Thanks, applied.

On Tue, Jun 13, 2017 at 4:45 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> On Mon, Jun 12, 2017 at 8:24 PM, Dave Page  wrote:
>
>> Hi Khushboo,
>>
>> Looks like this patch broke the regressions tests :-(. Can you take a
>> look ASAP please?
>>
>> please find the attached fix. However I didn't get any error while
> running regression tests.
>
>> Thanks!
>>
>> 2017-06-12 10:04:11,938: INFO werkzeug: 127.0.0.1 - - [12/Jun/2017
>> 10:04:11] "GET /browser/table/sql/1/1/12669/2200/81920 HTTP/1.1" 500 -
>> Traceback (most recent call last):
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 2000, in __call__
>> return self.wsgi_app(environ, start_response)
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1991, in wsgi_app
>> response = self.make_response(self.handle_exception(e))
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1567, in handle_exception
>> reraise(exc_type, exc_value, tb)
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1988, in wsgi_app
>> response = self.full_dispatch_request()
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1641, in full_dispatch_request
>> rv = self.handle_user_exception(e)
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1544, in handle_user_exception
>> reraise(exc_type, exc_value, tb)
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1639, in full_dispatch_request
>> rv = self.dispatch_request()
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/app.py", line 1625, in dispatch_request
>> return self.view_functions[rule.endpoint](**req.view_args)
>>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/pyth
>> on2.7/site-packages/flask/views.py", line 84, in view
>> return self.dispatch_request(*args, **kwargs)
>>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/utils.py",
>> line 235, in dispatch_request
>> return method(*args, **kwargs)
>>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
>> r_groups/servers/databases/schemas/tables/__init__.py", line 315, in wrap
>> return f(*args, **kwargs)
>>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
>> r_groups/servers/databases/schemas/tables/__init__.py", line 2555, in sql
>> data = self._formatter(did, scid, tid, data)
>>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
>> r_groups/servers/databases/schemas/tables/__init__.py", line 1081, in
>> _formatter
>> data = self._columns_formatter(tid, data)
>>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
>> r_groups/servers/databases/schemas/tables/__init__.py", line 663, in
>> _columns_formatter
>> column['attlen'] = matchObj.group(1)
>> AttributeError: 'NoneType' object has no attribute 'group'
>>
>>
>> On Mon, Jun 12, 2017 at 12:49 PM, Dave Page  wrote:
>>
>>> Thanks, applied.
>>>
>>> On Fri, Jun 9, 2017 at 10:18 AM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,

 Please find the attached updated patch.

 Fixed the PostGIS Datatypes in SQL tab, Create / Update dialogues for
 Table, Column, Foreign Table and Type node.

 Regarding  the review comment given by Dave (Also, I there should be a
 space between the , and value in the_geom geometry(MultiPolygon,3310).),
 won't be fixed as this format is returned by format_type() function itself.

 As per the conversation with Dave, I have logged RM #2473
  to add support for
 PostGIS Datatypes.

 Thanks,
 Khushboo

 On Tue, Jun 6, 2017 at 6:49 PM, Dave Page  wrote:

>
>
> On Tue, Jun 6, 2017 at 2:15 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>>
>>
>> On 6 Jun 2017 18:36, "Dave Page"  wrote:
>>
>>
>>
>> On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>>
>>>
>>> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>>>
>>> Hi
>>>
>>> The table and column dialogues seem to have related problems. For
>>> example, the table dialogue shows the length of the geometry field in 
>>> the
>>> test case as 847,380, whilst the column dialogue shows no length at all.
>>>
>>> What should be there in length and precision fields in this case?
>>>
>>
>> I

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-12 Thread Khushboo Vashi

Hi,

On Mon, Jun 12, 2017 at 8:24 PM, Dave Page  wrote:

> Hi Khushboo,
>
> Looks like this patch broke the regressions tests :-(. Can you take a look
> ASAP please?
>
> please find the attached fix. However I didn't get any error while running
regression tests.

> Thanks!
>
> 2017-06-12 10:04:11,938: INFO werkzeug: 127.0.0.1 - - [12/Jun/2017
> 10:04:11] "GET /browser/table/sql/1/1/12669/2200/81920 HTTP/1.1" 500 -
> Traceback (most recent call last):
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 2000, in __call__
> return self.wsgi_app(environ, start_response)
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1991, in wsgi_app
> response = self.make_response(self.handle_exception(e))
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1567, in handle_exception
> reraise(exc_type, exc_value, tb)
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1988, in wsgi_app
> response = self.full_dispatch_request()
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1641, in full_dispatch_request
> rv = self.handle_user_exception(e)
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1544, in handle_user_exception
> reraise(exc_type, exc_value, tb)
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1639, in full_dispatch_request
> rv = self.dispatch_request()
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/app.py", line 1625, in dispatch_request
> return self.view_functions[rule.endpoint](**req.view_args)
>   File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/lib/
> python2.7/site-packages/flask/views.py", line 84, in view
> return self.dispatch_request(*args, **kwargs)
>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/utils.py",
> line 235, in dispatch_request
> return method(*args, **kwargs)
>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
> r_groups/servers/databases/schemas/tables/__init__.py", line 315, in wrap
> return f(*args, **kwargs)
>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
> r_groups/servers/databases/schemas/tables/__init__.py", line 2555, in sql
> data = self._formatter(did, scid, tid, data)
>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
> r_groups/servers/databases/schemas/tables/__init__.py", line 1081, in
> _formatter
> data = self._columns_formatter(tid, data)
>   File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/serve
> r_groups/servers/databases/schemas/tables/__init__.py", line 663, in
> _columns_formatter
> column['attlen'] = matchObj.group(1)
> AttributeError: 'NoneType' object has no attribute 'group'
>
>
> On Mon, Jun 12, 2017 at 12:49 PM, Dave Page  wrote:
>
>> Thanks, applied.
>>
>> On Fri, Jun 9, 2017 at 10:18 AM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> Please find the attached updated patch.
>>>
>>> Fixed the PostGIS Datatypes in SQL tab, Create / Update dialogues for
>>> Table, Column, Foreign Table and Type node.
>>>
>>> Regarding  the review comment given by Dave (Also, I there should be a
>>> space between the , and value in the_geom geometry(MultiPolygon,3310).),
>>> won't be fixed as this format is returned by format_type() function itself.
>>>
>>> As per the conversation with Dave, I have logged RM #2473
>>>  to add support for PostGIS
>>> Datatypes.
>>>
>>> Thanks,
>>> Khushboo
>>>
>>> On Tue, Jun 6, 2017 at 6:49 PM, Dave Page  wrote:
>>>


 On Tue, Jun 6, 2017 at 2:15 PM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

>
>
> On 6 Jun 2017 18:36, "Dave Page"  wrote:
>
>
>
> On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>>
>>
>> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>>
>> Hi
>>
>> The table and column dialogues seem to have related problems. For
>> example, the table dialogue shows the length of the geometry field in the
>> test case as 847,380, whilst the column dialogue shows no length at all.
>>
>> What should be there in length and precision fields in this case?
>>
>
> I have no idea :-). What did pgAdmin 3 do here? I assume there's some
> way to decode the typmod into the desired values, and map them back to
> appropriate SQL.
>
> I will try to figure out the way.
> pgAdmin 3 has the

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-12 Thread Dave Page

Hi Khushboo,

Looks like this patch broke the regressions tests :-(. Can you take a look
ASAP please?

Thanks!

2017-06-12 10:04:11,938: INFO werkzeug: 127.0.0.1 - - [12/Jun/2017
10:04:11] "GET /browser/table/sql/1/1/12669/2200/81920 HTTP/1.1" 500 -
Traceback (most recent call last):
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 2000, in __call__
return self.wsgi_app(environ, start_response)
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1991, in wsgi_app
response = self.make_response(self.handle_exception(e))
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1567, in handle_exception
reraise(exc_type, exc_value, tb)
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1988, in wsgi_app
response = self.full_dispatch_request()
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1641, in
full_dispatch_request
rv = self.handle_user_exception(e)
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1544, in
handle_user_exception
reraise(exc_type, exc_value, tb)
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1639, in
full_dispatch_request
rv = self.dispatch_request()
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/app.py", line 1625, in dispatch_request
return self.view_functions[rule.endpoint](**req.view_args)
  File "/Users/pivotal/.pyenv/versions/2.7.10/envs/pgadmin/
lib/python2.7/site-packages/flask/views.py", line 84, in view
return self.dispatch_request(*args, **kwargs)
  File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/utils.py",
line 235, in dispatch_request
return method(*args, **kwargs)
  File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/
server_groups/servers/databases/schemas/tables/__init__.py", line 315, in
wrap
return f(*args, **kwargs)
  File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/
server_groups/servers/databases/schemas/tables/__init__.py", line 2555, in
sql
data = self._formatter(did, scid, tid, data)
  File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/
server_groups/servers/databases/schemas/tables/__init__.py", line 1081, in
_formatter
data = self._columns_formatter(tid, data)
  File "/Users/pivotal/workspace/pgadmin4/web/pgadmin/browser/
server_groups/servers/databases/schemas/tables/__init__.py", line 663, in
_columns_formatter
column['attlen'] = matchObj.group(1)
AttributeError: 'NoneType' object has no attribute 'group'


On Mon, Jun 12, 2017 at 12:49 PM, Dave Page  wrote:

> Thanks, applied.
>
> On Fri, Jun 9, 2017 at 10:18 AM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached updated patch.
>>
>> Fixed the PostGIS Datatypes in SQL tab, Create / Update dialogues for
>> Table, Column, Foreign Table and Type node.
>>
>> Regarding  the review comment given by Dave (Also, I there should be a
>> space between the , and value in the_geom geometry(MultiPolygon,3310).),
>> won't be fixed as this format is returned by format_type() function itself.
>>
>> As per the conversation with Dave, I have logged RM #2473
>>  to add support for PostGIS
>> Datatypes.
>>
>> Thanks,
>> Khushboo
>>
>> On Tue, Jun 6, 2017 at 6:49 PM, Dave Page  wrote:
>>
>>>
>>>
>>> On Tue, Jun 6, 2017 at 2:15 PM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>


 On 6 Jun 2017 18:36, "Dave Page"  wrote:



 On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

>
>
> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>
> Hi
>
> The table and column dialogues seem to have related problems. For
> example, the table dialogue shows the length of the geometry field in the
> test case as 847,380, whilst the column dialogue shows no length at all.
>
> What should be there in length and precision fields in this case?
>

 I have no idea :-). What did pgAdmin 3 do here? I assume there's some
 way to decode the typmod into the desired values, and map them back to
 appropriate SQL.

 I will try to figure out the way.
 pgAdmin 3 has the same issue, so I have asked for the suggestion.

>>>
>>> Oh, OK - thanks. Maybe we need to reuse the length and precision fields
>>> for these types. That is, I believe, essentially how PostGIS passes extra
>>> info to the column definitions.
>>>
>>>


> Also, I there should be a space between the , and value in the_geom
>

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-12 Thread Dave Page

Thanks, applied.

On Fri, Jun 9, 2017 at 10:18 AM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached updated patch.
>
> Fixed the PostGIS Datatypes in SQL tab, Create / Update dialogues for
> Table, Column, Foreign Table and Type node.
>
> Regarding  the review comment given by Dave (Also, I there should be a
> space between the , and value in the_geom geometry(MultiPolygon,3310).),
> won't be fixed as this format is returned by format_type() function itself.
>
> As per the conversation with Dave, I have logged RM #2473
>  to add support for PostGIS
> Datatypes.
>
> Thanks,
> Khushboo
>
> On Tue, Jun 6, 2017 at 6:49 PM, Dave Page  wrote:
>
>>
>>
>> On Tue, Jun 6, 2017 at 2:15 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>>
>>>
>>> On 6 Jun 2017 18:36, "Dave Page"  wrote:
>>>
>>>
>>>
>>> On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>


 On 6 Jun 2017 17:42, "Dave Page"  wrote:

 Hi

 The table and column dialogues seem to have related problems. For
 example, the table dialogue shows the length of the geometry field in the
 test case as 847,380, whilst the column dialogue shows no length at all.

 What should be there in length and precision fields in this case?

>>>
>>> I have no idea :-). What did pgAdmin 3 do here? I assume there's some
>>> way to decode the typmod into the desired values, and map them back to
>>> appropriate SQL.
>>>
>>> I will try to figure out the way.
>>> pgAdmin 3 has the same issue, so I have asked for the suggestion.
>>>
>>
>> Oh, OK - thanks. Maybe we need to reuse the length and precision fields
>> for these types. That is, I believe, essentially how PostGIS passes extra
>> info to the column definitions.
>>
>>
>>>
>>>
 Also, I there should be a space between the , and value in the_geom
 geometry(MultiPolygon,3310).

 Thanks.

 On Mon, Jun 5, 2017 at 8:32 AM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and
> Type node.
>
> Please find the attached updated patch.
>
>
> Thanks,
> Khushboo
>
> On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
> murtuza.zabuaw...@enterprisedb.com> wrote:
>
>>
>> On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>>
>>> On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
>>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>>
 Hi Khushboo,

 Please include Type node and Foreign Table node in your fix :-)

 I don't think Type node requires this change.
>>>
>>> Yes, It do require because user can create composite type from
>> existing types.
>> [image: Inline image 1]
>>
>>> Foreign table changes added in the attached updated patch.
>>>
 --

>>> Thanks Murtuza for pointing this out.
>
>
>> Regards,
 Murtuza Zabuawala
 EnterpriseDB: http://www.enterprisedb.com
 The Enterprise PostgreSQL Company

 On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2324 : PostGIS datatypes
> not showing up properly on SQL tab.
>
> Thanks,
> Khushboo
>
>
>
> --
> Sent via pgadmin-hackers mailing list (
> pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>

>>>
>>
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>


 --
 Dave Page
 Blog: http://pgsnake.blogspot.com
 Twitter: @pgsnake

 EnterpriseDB UK: http://www.enterprisedb.com
 The Enterprise PostgreSQL Company



>>>
>>>
>>> --
>>> Dave Page
>>> Blog: http://pgsnake.blogspot.com
>>> Twitter: @pgsnake
>>>
>>> EnterpriseDB UK: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>>
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-06 Thread Dave Page

On Tue, Jun 6, 2017 at 2:15 PM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

>
>
> On 6 Jun 2017 18:36, "Dave Page"  wrote:
>
>
>
> On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>>
>>
>> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>>
>> Hi
>>
>> The table and column dialogues seem to have related problems. For
>> example, the table dialogue shows the length of the geometry field in the
>> test case as 847,380, whilst the column dialogue shows no length at all.
>>
>> What should be there in length and precision fields in this case?
>>
>
> I have no idea :-). What did pgAdmin 3 do here? I assume there's some way
> to decode the typmod into the desired values, and map them back to
> appropriate SQL.
>
> I will try to figure out the way.
> pgAdmin 3 has the same issue, so I have asked for the suggestion.
>

Oh, OK - thanks. Maybe we need to reuse the length and precision fields for
these types. That is, I believe, essentially how PostGIS passes extra info
to the column definitions.


>
>
>> Also, I there should be a space between the , and value in the_geom
>> geometry(MultiPolygon,3310).
>>
>> Thanks.
>>
>> On Mon, Jun 5, 2017 at 8:32 AM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and
>>> Type node.
>>>
>>> Please find the attached updated patch.
>>>
>>>
>>> Thanks,
>>> Khushboo
>>>
>>> On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
>>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>>

 On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
>
> On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
> murtuza.zabuaw...@enterprisedb.com> wrote:
>
>> Hi Khushboo,
>>
>> Please include Type node and Foreign Table node in your fix :-)
>>
>> I don't think Type node requires this change.
>
> Yes, It do require because user can create composite type from
 existing types.
 [image: Inline image 1]

> Foreign table changes added in the attached updated patch.
>
>> --
>>
> Thanks Murtuza for pointing this out.
>>>
>>>
 Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> Please find the attached patch to fix RM #2324 : PostGIS datatypes
>>> not showing up properly on SQL tab.
>>>
>>> Thanks,
>>> Khushboo
>>>
>>>
>>>
>>> --
>>> Sent via pgadmin-hackers mailing list (pgadmin-hack...@postgresql.or
>>> g)
>>> To make changes to your subscription:
>>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>>
>>>
>>
>

>>>
>>>
>>> --
>>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>>> To make changes to your subscription:
>>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>>
>>>
>>
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>>
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-06 Thread Khushboo Vashi

On 6 Jun 2017 18:36, "Dave Page"  wrote:



On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi  wrote:

>
>
> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>
> Hi
>
> The table and column dialogues seem to have related problems. For example,
> the table dialogue shows the length of the geometry field in the test case
> as 847,380, whilst the column dialogue shows no length at all.
>
> What should be there in length and precision fields in this case?
>

I have no idea :-). What did pgAdmin 3 do here? I assume there's some way
to decode the typmod into the desired values, and map them back to
appropriate SQL.

I will try to figure out the way.
pgAdmin 3 has the same issue, so I have asked for the suggestion.



> Also, I there should be a space between the , and value in the_geom
> geometry(MultiPolygon,3310).
>
> Thanks.
>
> On Mon, Jun 5, 2017 at 8:32 AM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and
>> Type node.
>>
>> Please find the attached updated patch.
>>
>>
>> Thanks,
>> Khushboo
>>
>> On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>>
>>> On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,


 On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
 murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Khushboo,
>
> Please include Type node and Foreign Table node in your fix :-)
>
> I don't think Type node requires this change.

 Yes, It do require because user can create composite type from existing
>>> types.
>>> [image: Inline image 1]
>>>
 Foreign table changes added in the attached updated patch.

> --
>
 Thanks Murtuza for pointing this out.
>>
>>
>>> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch to fix RM #2324 : PostGIS datatypes
>> not showing up properly on SQL tab.
>>
>> Thanks,
>> Khushboo
>>
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org
>> )
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>

>>>
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-06 Thread Dave Page

On Tue, Jun 6, 2017 at 1:23 PM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

>
>
> On 6 Jun 2017 17:42, "Dave Page"  wrote:
>
> Hi
>
> The table and column dialogues seem to have related problems. For example,
> the table dialogue shows the length of the geometry field in the test case
> as 847,380, whilst the column dialogue shows no length at all.
>
> What should be there in length and precision fields in this case?
>

I have no idea :-). What did pgAdmin 3 do here? I assume there's some way
to decode the typmod into the desired values, and map them back to
appropriate SQL.


>
> Also, I there should be a space between the , and value in the_geom
> geometry(MultiPolygon,3310).
>
> Thanks.
>
> On Mon, Jun 5, 2017 at 8:32 AM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and
>> Type node.
>>
>> Please find the attached updated patch.
>>
>>
>> Thanks,
>> Khushboo
>>
>> On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>>
>>> On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,


 On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
 murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Khushboo,
>
> Please include Type node and Foreign Table node in your fix :-)
>
> I don't think Type node requires this change.

 Yes, It do require because user can create composite type from existing
>>> types.
>>> [image: Inline image 1]
>>>
 Foreign table changes added in the attached updated patch.

> --
>
 Thanks Murtuza for pointing this out.
>>
>>
>>> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch to fix RM #2324 : PostGIS datatypes
>> not showing up properly on SQL tab.
>>
>> Thanks,
>> Khushboo
>>
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org
>> )
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>

>>>
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-06 Thread Khushboo Vashi

On 6 Jun 2017 17:42, "Dave Page"  wrote:

Hi

The table and column dialogues seem to have related problems. For example,
the table dialogue shows the length of the geometry field in the test case
as 847,380, whilst the column dialogue shows no length at all.

What should be there in length and precision fields in this case?


Also, I there should be a space between the , and value in the_geom
geometry(MultiPolygon,3310).

Thanks.

On Mon, Jun 5, 2017 at 8:32 AM, Khushboo Vashi  wrote:

> Hi,
>
> Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and
> Type node.
>
> Please find the attached updated patch.
>
>
> Thanks,
> Khushboo
>
> On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
> murtuza.zabuaw...@enterprisedb.com> wrote:
>
>>
>> On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>>
>>> On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
>>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>>
 Hi Khushboo,

 Please include Type node and Foreign Table node in your fix :-)

 I don't think Type node requires this change.
>>>
>>> Yes, It do require because user can create composite type from existing
>> types.
>> [image: Inline image 1]
>>
>>> Foreign table changes added in the attached updated patch.
>>>
 --

>>> Thanks Murtuza for pointing this out.
>
>
>> Regards,
 Murtuza Zabuawala
 EnterpriseDB: http://www.enterprisedb.com
 The Enterprise PostgreSQL Company

 On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
 khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2324 : PostGIS datatypes not
> showing up properly on SQL tab.
>
> Thanks,
> Khushboo
>
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>

>>>
>>
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>


-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-05 Thread Khushboo Vashi

Hi,

Fixed PostGIS datatype on SQL tab for Table, column, Foreign Table and Type
node.

Please find the attached updated patch.


Thanks,
Khushboo

On Thu, Jun 1, 2017 at 6:36 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

>
> On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>>
>> On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>> Hi Khushboo,
>>>
>>> Please include Type node and Foreign Table node in your fix :-)
>>>
>>> I don't think Type node requires this change.
>>
>> Yes, It do require because user can create composite type from existing
> types.
> [image: Inline image 1]
>
>> Foreign table changes added in the attached updated patch.
>>
>>> --
>>>
>> Thanks Murtuza for pointing this out.


> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
>>> khushboo.va...@enterprisedb.com> wrote:
>>>
 Hi,

 Please find the attached patch to fix RM #2324 : PostGIS datatypes not
 showing up properly on SQL tab.

 Thanks,
 Khushboo



 --
 Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
 To make changes to your subscription:
 http://www.postgresql.org/mailpref/pgadmin-hackers


>>>
>>
>
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
index 15455e8..2ee6a43 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
@@ -830,7 +830,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader):
 data['columns'] = col_data
 
 SQL = render_template("/".join([self.template_path,
-'create.sql']), data=data)
+'create.sql']), data=data, is_sql=True)
 
 sql_header = u"""-- FOREIGN TABLE: {0}
 
@@ -1093,10 +1093,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader):
 substr = c['fulltype'][c['fulltype'].find("(") + 1:c['fulltype'].find(")")]
 typlen = substr.split(",")
 if len(typlen) > 1:
-c['typlen'] = int(typlen[0])
-c['precision'] = int(typlen[1])
+c['typlen'] = int(typlen[0]) if typlen[0].isdigit() else typlen[0]
+c['precision'] = int(typlen[1]) if typlen[1].isdigit() else typlen[1]
 else:
-c['typlen'] = int(typlen[0])
+c['typlen'] = int(typlen[0]) if typlen[0].isdigit() else typlen[0]
 c['precision'] = None
 
 # Get formatted Column Options
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
index cbffa89..d055de0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
@@ -4,7 +4,7 @@
 CREATE FOREIGN TABLE {{ conn|qtIdent(data.basensp, data.name) }}(
 {% if data.columns %}
 {% for c in data.columns %}
-{{conn|qtIdent(c.attname)}} {{conn|qtTypeIdent(c.datatype) }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}{% if c.coloptions %}
+{{conn|qtIdent(c.attname)}} {% if is_sql %}{{ c.fulltype }}{% else %}{{conn|qtTypeIdent(c.datatype) }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}{% endif %}{% if c.coloptions %}
 {% for o in c.coloptions %}{% if o.option and o.value %}
 {% if loop.first %} OPTIONS ({% endif %}{% if not loop.first %}, {% endif %}{{o.option}} {{o.value|qtLiteral}}{% if loop.last %}){% endif %}{% endif %}
 {% endfor %}{% endif %}{% if c.attnotnull %}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
index 093eec0..bccebd4 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
@@ -7,7 +7,7 @@

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-01 Thread Murtuza Zabuawala

On Thu, Jun 1, 2017 at 5:27 PM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
>
> On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala  enterprisedb.com> wrote:
>
>> Hi Khushboo,
>>
>> Please include Type node and Foreign Table node in your fix :-)
>>
>> I don't think Type node requires this change.
>
> Yes, It do require because user can create composite type from existing
types.
[image: Inline image 1]

> Foreign table changes added in the attached updated patch.
>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
>> khushboo.va...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> Please find the attached patch to fix RM #2324 : PostGIS datatypes not
>>> showing up properly on SQL tab.
>>>
>>> Thanks,
>>> Khushboo
>>>
>>>
>>>
>>> --
>>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>>> To make changes to your subscription:
>>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>>
>>>
>>
>

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-01 Thread Khushboo Vashi

Hi,


On Thu, Jun 1, 2017 at 4:57 PM, Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi Khushboo,
>
> Please include Type node and Foreign Table node in your fix :-)
>
> I don't think Type node requires this change.

Foreign table changes added in the attached updated patch.

> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
> On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
> khushboo.va...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> Please find the attached patch to fix RM #2324 : PostGIS datatypes not
>> showing up properly on SQL tab.
>>
>> Thanks,
>> Khushboo
>>
>>
>>
>> --
>> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
>> To make changes to your subscription:
>> http://www.postgresql.org/mailpref/pgadmin-hackers
>>
>>
>
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
index 15455e8..2ee6a43 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
@@ -830,7 +830,7 @@ class ForeignTableView(PGChildNodeView, DataTypeReader):
 data['columns'] = col_data
 
 SQL = render_template("/".join([self.template_path,
-'create.sql']), data=data)
+'create.sql']), data=data, is_sql=True)
 
 sql_header = u"""-- FOREIGN TABLE: {0}
 
@@ -1093,10 +1093,10 @@ class ForeignTableView(PGChildNodeView, DataTypeReader):
 substr = c['fulltype'][c['fulltype'].find("(") + 1:c['fulltype'].find(")")]
 typlen = substr.split(",")
 if len(typlen) > 1:
-c['typlen'] = int(typlen[0])
-c['precision'] = int(typlen[1])
+c['typlen'] = int(typlen[0]) if typlen[0].isdigit() else typlen[0]
+c['precision'] = int(typlen[1]) if typlen[1].isdigit() else typlen[1]
 else:
-c['typlen'] = int(typlen[0])
+c['typlen'] = int(typlen[0]) if typlen[0].isdigit() else typlen[0]
 c['precision'] = None
 
 # Get formatted Column Options
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
index cbffa89..d055de0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.2_plus/create.sql
@@ -4,7 +4,7 @@
 CREATE FOREIGN TABLE {{ conn|qtIdent(data.basensp, data.name) }}(
 {% if data.columns %}
 {% for c in data.columns %}
-{{conn|qtIdent(c.attname)}} {{conn|qtTypeIdent(c.datatype) }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}{% if c.coloptions %}
+{{conn|qtIdent(c.attname)}} {% if is_sql %}{{ c.fulltype }}{% else %}{{conn|qtTypeIdent(c.datatype) }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}{% endif %}{% if c.coloptions %}
 {% for o in c.coloptions %}{% if o.option and o.value %}
 {% if loop.first %} OPTIONS ({% endif %}{% if not loop.first %}, {% endif %}{{o.option}} {{o.value|qtLiteral}}{% if loop.last %}){% endif %}{% endif %}
 {% endfor %}{% endif %}{% if c.attnotnull %}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
index 093eec0..bccebd4 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/templates/foreign_tables/sql/9.5_plus/create.sql
@@ -7,7 +7,7 @@ CREATE FOREIGN TABLE {{ conn|qtIdent(data.basensp, data.name) }}(
 {% for c in data.columns %}
 {% if (not c.inheritedfrom or c.inheritedfrom =='' or  c.inheritedfrom == None or  c.inheritedfrom == 'None' ) %}
 {% if is_columns.append('1') %}{% endif %}
-{{conn|qtIdent(c.attname)}} {{conn|qtTypeIdent(c.datatype) }}{% if c.typlen %}({{c.typlen}}{% if c.precision %}, {{c.precision}}{% endif %}){% endif %}{% if c.isArrayType %}[]{% endif %}{% if c.coloptions %}
+{{conn|qtIdent(c.attname)}} {% if is_sql %}{{ c.fulltype }}{% else %}{{conn|qtTypeIdent(c.datatype) }}{% if c.typlen

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-01 Thread Murtuza Zabuawala

Hi Khushboo,

Please include Type node and Foreign Table node in your fix :-)

--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

On Thu, Jun 1, 2017 at 3:23 PM, Khushboo Vashi <
khushboo.va...@enterprisedb.com> wrote:

> Hi,
>
> Please find the attached patch to fix RM #2324 : PostGIS datatypes not
> showing up properly on SQL tab.
>
> Thanks,
> Khushboo
>
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers@postgresql.org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>

[pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

2017-06-01 Thread Khushboo Vashi

Hi,

Please find the attached patch to fix RM #2324 : PostGIS datatypes not
showing up properly on SQL tab.

Thanks,
Khushboo
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
index 99f0ddc..5b36bbc 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py
@@ -2540,7 +2540,7 @@ class TableView(PGChildNodeView, DataTypeReader, VacuumSettings):
 # If the request for new object which do not have did
 table_sql = render_template("/".join([self.template_path,
   'create.sql']),
-data=data, conn=self.conn)
+data=data, conn=self.conn, is_sql=True)
 
 # Add into main sql
 table_sql = re.sub('\n{2,}', '\n\n', table_sql)
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py
index d9e688e..49db489 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/__init__.py
@@ -750,7 +750,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
 except Exception as e:
 return internal_server_error(errormsg=str(e))
 
-def get_sql(self, scid, tid, clid, data):
+def get_sql(self, scid, tid, clid, data, is_sql=False):
 """
 This function will genrate sql from model data
 """
@@ -819,7 +819,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
   self.acl)
 # If the request for new object which do not have did
 SQL = render_template("/".join([self.template_path, 'create.sql']),
-  data=data, conn=self.conn)
+  data=data, conn=self.conn, is_sql=is_sql)
 return SQL, data['name'] if 'name' in data else old_data['name']
 
 @check_precondition
@@ -863,7 +863,7 @@ class ColumnsView(PGChildNodeView, DataTypeReader):
 # We will add table & schema as well
 data = self._formatter(scid, tid, clid, data)
 
-SQL, name = self.get_sql(scid, tid, None, data)
+SQL, name = self.get_sql(scid, tid, None, data, is_sql=True)
 if not isinstance(SQL, (str, unicode)):
 return SQL
 
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql
index 0fce446..5bc521c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/column/sql/default/create.sql
@@ -5,7 +5,7 @@
 {###  Add column ###}
 {% if data.name and  data.cltype %}
 ALTER TABLE {{conn|qtIdent(data.schema, data.table)}}
-ADD COLUMN {{conn|qtIdent(data.name)}} {{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% if data.collspcname %}
+ADD COLUMN {{conn|qtIdent(data.name)}} {% if is_sql %}{{data.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, data.cltype, data.attlen, data.attprecision, data.hasSqrBracket) }}{% endif %}{% if data.collspcname %}
  COLLATE {{data.collspcname}}{% endif %}{% if data.attnotnull %}
  NOT NULL{% endif %}{% if data.defval %}
  DEFAULT {{data.defval}}{% endif %};
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql
index c21a661..f8e858f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/templates/table/sql/default/create.sql
@@ -44,7 +44,7 @@ CREATE {% if data.relpersistence %}UNLOGGED {% endif %}TABLE {{conn|qtIdent(data
 {% if c.name and c.cltype %}
 {% if loop.index != 1 %},
 {% endif %}
-{{conn|qtIdent(c.name)}} {{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% if c.collspcname %} COLLATE {{c.collspcname}}{% endif %}{% if c.attnotnull %} NOT NULL{% endif %}{% if c.defval %} DEFAULT {{c.defval}}{% endif %}
+{{conn|qtIdent(c.name)}} {% if is_sql %}{{c.displaytypname}}{% else %}{{ GET_TYPE.CREATE_TYPE_SQL(conn, c.cltype, c.attlen, c.attprecision, c.hasSqrBracket) }}{% endif %}{% if c.collspcname %} COLLATE {{c.collspcname}}{%

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

Re: [pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

[pgadmin-hackers] [pgAdmin4][Patch]: Fixed RM 2324 - PostGIS datatypes not showing up properly on SQL tab.

13 matches

Site Navigation

Mail list logo

Footer information