update packages

lisp/org-contrib/orgtbl-sqlinsert.el

@@ -1,4 +1,4 @@
-;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements.
+;;; orgtbl-sqlinsert.el --- orgtbl to SQL insert statements.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2008-2021  Free Software Foundation, Inc.
 
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(require 'org-table)
+
 (defun orgtbl-to-sqlinsert (table params)
   "Convert the orgtbl-mode TABLE to SQL insert statements.
 TABLE is a list, each entry either the symbol `hline' for a horizontal
@@ -62,34 +64,36 @@ The most important parameters of ORGTBL-TO-GENERIC for SQL are:
 The general parameters :skip and :skipcols have already been applied when
 this function is called."
   (let* (hdrlist
-	 (alignment (mapconcat (lambda (x) (if x "r" "l"))
-			       org-table-last-alignment ""))
+	 ;; (alignment (mapconcat (lambda (x) (if x "r" "l"))
+	 ;; 		       org-table-last-alignment ""))
 	 (nowebname (plist-get params :nowebname))
 	 (breakvals (plist-get params :breakvals))
          (firstheader t)
-         (*orgtbl-default-fmt* 'orgtbl-sql-strip-and-quote)
+         ;; (*orgtbl-default-fmt* 'orgtbl-sql-strip-and-quote)
+         (sqlname (plist-get params :sqlname))
 	 (params2
 	  (list
 	   :sqlname (plist-get params :sqlname)
-	   :tstart (lambda () (concat (if nowebname
-					  (format "<<%s>>= \n" nowebname)
-					"")
-				      "BEGIN TRANSACTION;"))
+	   :tstart (lambda () (concat
+			  (if nowebname
+			      (format "<<%s>>= \n" nowebname)
+			    "")
+			  "BEGIN TRANSACTION;"))
 	   :tend (lambda () (concat "COMMIT;" (if nowebname "\n@ " "")))
 	   :hfmt (lambda (f) (progn (if firstheader (push f hdrlist) "")))
-	   :hlfmt (lambda (&rest cells) (setq firstheader nil))
-	   :lstart (lambda () (concat "INSERT INTO "
-				      sqlname "( "
-				      (mapconcat 'identity (reverse hdrlist)
-						 ", ")
-				      " )" (if breakvals "\n" " ")
-				      "VALUES ( "))
+	   :hlfmt (lambda (&rest _) (setq firstheader nil))
+	   :lstart (lambda () (concat
+			  "INSERT INTO "
+			  sqlname "( "
+			  (mapconcat 'identity (reverse hdrlist)
+				     ", ")
+			  " )" (if breakvals "\n" " ")
+			  "VALUES ( "))
 	   :lend " );"
 	   :sep " , "
 	   :hline nil
 	   :remove-nil-lines t))
-	 (params (org-combine-plists params2 params))
-         (sqlname (plist-get params :sqlname)))
+	 (params (org-combine-plists params2 params)))
     (orgtbl-to-generic table params)))
 
 (defun orgtbl-sql-quote (str)