mirrors/pgloader
1
0
Fork 0
mirror of https://github.com/dimitri/pgloader.git synced 2025-08-09 07:47:00 +02:00
Code Issues Projects Releases Wiki Activity

Make quoting identifiers more robust: do not quote already quoted string, and double quotes when quoting. Fix #180.

Browse Source
This commit is contained in:
Victor Kryukov 2015-02-18 17:09:38 -08:00 committed by Dimitri Fontaine
parent 5b19776d5b
commit c38ef4c235
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pgsql/schema.lisp
View File

@ -6,6 +6,12 @@
(defvar *pgsql-reserved-keywords* nil
"We need to always quote PostgreSQL reserved keywords")
(defun quoted-p (s)
"Return true if s is a double-quoted string"
(and
(eq (char s 0) #\")
(eq (char s (- (length s) 1)) #\")))
(defun apply-identifier-case (identifier)
"Return given IDENTIFIER with CASE handled to be PostgreSQL compatible."
(let* ((lowercase-identifier (cl-ppcre:regex-replace-all
@ -18,7 +24,11 @@
;; SQL identifiers and key words must begin with a letter (a-z, but
;; also letters with diacritical marks and non-Latin letters) or an
;; underscore (_).
(cond ((cl-ppcre:scan "^[^A-Za-z_]" identifier)
(cond
((quoted-p identifier)
:none)
((cl-ppcre:scan "^[^A-Za-z_]" identifier)
:quote)
((member lowercase-identifier *pgsql-reserved-keywords*
@ -34,7 +44,8 @@
(ecase *identifier-case*
(:downcase lowercase-identifier)
(:quote (format nil "\"~a\"" identifier))
(:quote (format nil "\"~a\""
(cl-ppcre:regex-replace-all "\"" identifier "\"\"")))
(:none identifier))))
;;;