From 1d352909146e38d9fe9d812324b53ef581e80a72 Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Tue, 10 Jan 2017 21:19:29 +0100 Subject: [PATCH] Assorted fixes for MS SQL support. When updating the catalog support we forgot to fix the references to the index and fkey name slots that are now provided centrally for the catalog of all database source types. Again, we don't have unit test cases for MS SQL, so that's a blind fix (but at least that compiles). See #343. --- src/sources/mssql/mssql-schema.lisp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sources/mssql/mssql-schema.lisp b/src/sources/mssql/mssql-schema.lisp index 580690c..94f9ca7 100644 --- a/src/sources/mssql/mssql-schema.lisp +++ b/src/sources/mssql/mssql-schema.lisp @@ -34,7 +34,7 @@ (defmethod query ((msconn mssql-connection) sql &key) "Send SQL query to MSCONN connection." - (log-message :sql "MSSQL: sending query: ~a" query) + (log-message :sql "MSSQL: sending query: ~a" sql) (mssql:query sql :connection (conn-handle msconn))) (defun mssql-query (query) @@ -205,8 +205,8 @@ order by SchemaName, :unique (= unique 1) :columns nil :filter filter)) - (index (maybe-add-index table index-name pg-index - :key #'pgloader.pgsql::pgsql-index-name))) + (index + (maybe-add-index table index-name pg-index :key #'index-name))) (push-to-end col (index-columns index))) :finally (return catalog))) @@ -267,8 +267,8 @@ ORDER BY KCU1.CONSTRAINT_NAME, KCU1.ORDINAL_POSITION" :columns nil :foreign-table ftable :foreign-columns nil)) - (fkey (maybe-add-fkey table fkey-name pg-fkey - :key #'pgloader.pgsql::pgsql-fkey-name))) + (fkey + (maybe-add-fkey table fkey-name pg-fkey :key #'fkey-name))) (push-to-end col (fkey-columns fkey)) (push-to-end fcol (fkey-foreign-columns fkey))) :finally (return catalog)))