ColumnDefinition: Remove deprecated .defaultRaw() method

Author: nwoltman

README.md

@@ -1142,9 +1142,6 @@ This class is what is used to define the column's attributes. These attributes c
   + Examples:
     + `.default('Hello')` produces `DEFAULT 'Hello'`
     + `.default(null)` produces `DEFAULT NULL`
-+ ~~`defaultRaw(value: string)` - Sets the column's `DEFAULT` value without escaping the input value~~
-  + **deprecated** since version 0.5.0 and will be removed in version 0.6.0
-  + Examples: `.defaultRaw('CURRENT_TIMESTAMP')` produces `DEFAULT CURRENT_TIMESTAMP`
 + `primaryKey()` - Declares the column to be the table's primary key
 + `unique()` - Declares the column as a unique index
 + `index()` - Declares the column as an index

jsdoc2md/README.hbs

@@ -342,9 +342,6 @@ This class is what is used to define the column's attributes. These attributes c
   + Examples:
     + `.default('Hello')` produces `DEFAULT 'Hello'`
     + `.default(null)` produces `DEFAULT NULL`
-+ ~~`defaultRaw(value: string)` - Sets the column's `DEFAULT` value without escaping the input value~~
-  + **deprecated** since version 0.5.0 and will be removed in version 0.6.0
-  + Examples: `.defaultRaw('CURRENT_TIMESTAMP')` produces `DEFAULT CURRENT_TIMESTAMP`
 + `primaryKey()` - Declares the column to be the table's primary key
 + `unique()` - Declares the column as a unique index
 + `index()` - Declares the column as an index

lib/ColumnDefinitions/ColumnDefinition.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const mysql = require('mysql');
-const util = require('util');
 
 class ColumnDefinition {
   constructor(type, m, d) {
@@ -47,16 +46,6 @@ class ColumnDefinition {
     return this;
   }
 
-  defaultRaw(value) {
-    if (typeof value !== 'string') {
-      throw new TypeError(
-        'The value passed to `.defaultRaw()` must be a string. You should use `.default()` for other types of values.'
-      );
-    }
-
-    return this.$defaultRaw(value);
-  }
-
   oldName(oldName) {
     this.$oldName = oldName;
     return this;
@@ -113,10 +102,4 @@ class ColumnDefinition {
   }
 }
 
-ColumnDefinition.prototype.defaultRaw = util.deprecate(
-  ColumnDefinition.prototype.defaultRaw,
-  'The `.defaultRaw()` method has been deprecated and will be removed in version 0.6.0. ' +
-    'Please use `.default()` or `.defaultCurrentTimestamp()` instead.'
-);
-
 module.exports = ColumnDefinition;

test/unit/ColumnDefinitions.test.js

@@ -30,34 +30,18 @@ describe('ColumnDefinitions', () => {
     b = ColumnDefinitions.blob();
     a.$equals(b).should.be.false();
 
-    a = ColumnDefinitions.blob().defaultRaw('a');
-    b = ColumnDefinitions.blob();
-    a.$equals(b).should.be.false();
-
     a = ColumnDefinitions.blob().default('a');
     b = ColumnDefinitions.blob().default('a');
     a.$equals(b).should.be.true();
 
-    a = ColumnDefinitions.blob().defaultRaw('a');
-    b = ColumnDefinitions.blob().defaultRaw('a');
-    a.$equals(b).should.be.true();
-
     a = ColumnDefinitions.blob().notNull();
     b = ColumnDefinitions.blob().notNull().default('a');
     a.$equals(b).should.be.false();
 
-    a = ColumnDefinitions.blob().notNull();
-    b = ColumnDefinitions.blob().notNull().defaultRaw('a');
-    a.$equals(b).should.be.false();
-
     a = ColumnDefinitions.blob().notNull().default('a');
     b = ColumnDefinitions.blob().notNull().default('b');
     a.$equals(b).should.be.false();
 
-    a = ColumnDefinitions.blob().notNull().defaultRaw('a');
-    b = ColumnDefinitions.blob().notNull().defaultRaw('b');
-    a.$equals(b).should.be.false();
-
     a = ColumnDefinitions.int().unsigned().zerofill().notNull().default(2).autoIncrement();
     b = ColumnDefinitions.int().unsigned().zerofill().notNull().default(2).autoIncrement();
     a.$equals(b).should.be.true();
@@ -374,28 +358,10 @@ describe('ColumnDefinitions', () => {
       cd = ColumnDefinitions.timestamp().default('CURRENT_TIMESTAMP');
       cd.$toSQL().should.equal('timestamp DEFAULT \'CURRENT_TIMESTAMP\'');
 
-      cd = ColumnDefinitions.datetime().notNull().defaultRaw('NOW()');
-      cd.$toSQL().should.equal('datetime NOT NULL DEFAULT NOW()');
-
-      cd = ColumnDefinitions.timestamp().notNull().defaultRaw('CURRENT_TIMESTAMP');
-      cd.$toSQL().should.equal('timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP');
-
-      cd = ColumnDefinitions.tinyint().notNull().defaultRaw('1');
-      cd.$toSQL().should.equal('tinyint NOT NULL DEFAULT 1');
-
       cd = ColumnDefinitions.datetime().default('1970-01-01 00:00:01');
       cd.$toSQL().should.equal('datetime DEFAULT \'1970-01-01 00:00:01\'');
     });
 
-    it('should throw if the value passed to `.defaultRaw()` is not a string', () => {
-      should.throws(() => ColumnDefinitions.int().defaultRaw(1), /defaultRaw.+must be a string/);
-      should.throws(() => ColumnDefinitions.int().defaultRaw([1]), /defaultRaw.+must be a string/);
-      should.throws(() => ColumnDefinitions.int().defaultRaw(null), /defaultRaw.+must be a string/);
-      should.throws(() => ColumnDefinitions.int().defaultRaw(undefined), /defaultRaw.+must be a string/);
-      should.throws(() => ColumnDefinitions.int().defaultRaw(true), /defaultRaw.+must be a string/);
-      should.throws(() => ColumnDefinitions.int().defaultRaw(false), /defaultRaw.+must be a string/);
-    });
-
     it('should allow the columns to be defined as keys, but not change the SQL', () => {
       var cd;