mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2026-05-05 02:46:10 +02:00
Code Issues Projects Releases Wiki Activity

Fix CSV and FIXED parsing to run the BEFORE section before doing PostgreSQL introspection.

Browse Source
This commit is contained in:
Dimitri Fontaine 2013-11-26 11:51:42 +01:00
parent 32d91d7054
commit de1afc7416
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/parser.lisp
View File

@ -1562,24 +1562,24 @@ load database
(*pgconn-port* ,port)
(*pgconn-user* ,user)
(*pgconn-pass* ,password)
(*pg-settings* ',gucs)
(source
(make-instance 'pgloader.csv:copy-csv
:target-db ,dbname
:source ',source
:target ,table-name
:encoding ,encoding
:fields ',fields
:columns ',columns
,@(loop for (k v) on options by #'cddr
unless (eq k :truncate)
append (list k v)))))
(*pg-settings* ',gucs))
(progn
,(sql-code-block dbname 'state-before before "before load")
(pgloader.sources:copy-from source
:truncate (getf ',options :truncate))
(let ((truncate (getf ',options :truncate))
(source
(make-instance 'pgloader.csv:copy-csv
:target-db ,dbname
:source ',source
:target ,table-name
:encoding ,encoding
:fields ',fields
:columns ',columns
,@(loop for (k v) on options by #'cddr
unless (eq k :truncate)
append (list k v)))))
(pgloader.sources:copy-from source :truncate truncate))
,(sql-code-block dbname 'state-after after "after load")
@ -1699,22 +1699,22 @@ load database
(*pgconn-port* ,port)
(*pgconn-user* ,user)
(*pgconn-pass* ,password)
(*pg-settings* ',gucs)
(source
(make-instance 'pgloader.fixed:copy-fixed
:target-db ,dbname
:source ',source
:target ,table-name
:encoding ,encoding
:fields ',fields
:columns ',columns
:skip-lines ,(or (getf options :skip-line) 0))))
(*pg-settings* ',gucs))
(progn
,(sql-code-block dbname 'state-before before "before load")
(pgloader.sources:copy-from source
:truncate ,(getf options :truncate))
(let ((truncate ,(getf options :truncate))
(source
(make-instance 'pgloader.fixed:copy-fixed
:target-db ,dbname
:source ',source
:target ,table-name
:encoding ,encoding
:fields ',fields
:columns ',columns
:skip-lines ,(or (getf options :skip-line) 0))))
(pgloader.sources:copy-from source :truncate truncate))
,(sql-code-block dbname 'state-after after "after load")