- nil "INSERT INTO ~a (~{~a~^,~}) VALUES (~{~a~^,~})"
- (umls-file-table file)
- (umls-file-fields file)
- (append
- (mapcar insert-func (remove-custom-cols (umls-file-colstructs file)) values)
- (custom-col-values (custom-colstructs-for-file file) values t)))))
-
-(defun custom-col-values-old (colstructs values delim doquote)
- "Returns a string of column values for SQL inserts for custom columns"
- (let ((result ""))
- (dolist (col colstructs)
- (let* ((func (umls-col-custom-value-func col))
- (custom-value (funcall func values)))
- (string-append result
- (if doquote (umls-col-quotechar col))
- (escape-backslashes custom-value)
- (if doquote (umls-col-quotechar col))
- delim)))
- result))
-
-(defun col-value (col doquote values)
- (let ((custom-value (funcall (umls-col-custom-value-func col) values)))
- (if doquote
- (let ((q (umls-col-quotechar col)))
- (concatenate 'string q (escape-backslashes custom-value) q))
- (escape-backslashes custom-value))))
-
-(defun custom-col-values (colstructs values doquote)
+ nil "INSERT INTO ~a (~{~a~^,~}) VALUES (~A)"
+ (table file)
+ (fields file)
+ (concat-separated-strings
+ ","
+ (mapcar insert-func (remove-custom-cols (ucols file)) values)
+ (custom-col-values (custom-ucols-for-file file) values t)))))
+
+
+(defun custom-col-value (col values doquote)
+ (let ((custom-value (funcall (custom-value-fun col) values)))
+ (if custom-value
+ (if doquote
+ (let ((q (quotechar col)))
+ (concatenate 'string q (escape-backslashes custom-value) q))
+ (escape-backslashes custom-value))
+ "")))
+
+(defun custom-col-values (ucols values doquote)