Skip to content

Commit

Permalink
chore: Fix spelling - 'geometrical' -> 'geometry'
Browse files Browse the repository at this point in the history
  • Loading branch information
nwoltman committed May 9, 2019
1 parent 13e185d commit b88c815
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ These schema properties configure table-level options. The options currently sup
+ [TextColumnDefinition](#textcolumndefinition)
+ [UpdatableTimeColumnDefinition](#updatabletimecolumndefinition)
+ [TimestampColumnDefinition](#timestampcolumndefinition)
+ [GeometricalColumnDefinition](#geometricalcolumndefinition)
+ [GeometryColumnDefinition](#geometrycolumndefinition)

[`mysql.ColTypes`](#module_mysql-plus..ColTypes) and [`pool.ColTypes`](#PoolPlus+ColTypes) both expose the following methods:

Expand Down Expand Up @@ -1279,7 +1279,7 @@ 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`
+ __Note:__ `*blob`, `*text`, `json`, and geometrical columns cannot be assigned a default value other than `null`.
+ __Note:__ `*blob`, `*text`, `json`, and geometry columns cannot be assigned a default value other than `null`.
+ `primaryKey()` - Declares the column to be the table's primary key
+ `unique()` - Creates a unique index for the column
+ `index()` - Creates an index for the column
Expand Down Expand Up @@ -1385,7 +1385,7 @@ would define a column with this SQL:

Normally if the `DEFAULT` is unspecified, MySQL uses `CURRENT_TIMESTAMP` as the `DEFAULT` value of only the first timestamp column and `'0000-00-00 00:00:00'` for subsequent columns, but `mysql-plus` uses `CURRENT_TIMESTAMP` for all timestamp columns for consistency.

#### GeometricalColumnDefinition
#### GeometryColumnDefinition

Methods:

Expand Down
6 changes: 3 additions & 3 deletions jsdoc2md/README.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ These schema properties configure table-level options. The options currently sup
+ [TextColumnDefinition](#textcolumndefinition)
+ [UpdatableTimeColumnDefinition](#updatabletimecolumndefinition)
+ [TimestampColumnDefinition](#timestampcolumndefinition)
+ [GeometricalColumnDefinition](#geometricalcolumndefinition)
+ [GeometryColumnDefinition](#geometrycolumndefinition)

[`mysql.ColTypes`](#module_mysql-plus..ColTypes) and [`pool.ColTypes`](#PoolPlus+ColTypes) both expose the following methods:

Expand Down Expand Up @@ -320,7 +320,7 @@ 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`
+ __Note:__ `*blob`, `*text`, `json`, and geometrical columns cannot be assigned a default value other than `null`.
+ __Note:__ `*blob`, `*text`, `json`, and geometry columns cannot be assigned a default value other than `null`.
+ `primaryKey()` - Declares the column to be the table's primary key
+ `unique()` - Creates a unique index for the column
+ `index()` - Creates an index for the column
Expand Down Expand Up @@ -426,7 +426,7 @@ would define a column with this SQL:

Normally if the `DEFAULT` is unspecified, MySQL uses `CURRENT_TIMESTAMP` as the `DEFAULT` value of only the first timestamp column and `'0000-00-00 00:00:00'` for subsequent columns, but `mysql-plus` uses `CURRENT_TIMESTAMP` for all timestamp columns for consistency.

#### GeometricalColumnDefinition
#### GeometryColumnDefinition

Methods:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const ColumnDefinition = require('./ColumnDefinition');

class GeometricalColumnDefinition extends ColumnDefinition {
class GeometryColumnDefinition extends ColumnDefinition {
constructor(type) {
super(type);
this.$spatialIndex = false;
Expand All @@ -14,4 +14,4 @@ class GeometricalColumnDefinition extends ColumnDefinition {
}
}

module.exports = GeometricalColumnDefinition;
module.exports = GeometryColumnDefinition;
18 changes: 9 additions & 9 deletions lib/ColumnDefinitions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'use strict';

const ColumnDefinition = require('./ColumnDefinition');
const GeometricalColumnDefinition = require('./GeometricalColumnDefinition');
const GeometryColumnDefinition = require('./GeometryColumnDefinition');
const NumericColumnDefinition = require('./NumericColumnDefinition');
const TextColumnDefinition = require('./TextColumnDefinition');
const TimestampColumnDefinition = require('./TimestampColumnDefinition');
Expand Down Expand Up @@ -131,28 +131,28 @@ const ColumnDefinitions = {
return new ColumnDefinition('json');
},
geometry() {
return new GeometricalColumnDefinition('geometry');
return new GeometryColumnDefinition('geometry');
},
point() {
return new GeometricalColumnDefinition('point');
return new GeometryColumnDefinition('point');
},
linestring() {
return new GeometricalColumnDefinition('linestring');
return new GeometryColumnDefinition('linestring');
},
polygon() {
return new GeometricalColumnDefinition('polygon');
return new GeometryColumnDefinition('polygon');
},
multipoint() {
return new GeometricalColumnDefinition('multipoint');
return new GeometryColumnDefinition('multipoint');
},
multilinestring() {
return new GeometricalColumnDefinition('multilinestring');
return new GeometryColumnDefinition('multilinestring');
},
multipolygon() {
return new GeometricalColumnDefinition('multipolygon');
return new GeometryColumnDefinition('multipolygon');
},
geometrycollection() {
return new GeometricalColumnDefinition('geometrycollection');
return new GeometryColumnDefinition('geometrycollection');
},
};

Expand Down
2 changes: 1 addition & 1 deletion test/unit/ColumnDefinitions.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ describe('ColumnDefinitions', () => {
});


describe('geometrical data types', () => {
describe('geometry data types', () => {

it('should be able to create spatial indexes', () => {
ColumnDefinitions.geometry().spatialIndex()
Expand Down

0 comments on commit b88c815

Please sign in to comment.