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

Fix quoting of default values for MariaDB 10 support.

Browse Source 
The default values quoting changed in MariaDB 10, and we need to adjust in
pgloader: extra '' chars could defeat the default matching logic:

  "'0000-00-00'" is different from "0000-00-00"
This commit is contained in:
Dimitri Fontaine 2017-09-19 11:29:53 +02:00
parent 62991bd5c5
commit 460fe6cc77
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sources/mysql/mysql-schema.lisp
View File

@ -70,7 +70,7 @@
(when default (when default
(babel:string-to-octets default))) (babel:string-to-octets default)))
(t default))) (t (ensure-unquoted default #\'))))
(defun list-all-columns (schema (defun list-all-columns (schema
&key &key

10
src/utils/quoting.lisp
View File

@ -44,11 +44,15 @@
(defun quoted-p (s &optional (quote-char #\")) (defun quoted-p (s &optional (quote-char #\"))
"Return true if s is a double-quoted string" "Return true if s is a double-quoted string"
(or (null s)
(when (< 1 (length s))
(and (eq (char s 0) quote-char) (and (eq (char s 0) quote-char)
(eq (char s (- (length s) 1)) quote-char))) (eq (char s (- (length s) 1)) quote-char)))))
(defun ensure-unquoted (identifier) (defun ensure-unquoted (identifier &optional (quote-char #\"))
(cond ((quoted-p identifier) (cond ((null identifier) nil)
((< (length identifier) 2) identifier)
((quoted-p identifier quote-char)
;; when the table name comes from the user (e.g. in the ;; when the table name comes from the user (e.g. in the
;; load file) then we might have to unquote it: the ;; load file) then we might have to unquote it: the
;; PostgreSQL catalogs does not store object names in ;; PostgreSQL catalogs does not store object names in

13
test/mysql/my.sql vendored
View File

@ -1,5 +1,18 @@
create table `empty`(id integer auto_increment primary key); create table `empty`(id integer auto_increment primary key);
CREATE TABLE `races` (
`raceId` int(11) NOT NULL AUTO_INCREMENT,
`year` int(11) NOT NULL DEFAULT 0,
`round` int(11) NOT NULL DEFAULT 0,
`circuitId` int(11) NOT NULL DEFAULT 0,
`name` varchar(255) NOT NULL DEFAULT '',
`date` date NOT NULL DEFAULT '0000-00-00',
`time` time DEFAULT NULL,
`url` varchar(255) DEFAULT NULL,
PRIMARY KEY (`raceId`),
UNIQUE KEY `url` (`url`)
) ENGINE=MyISAM AUTO_INCREMENT=989 DEFAULT CHARSET=utf8;
CREATE TABLE `utilisateurs__Yvelines2013-06-28` ( CREATE TABLE `utilisateurs__Yvelines2013-06-28` (
`statut` enum('administrateur','odis','pilote','bureau','relais','stagiaire','membre','participant','contact') COLLATE utf8_unicode_ci NOT NULL, `statut` enum('administrateur','odis','pilote','bureau','relais','stagiaire','membre','participant','contact') COLLATE utf8_unicode_ci NOT NULL,
`anciennete` year(4) DEFAULT NULL, `anciennete` year(4) DEFAULT NULL,