Re: Docker build simplification

2019-09-16 Thread Dave Page
Hi Akshay,

On Fri, Sep 13, 2019 at 7:59 AM Akshay Joshi 
wrote:

> Hi Dave
>
> I have installed docker, applied your patch and run "*docker build .*".
> Image has been created without REPOSITORY and TAG is this OK.
>

Right - "docker build ." will not create any tags unless you include the -t
option. I intentionally added the tags to the Makefile target though.


> [image: Screenshot 2019-09-13 at 12.22.57 PM.png]
>
> Rest I have tested it works fine.
>

Thanks!


> On Wed, Sep 11, 2019 at 4:44 PM Dave Page  wrote:
>
>>
>>
>> On Wed, Sep 11, 2019 at 6:59 AM Ashesh Vashi <
>> ashesh.va...@enterprisedb.com> wrote:
>>
>>> On Tue, Sep 10, 2019 at 11:21 PM Dave Page  wrote:
>>>
 The attached patch simplifies the Docker container build so that it can
 be done entirely using "docker build" in the root of a source tree. It also
 enables building the container from a tarball, not just a git checkout.
 This does mean that container builds may now also include any garbage in
 the source tree from which they're built, but conversely offers the benefit
 of making it easy to build a container with code changes in it without
 having to commit first.

 Akshay, can you look it over to make sure I haven't done anything
 obviously stupid? Feedback from others is also welcome of course.

>>> Dave,
>>>
>>> Is there any reason - we're not using the requirements.txt from the
>>> docker file, and installing the packages separately.
>>>
>>
>> I'm not sure what you mean. It installs Python dependencies in two places;
>>
>> - In the documentation builder intermediate container. This doesn't use
>> requirements.txt, and installs just the bare minimum required to install
>> the docs.
>>
>> - In the final container. This does use requirements.txt.
>>
>> I suppose there's a minor simplification that can be made to the way I'm
>> installing the requirements.txt file itself. At the moment it gets copied
>> to the app builder, and then from there to the final container. I don't
>> think it's actually needed in the app builder so I could just copy it from
>> the host straight into the final container.
>>
>> Or did you mean something else?
>>
>> --
>> Dave Page
>> Blog: http://pgsnake.blogspot.com
>> Twitter: @pgsnake
>>
>> EnterpriseDB UK: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>
>
> --
> *Thanks & Regards*
> *Akshay Joshi*
>
> *Sr. Software Architect*
> *EnterpriseDB Software India Private Limited*
> *Mobile: +91 976-788-8246*
>


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

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


[pgAdmin4][RM#4750] Query tool history throws an error for encoding

2019-09-16 Thread Murtuza Zabuawala
Hi,

PFA minor patch for the backend encoding error from query history.


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


RM_4750.diff
Description: Binary data


Re: [pgAdmin4][RM#4750] Query tool history throws an error for encoding

2019-09-16 Thread Aditya Toshniwal
Hi,

We do not get any error. So could you please also share the exception for
our reference ?


On Mon, Sep 16, 2019 at 3:32 PM Murtuza Zabuawala <
murtuza.zabuaw...@enterprisedb.com> wrote:

> Hi,
>
> PFA minor patch for the backend encoding error from query history.
>
>
> --
> Regards,
> Murtuza Zabuawala
> EnterpriseDB: http://www.enterprisedb.com
> The Enterprise PostgreSQL Company
>
>

-- 
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB India | Pune
"Don't Complain about Heat, Plant a TREE"


Re: [pgAdmin4][RM#4750] Query tool history throws an error for encoding

2019-09-16 Thread Aditya Toshniwal
Sorry, I forgot to check the RM. The exception is mentioned there.
Patch looks good to me.

On Mon, Sep 16, 2019 at 3:37 PM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:

> Hi,
>
> We do not get any error. So could you please also share the exception for
> our reference ?
>
>
> On Mon, Sep 16, 2019 at 3:32 PM Murtuza Zabuawala <
> murtuza.zabuaw...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> PFA minor patch for the backend encoding error from query history.
>>
>>
>> --
>> Regards,
>> Murtuza Zabuawala
>> EnterpriseDB: http://www.enterprisedb.com
>> The Enterprise PostgreSQL Company
>>
>>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB India | Pune
> "Don't Complain about Heat, Plant a TREE"
>


-- 
Thanks and Regards,
Aditya Toshniwal
Software Engineer | EnterpriseDB India | Pune
"Don't Complain about Heat, Plant a TREE"


pgAdmin 4 commit: Refactor Dockerfile to avoid needing to run supportin

2019-09-16 Thread Dave Page
Refactor Dockerfile to avoid needing to run supporting scripts (i.e. 'docker 
build .' will work) and minimise layers. Fixes #4752

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=110a51c5b20d84336db5c477ef0722c73af8114b

Modified Files
--
Dockerfile| 174 ++
Makefile  |   7 +-
docs/en_US/release_notes_4_13.rst |   1 +
pkg/docker/.dockerignore  |   2 -
pkg/docker/Dockerfile |  98 -
pkg/docker/README | 131 +++-
pkg/docker/build.sh   |  61 -
7 files changed, 190 insertions(+), 284 deletions(-)



pgAdmin 4 commit: Fix SQL issue of length and precision when changing t

2019-09-16 Thread Akshay Joshi
Fix SQL issue of length and precision when changing the data type of Column. 
Fixes #4698

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=426d9d58728698907f92cc376cac2d037c456b43

Modified Files
--
docs/en_US/release_notes_4_13.rst  |  1 +
.../databases/schemas/tables/columns/__init__.py   | 26 --
2 files changed, 25 insertions(+), 2 deletions(-)



pgAdmin 4 commit: Fix query history exception for Python 3.6. Fixes #47

2019-09-16 Thread Akshay Joshi
Fix query history exception for Python 3.6. Fixes #4750.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=80b05973c653223ec47cd5bc6b3f00f7eeac7c94
Author: Murtuza Zabuawala 

Modified Files
--
docs/en_US/release_notes_4_13.rst  | 3 ++-
web/pgadmin/tools/sqleditor/utils/query_history.py | 5 -
2 files changed, 6 insertions(+), 2 deletions(-)



Re: [pgAdmin4][RM#4750] Query tool history throws an error for encoding

2019-09-16 Thread Akshay Joshi
Thanks, patch applied.

On Mon, Sep 16, 2019 at 3:42 PM Aditya Toshniwal <
aditya.toshni...@enterprisedb.com> wrote:

> Sorry, I forgot to check the RM. The exception is mentioned there.
> Patch looks good to me.
>
> On Mon, Sep 16, 2019 at 3:37 PM Aditya Toshniwal <
> aditya.toshni...@enterprisedb.com> wrote:
>
>> Hi,
>>
>> We do not get any error. So could you please also share the exception for
>> our reference ?
>>
>>
>> On Mon, Sep 16, 2019 at 3:32 PM Murtuza Zabuawala <
>> murtuza.zabuaw...@enterprisedb.com> wrote:
>>
>>> Hi,
>>>
>>> PFA minor patch for the backend encoding error from query history.
>>>
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> Software Engineer | EnterpriseDB India | Pune
>> "Don't Complain about Heat, Plant a TREE"
>>
>
>
> --
> Thanks and Regards,
> Aditya Toshniwal
> Software Engineer | EnterpriseDB India | Pune
> "Don't Complain about Heat, Plant a TREE"
>


-- 
*Thanks & Regards*
*Akshay Joshi*

*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*


pgAdmin 4 commit: Update version for release.

2019-09-16 Thread Akshay Joshi
Update version for release.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=e64d6edc73440f9644009ccc33e931a47a5efd43

Modified Files
--
runtime/Info.plist   | 4 ++--
runtime/pgAdmin4.pro | 2 +-
web/config.py| 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)



pgAdmin 4 commit: Fix query history issue for Python 2.7, it is a regre

2019-09-16 Thread Akshay Joshi
Fix query history issue for Python 2.7, it is a regression of #4750.

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=b10378fe708893df1b218b16e004f07450d03189

Modified Files
--
web/pgadmin/tools/sqleditor/utils/query_history.py | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)



pgAdmin 4 commit: Fix RESQL/MSQL test cases for Python 2.7

2019-09-16 Thread Akshay Joshi
Fix RESQL/MSQL test cases for Python 2.7

Branch
--
master

Details
---
https://git.postgresql.org/gitweb?p=pgadmin4.git;a=commitdiff;h=f8815428340a1f1deb12f2356d3c5a78c027f596

Modified Files
--
web/regression/re_sql/tests/test_resql.py | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)