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

Fix regression testing.

Browse Source 
It's been broken by a recent commit where we did force the internal
table representation to always be an instance of the table structure,
which wasn't yet true for regression testing.

In passing, re-indent a large portion of the function, which accounts
for most of the diff.
This commit is contained in:
Dimitri Fontaine 2016-03-27 21:28:51 +02:00
parent b1d4e94f2a
commit 177f48863b
2 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/main.lisp
View File

@ -440,28 +440,32 @@
(expected-data-file (make-pathname :defaults load-file
:type "out"
:directory expected-subdir))
((target *pg-settings*) (parse-target-pg-db-uri load-file))
(*pgsql-reserved-keywords* (list-reserved-keywords target))
((target-conn *pg-settings*) (parse-target-pg-db-uri load-file))
(*pgsql-reserved-keywords* (list-reserved-keywords target-conn))
(target-table (create-table (pgconn-table-name target-conn)))
(expected-data-source
(parse-source-string-for-type
:copy (uiop:native-namestring expected-data-file)))
(parse-source-string-for-type
:copy (uiop:native-namestring expected-data-file)))
;; change target table-name schema
(expected-data-target
(let ((e-d-t (clone-connection target)))
(setf (pgconn-table-name e-d-t)
(cons "expected"
(typecase (pgconn-table-name e-d-t)
(string (pgconn-table-name e-d-t))
(cons (cdr (pgconn-table-name e-d-t))))))
e-d-t)))
(let ((e-d-t (clone-connection target-conn)))
(setf (pgconn-table-name e-d-t)
;;
;; The connection facility still works with cons here,
;; rather than table structure instances, because of
;; depedencies as explained in
;; src/parsers/command-db-uri.lisp
;;
(cons "expected" (table-name target-table)))
e-d-t)))
(log-message :log "Comparing loaded data against ~s" expected-data-file)
;; prepare expected table in "expected" schema
(with-pgsql-connection (target)
(with-schema (unqualified-table-name (pgconn-table-name target))
(with-pgsql-connection (target-conn)
(with-schema (unqualified-table-name target-table)
(let* ((tname (apply-identifier-case unqualified-table-name))
(drop (format nil "drop table if exists expected.~a;"
tname))
@ -478,41 +482,41 @@
:options '(:truncate t)
:start-logger nil)
;; now compare both
(with-pgsql-connection (target)
(with-schema (unqualified-table-name (pgconn-table-name target))
(let* ((tname (apply-identifier-case unqualified-table-name))
(cols (loop :for (name type)
:in (list-columns-query tname)
;;
;; We can't just use table names here, because
;; PostgreSQL support for the POINT datatype fails
;; to implement EXCEPT support, and the query then
;; fails with:
;;
;; could not identify an equality operator for type point
;;
:collect (if (string= "point" type)
(format nil "~s::text" name)
(format nil "~s" name))))
(sql (format nil
"select count(*) from (select ~{~a~^, ~} from expected.~a except select ~{~a~^, ~} from ~a) ss"
cols
tname
cols
tname))
(diff-count (pomo:query sql :single)))
(log-message :notice "~a" sql)
(log-message :notice "Got a diff of ~a rows" diff-count)
(if (= 0 diff-count)
(progn
(log-message :log "Regress pass.")
#-pgloader-image (values diff-count +os-code-success+)
#+pgloader-image (uiop:quit +os-code-success+))
(progn
(log-message :log "Regress fail.")
#-pgloader-image (values diff-count +os-code-error-regress+)
#+pgloader-image (uiop:quit +os-code-error-regress+)))))))))
;; now compare both
(with-pgsql-connection (target-conn)
(with-schema (unqualified-table-name target-table)
(let* ((tname (apply-identifier-case unqualified-table-name))
(cols (loop :for (name type)
:in (list-columns-query tname)
;;
;; We can't just use table names here, because
;; PostgreSQL support for the POINT datatype fails
;; to implement EXCEPT support, and the query then
;; fails with:
;;
;; could not identify an equality operator for type point
;;
:collect (if (string= "point" type)
(format nil "~s::text" name)
(format nil "~s" name))))
(sql (format nil
"select count(*) from (select ~{~a~^, ~} from expected.~a except select ~{~a~^, ~} from ~a) ss"
cols
tname
cols
tname))
(diff-count (pomo:query sql :single)))
(log-message :notice "~a" sql)
(log-message :notice "Got a diff of ~a rows" diff-count)
(if (= 0 diff-count)
(progn
(log-message :log "Regress pass.")
#-pgloader-image (values diff-count +os-code-success+)
#+pgloader-image (uiop:quit +os-code-success+))
(progn
(log-message :log "Regress fail.")
#-pgloader-image (values diff-count +os-code-error-regress+)
#+pgloader-image (uiop:quit +os-code-error-regress+)))))))))
;;;

12
src/utils/schema-structs.lisp
View File

@ -150,8 +150,11 @@
(cons (make-table :source-name maybe-qualified-name
:name (apply-identifier-case
(cdr maybe-qualified-name))
:schema (apply-identifier-case
(car maybe-qualified-name))))))
:schema
(let ((sname (car maybe-qualified-name)))
(make-schema :catalog nil
:source-name sname
:name (apply-identifier-case sname)))))))
(defmethod add-schema ((catalog catalog) schema-name &key)
"Add SCHEMA-NAME to CATALOG and return the new schema instance."
@ -338,7 +341,7 @@
CONS of a schema name and a table name, or just the table name as a
string."
(format nil "~@[~a.~]~a"
(schema-name (table-schema table))
(when (table-schema table) (schema-name (table-schema table)))
(table-name table)))
@ -347,7 +350,8 @@
otherwise just return the TABLE-NAME. A PostgreSQL connection must be
established when calling this function."
(let ((schema-name (gensym "SCHEMA-NAME")))
`(let* ((,schema-name (schema-name (table-schema ,table-name)))
`(let* ((,schema-name (when (table-schema ,table-name)
(schema-name (table-schema ,table-name))))
(,var
(progn
(if ,schema-name