diff --git a/Makefile b/Makefile index f887658..ca29381 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ -# $Id: Makefile,v 1.12 2008-02-14 23:09:06 dim Exp $ +# $Id: Makefile,v 1.13 2008-02-25 14:55:29 dim Exp $ # # Makefile for debian packaging purpose, make install not intended to work. DOCS = pgloader.1.txt TODO = TODO.txt +BUGS = BUGS.txt CVSROOT = $(shell cat CVS/Root) VERSION = $(shell ./pgloader.py --version |cut -d' ' -f3) SHORTVER= $(shell ./pgloader.py --version |cut -d' ' -f3 |cut -d '~' -f1) @@ -20,9 +21,9 @@ libs = $(wildcard pgloader/*.py) refm = $(wildcard reformat/*.py) DEBDIR = /tmp/pgloader -EXPORT = $(DEBDIR)/export/pgloader-$(SHORTVER) +EXPORT = $(DEBDIR)/export/pgloader-$(VERSION) ORIG = $(DEBDIR)/export/pgloader_$(VERSION).orig.tar.gz -ARCHIVE= $(DEBDIR)/export/pgloader-$(SHORTVER).tar.gz +ARCHIVE= $(DEBDIR)/export/pgloader-$(VERSION).tar.gz install: install -m 755 $(pgloader) $(DESTDIR)/usr/bin/pgloader @@ -32,6 +33,7 @@ install: cp -a $(libs) $(libdir)/pgloader cp -a $(refm) $(libdir)/reformat cp -a $(examples) $(exdir) + cp -a $(TODO) $(BUGS) $(DESTDIR)/usr/share/doc/pgloader html: $(DOCS) asciidoc -a toc $< @@ -39,6 +41,9 @@ html: $(DOCS) todo: $(TODO) asciidoc -a toc $< +bugs: $(BUGS) + asciidoc -a toc $< + site: html scp ${DOCS:.txt=.html} cvs.pgfoundry.org:htdocs diff --git a/debian/changelog b/debian/changelog index 287861b..cd4cc4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pgloader (2.3.0~dev-2) unstable; urgency=low +pgloader (2.3.0~dev2-1) unstable; urgency=low * columns = * is now supported diff --git a/pgloader.1.txt b/pgloader.1.txt index dacfedf..4b4903b 100644 --- a/pgloader.1.txt +++ b/pgloader.1.txt @@ -465,6 +465,14 @@ An easy way to get the list of attributes (columns) of your tables ROLLBACK; + +As of +pgloader 2.3.0+ you can simply set +columns = *+ and +pgloader+ +will issue the needed SQL for you. This only works if your data file +and your table definition both present the columns in the exact same +order, obviously. ++ +Internally, +pgloader+ will issue a +COPY+ statement without the +column names if possible, meaning when +only_cols+ is not used at the +same time as +columns = *+ is used. user_defined_columns:: + diff --git a/pgloader/options.py b/pgloader/options.py index 6e0f645..cb7303c 100644 --- a/pgloader/options.py +++ b/pgloader/options.py @@ -2,7 +2,7 @@ # # Some common options, for each module to get them -PGLOADER_VERSION = '2.3.0~dev' +PGLOADER_VERSION = '2.3.0~dev2' INPUT_ENCODING = None PG_CLIENT_ENCODING = 'latin9'