Merge remote-tracking branch 'origin/master'

knex · Aug 8, 2020 · fb30ad5 · fb30ad5
2 parents 309eed6 + 8ba73e5
commit fb30ad5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/schema/columncompiler.js b/lib/schema/columncompiler.js
@@ -164,7 +164,7 @@ ColumnCompiler.prototype.defaultTo = function (value) {
   ) {
     value = `'${JSON.stringify(value)}'`;
   } else {
-    value = `'${value}'`;
+    value = this.client._escapeBinding(value.toString());
   }
   return `default ${value}`;
 };

diff --git a/test/unit/schema/sqlite3.js b/test/unit/schema/sqlite3.js
@@ -397,6 +397,20 @@ describe('SQLite SchemaBuilder', function () {
     );
   });
 
+  it('correctly escape singleQuotes passed to defaultTo()', function () {
+    tableSql = client
+      .schemaBuilder()
+      .table('users', function (table) {
+        table.string('foo').defaultTo("single 'quoted' value");
+      })
+      .toSQL();
+
+    equal(
+      tableSql[0].sql,
+      "alter table `users` add column `foo` varchar(255) default 'single ''quoted'' value'"
+    );
+  });
+
   it('chains notNull and defaultTo', function () {
     tableSql = client
       .schemaBuilder()