Re: pg_scanner - patch no.1

On Wed, Nov 14, 2012 at 11:37 PM, Vladimir Kokovic <
vladimir(dot)kokovic(at)gmail(dot)com> wrote:

> Hi,
>
> On 11/13/12, Dave Page <dpage(at)pgadmin(dot)org> wrote:
>
> > Hmm, that's definitely wrong - any parts of the pgadmin3 build target
> > should be in $SRC/pgadmin. Having it in xtra/ is acceptable if it's
> > being built as a library that then gets linked into other projects,
> > but if we're adding to pgadmin3_LDADD, then the code should definitely
> > not be in xtra/ but in pgadmin/. I'd prefer it not be a library
> > personally, so can you move it please?
> >
>
> Moved from xtra/pg_scanners to pgadmin/pg_scanners.
>
> >
> > 92 is fine - my point is that we support 3 different types of
> > PostgreSQL server, that each may have a 9.2 version with different
> > syntax, so if we're including the version number to allow multiple
> > scanners in the future, then we should also include something to
> > differentiate the forks - eg. pg92 for PostgreSQL, as92 for Postgres
> > Plus Advanced Server and gp92 for Greenplum Database.
> >
>
> For now, pgadmin/pg_scanners contains only pg92 scanner !
>
Not able to apply your patch cleanly.
*
$ git apply ~/Downloads/pgadmin3-1.diff
/Users/ashesh/Downloads/pgadmin3-1.diff:9: trailing whitespace.
CFLAGS="$CFLAGS $OSX_ARCH"
fatal: corrupt patch at line 402
*
*$ git reset HEAD --hard*
*HEAD is now at ff69692 Fix bad wording in create role dialog*
*$ patch -p1 < ~/Downloads/pgadmin3-1.diff*
*patching file acinclude.m4*
*patching file pgadmin/Makefile.am*
*patching file pgadmin/db/keywords.c*
*patching file pgadmin/include/parser/keywords.h*
*patching file pgadmin/include/parser/keywords_pgadmin.h*
*patching file pgadmin/include/parser/module.mk*
*patching file pgadmin/include/utils/module.mk*
*patch: **** malformed patch at line 402: diff --git
a/pgadmin/include/utils/pgadminScanner.h
b/pgadmin/include/utils/pgadminScanner.h*

Can you please take a look at it?

--

Thanks & Regards,
Ashesh Vashi

EnterpriseDB INDIA: Enterprise PostgreSQL Company<http://www.enterprisedb.com/>

*http://www.linkedin.com/in/asheshvashi*

>
> Best regards
> Vladimir Kokovic
> Belgrade, Serbia, 14.November 2012
>
>
> --
> Sent via pgadmin-hackers mailing list (pgadmin-hackers(at)postgresql(dot)org)
> To make changes to your subscription:
> http://www.postgresql.org/mailpref/pgadmin-hackers
>
>