improvement: Support MariaDB's CURRENT_TIMESTAMP format

Handle MariaDB using a different format for `DEFAULT CURRENT_TIMESTAMP` and `ON UPDATE CURRENT_TIMESTAMP` (MariaDB uses `current_timestamp()`) by translating `current_timestamp()` to `CURRENT_TIMESTAMP` when parsing the SQL into a schema object. Fixes #4
nwoltman · Jun 28, 2020 · 5c6d3c7 · 5c6d3c7
1 parent ed932c9
commit 5c6d3c7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/lib/sqlToSchema.js b/lib/sqlToSchema.js
@@ -78,6 +78,8 @@ function generateColumnsSchema(createDefinitions) {
   const rgxDefault = / DEFAULT (?:'((?:''|[^'])*?)'(?!')|(\S+))/;
   const rgxCharset = / CHARACTER SET (\w+)/;
   const rgxCollate = / COLLATE (\w+)/;
+  // Support MariaDB. See: https://github.com/nwoltman/node-mysql-plus/issues/4
+  const rgxOnUpdateCurTimestamp = / ON UPDATE (?:CURRENT_TIMESTAMP\b|current_timestamp\(\))/;
 
   for (var i = 0; i < createDefinitions.length; i++) {
     const definitionSQL = createDefinitions[i].trim();
@@ -120,7 +122,7 @@ function generateColumnsSchema(createDefinitions) {
 
     if (
       (type === 'datetime' || type === 'timestamp') &&
-      definitionSQL.indexOf(' ON UPDATE CURRENT_TIMESTAMP') >= 0
+      rgxOnUpdateCurTimestamp.test(definitionSQL)
     ) {
       columnDefintion.onUpdateCurrentTimestamp();
     }
@@ -129,7 +131,12 @@ function generateColumnsSchema(createDefinitions) {
 
     if (match = rgxDefault.exec(definitionSQL)) {
       if (match[2]) {
-        columnDefintion.$defaultRaw(match[2]);
+        let rawDefault = match[2];
+        if (rawDefault === 'current_timestamp()') {
+          // Support MariaDB. See: https://github.com/nwoltman/node-mysql-plus/issues/4
+          rawDefault = 'CURRENT_TIMESTAMP';
+        }
+        columnDefintion.$defaultRaw(rawDefault);
       } else {
         columnDefintion.default(match[1]);
       }

diff --git a/test/unit/sqlToSchema.test.js b/test/unit/sqlToSchema.test.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const ColumnDefinitions = require('../../lib/ColumnDefinitions');
+
 const sqlToSchema = require('../../lib/sqlToSchema');
 
 describe('sqlToSchema', () => {
@@ -19,4 +21,18 @@ describe('sqlToSchema', () => {
       });
   });
 
+  it('should translate MariaDB DEFAULT and ON UPDATE current_timestamp() to be compatible with CURRENT_TIMESTAMP', () => {
+    const schema = sqlToSchema(`
+      CREATE TABLE \`test\` (
+        \`dt\` datetime DEFAULT current_timestamp() ON UPDATE current_timestamp()
+      )
+    `);
+
+    ColumnDefinitions.datetime()
+      .defaultCurrentTimestamp()
+      .onUpdateCurrentTimestamp()
+      .$equals(schema.columns.dt)
+      .should.be.true();
+  });
+
 });