diff --git a/src/pgsql/schema.lisp b/src/pgsql/schema.lisp
index 25a5bdc..d24ecc8 100644
--- a/src/pgsql/schema.lisp
+++ b/src/pgsql/schema.lisp
@@ -26,7 +26,7 @@
           (cond ((quoted-p identifier)
                  :none)
 
-                ((cl-ppcre:scan "[^A-Za-z_]" identifier)
+                ((not (cl-ppcre:scan "^[A-Za-z_][A-Za-z0-9_$]*$" identifier))
                  :quote)
 
                 ((member lowercase-identifier *pgsql-reserved-keywords*