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

Implement AFTER SCHEMA sql code blocks.

Browse Source 
This allows pgloader users to run SQL commands in between pgloader's schema
creation and the actual loading of the data.
This commit is contained in:
Dimitri Fontaine 2018-10-10 11:08:28 -07:00
parent 0957bd0efa
commit 344d0ca61b
4 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/load/migrate-database.lisp
View File

@ -255,6 +255,7 @@
(reset-sequences t)
(foreign-keys t)
(reindex nil)
(after-schema nil)
only-tables
including
excluding
@ -329,17 +330,26 @@
;; if asked, first drop/create the tables on the PostgreSQL side
(handler-case
(prepare-pgsql-database copy
catalog
:truncate truncate
:create-tables create-tables
:create-schemas create-schemas
:drop-indexes drop-indexes
:drop-schema drop-schema
:include-drop include-drop
:foreign-keys foreign-keys
:set-table-oids set-table-oids
:materialize-views materialize-views)
(progn
(prepare-pgsql-database copy
catalog
:truncate truncate
:create-tables create-tables
:create-schemas create-schemas
:drop-indexes drop-indexes
:drop-schema drop-schema
:include-drop include-drop
:foreign-keys foreign-keys
:set-table-oids set-table-oids
:materialize-views materialize-views)
;; if there's an AFTER SCHEMA DO/EXECUTE command, now is the time
;; to run it.
(when after-schema
(pgloader.parser::execute-sql-code-block (target-db copy)
:pre
after-schema
"after schema")))
;;
;; In case some error happens in the preparatory transaction, we
;; need to stop now and refrain from trying to load the data into

1
src/package.lisp
View File

@ -812,6 +812,7 @@
(:export #:parse-commands
#:parse-commands-from-file
#:initialize-context
#:execute-sql-code-block
;; tools to enable complete cli parsing in main.lisp
#:process-relative-pathnames

9
src/parsers/command-pgsql.lisp
View File

@ -79,6 +79,7 @@
excluding-matching-in-schema
decoding-tables-as
before-load
after-schema
after-load))
(:lambda (clauses-list)
(alexandria:alist-plist clauses-list)))
@ -103,11 +104,11 @@
(defun lisp-code-for-loading-from-pgsql (pg-src-db-conn pg-dst-db-conn
&key
gucs
casts before after options
casts options
before after after-schema
alter-table alter-schema
((:including incl))
((:excluding excl))
((:decoding decoding-as))
&allow-other-keys)
`(lambda ()
(let* ((*default-cast-rules* ',*pgsql-default-cast-rules*)
@ -131,6 +132,7 @@
:index-names :preserve
:set-table-oids t
:on-error-stop on-error-stop
:after-schema ',after-schema
,@(remove-batch-control-option options))
,(sql-code-block pg-dst-db-conn :post after "after load"))))
@ -140,7 +142,7 @@
(destructuring-bind (pg-src-db-uri
pg-dst-db-uri
&key
gucs casts before after options
gucs casts before after after-schema options
alter-table alter-schema
including excluding decoding)
source
@ -152,6 +154,7 @@
:casts casts
:before before
:after after
:after-schema after-schema
:options options
:alter-table alter-table
:alter-schema alter-schema

31
src/parsers/command-sql-block.lisp
View File

@ -58,17 +58,26 @@
(bind (((_ _ sql-list-of-list) after))
(cons :after (apply #'append sql-list-of-list)))))
(defrule after-schema (and kw-after kw-create kw-schema
(+ (or load-do load-execute)))
(:lambda (after)
(bind (((_ _ _ sql-list-of-list) after))
(cons :after-schema (apply #'append sql-list-of-list)))))
(defun sql-code-block (pgconn section commands label)
"Return lisp code to run COMMANDS against DBNAME, updating STATE."
(when commands
`(with-stats-collection (,label
:dbname ,(db-name pgconn)
:section ,section
:use-result-as-read t
:use-result-as-rows t)
(log-message :notice "Executing SQL block for ~a" ,label)
(with-pgsql-transaction (:pgconn ,pgconn)
(loop for command in ',commands
do
(pgsql-execute command :client-min-messages :error)
counting command)))))
`(execute-sql-code-block ,pgconn ,section ',commands ,label)))
(defun execute-sql-code-block (pgconn section commands label)
"Exceute given SQL commands."
(with-stats-collection (label
:dbname (db-name pgconn)
:section section
:use-result-as-read t
:use-result-as-rows t)
(log-message :notice "Executing SQL block for ~a" label)
(with-pgsql-transaction (:pgconn pgconn)
(loop :for command :in commands
:do (pgsql-execute command :client-min-messages :error)
:counting command))))