Re: [pgadmin-hackers] [pgAdmin4][Patch]: Added Support for the Domain Dependencies

2016-03-19 Thread Dave Page 
Thanks, applied.

On Fri, Mar 18, 2016 at 10:41 AM, Khushboo Vashi
 wrote:
> Hi,
>
> Please find the attached updated patch for the same.
>
> Thanks,
> Khushboo
>
> On Fri, Mar 18, 2016 at 4:02 PM, Dave Page  wrote:
>>
>> Can you rebase please?
>>
>> (pgadmin4)piranha:web dpage$ git apply
>> ~/Downloads/pgAdmin4_dependencies.patch
>>
>> error: patch failed: web/pgadmin/browser/utils.py:424
>>
>> error: web/pgadmin/browser/utils.py: patch does not apply
>>
>> On Fri, Mar 18, 2016 at 4:03 AM, Khushboo Vashi
>>  wrote:
>> > Hi,
>> >
>> > Added support for the Domain Dependencies, earlier it was coming as a
>> > Type.
>> >
>> > Please find attached Patch for the same.
>> >
>> > Akshay,
>> >
>> > Can you please verify the patch, as you have implemented this
>> > functionality.
>> >
>> > 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
>> >
>>
>>
>>
>> --
>> 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


-- 
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]: Added Support for the Domain Dependencies

2016-03-19 Thread Khushboo Vashi 
Hi,

Please find the attached updated patch for the same.

Thanks,
Khushboo

On Fri, Mar 18, 2016 at 4:02 PM, Dave Page  wrote:

> Can you rebase please?
>
> (pgadmin4)piranha:web dpage$ git apply
> ~/Downloads/pgAdmin4_dependencies.patch
>
> error: patch failed: web/pgadmin/browser/utils.py:424
>
> error: web/pgadmin/browser/utils.py: patch does not apply
>
> On Fri, Mar 18, 2016 at 4:03 AM, Khushboo Vashi
>  wrote:
> > Hi,
> >
> > Added support for the Domain Dependencies, earlier it was coming as a
> Type.
> >
> > Please find attached Patch for the same.
> >
> > Akshay,
> >
> > Can you please verify the patch, as you have implemented this
> functionality.
> >
> > 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
> >
>
>
>
> --
> Dave Page
> Blog: http://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EnterpriseDB UK: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
diff --git a/web/pgadmin/browser/server_groups/servers/templates/depends/sql/9.1_plus/dependents.sql b/web/pgadmin/browser/server_groups/servers/templates/depends/sql/9.1_plus/dependents.sql
index 1a4484c..881e1eb 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/depends/sql/9.1_plus/dependents.sql
+++ b/web/pgadmin/browser/server_groups/servers/templates/depends/sql/9.1_plus/dependents.sql
@@ -2,7 +2,8 @@
 SELECT DISTINCT dep.deptype, dep.refclassid, cl.relkind, ad.adbin, ad.adsrc,
 CASE WHEN cl.relkind IS NOT NULL THEN cl.relkind || COALESCE(dep.refobjsubid::text, '')
 WHEN tg.oid IS NOT NULL THEN 'T'::text
-WHEN ty.oid IS NOT NULL THEN 'y'::text
+WHEN ty.oid IS NOT NULL AND ty.typbasetype = 0 THEN 'y'::text
+WHEN ty.oid IS NOT NULL AND ty.typbasetype != 0 THEN 'd'::text
 WHEN ns.oid IS NOT NULL THEN 'n'::text
 WHEN pr.oid IS NOT NULL THEN 'p'::text
 WHEN la.oid IS NOT NULL THEN 'l'::text
diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py
index 7f525b0..e34742d 100644
--- a/web/pgadmin/browser/utils.py
+++ b/web/pgadmin/browser/utils.py
@@ -424,6 +424,7 @@ class PGChildNodeView(NodeView):
 'p': 'function',
 'n': 'schema',
 'y': 'type',
+'d': 'domain',
 'T': 'trigger',
 'l': 'language',
 'f': 'foreign_data_wrapper',

-- 
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]: Added Support for the Domain Dependencies

2016-03-19 Thread Dave Page 
Can you rebase please?

(pgadmin4)piranha:web dpage$ git apply ~/Downloads/pgAdmin4_dependencies.patch

error: patch failed: web/pgadmin/browser/utils.py:424

error: web/pgadmin/browser/utils.py: patch does not apply

On Fri, Mar 18, 2016 at 4:03 AM, Khushboo Vashi
 wrote:
> Hi,
>
> Added support for the Domain Dependencies, earlier it was coming as a Type.
>
> Please find attached Patch for the same.
>
> Akshay,
>
> Can you please verify the patch, as you have implemented this functionality.
>
> 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
>



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

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


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