leoric 2.1.1 → 2.2.0

package/History.md

@@ -1,3 +1,13 @@
+2.2.0 / 2022-02-24
+==================
+
+## What's Changed
+* fix: add missing `password` field for `ConnectOptions` by @luckydrq in https://github.com/cyjake/leoric/pull/280
+* feat: integer types (mostly mysql specific) by @cyjake in https://github.com/cyjake/leoric/pull/281
+
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.1.1...v2.2.0
+
 2.1.1 / 2022-02-23
 ==================
 

package/index.js

@@ -36,7 +36,7 @@ const connect = async function connect(opts) {
   return realm;
 };
 
-Object.assign(Realm.prototype, migrations, { DataTypes });
+Object.assign(Realm.prototype, migrations);
 Object.assign(Realm, {
   connect,
   Bone,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/data_types.js

@@ -14,7 +14,13 @@ const Raw = require('./raw');
 
 class DataType {
   static findType(columnType) {
-    const { STRING, TEXT, DATE, DATEONLY, INTEGER, BIGINT, BOOLEAN, BINARY, VARBINARY, BLOB } = this;
+    const {
+      STRING, TEXT,
+      DATE, DATEONLY,
+      TINYINT, SMALLINT, MEDIUMINT, INTEGER, BIGINT,
+      BOOLEAN,
+      BINARY, VARBINARY, BLOB,
+    } = this;
     const [ , dataType, appendix ] = columnType.match(/(\w+)(?:\((\d+)\))?/);
     const length = appendix && parseInt(appendix, 10);
 
@@ -39,10 +45,13 @@ class DataType {
       case 'int':
       case 'integer':
       case 'numeric':
+        return new INTEGER(length);
       case 'mediumint':
+        return new MEDIUMINT(length);
       case 'smallint':
+        return new SMALLINT(length);
       case 'tinyint':
-        return new INTEGER(length);
+        return new TINYINT(length);
       case 'bigint':
         return new BIGINT(length);
       case 'boolean':
@@ -203,12 +212,58 @@ class INTEGER extends DataType {
   }
 }
 
+/**
+ * 8 bit integer
+ * @example
+ * TINYINT
+ * TINYINT.UNSIGNED
+ * TINYINT(1)
+ * @param {number} length
+ */
+class TINYINT extends INTEGER {
+  constructor(length) {
+    super(length);
+    this.dataType = 'tinyint';
+  }
+}
+
+/**
+ * 16 bit integer
+ * @example
+ * SMALLINT
+ * SMALLINT.UNSIGNED
+ * SMALLINT(2)
+ * @param {number} length
+ */
+class SMALLINT extends INTEGER {
+  constructor(length) {
+    super(length);
+    this.dataType = 'smallint';
+  }
+}
+
+/**
+ * 24 bit integer
+ * @example
+ * MEDIUMINT
+ * MEDIUMINT.UNSIGNED
+ * MEDIUMINT(3)
+ * @param {number} length
+ */
+class MEDIUMINT extends INTEGER {
+  constructor(length) {
+    super(length);
+    this.dataType = 'mediumint';
+  }
+}
+
+
 /**
  * 64 bit integer
  * @example
  * BIGINT
  * BIGINT.UNSIGNED
- * BIGINT(10)
+ * BIGINT(8)
  * @param {number} length
  */
 class BIGINT extends INTEGER {
@@ -422,6 +477,9 @@ class JSONB extends JSON {
 
 const DataTypes = {
   STRING,
+  TINYINT,
+  SMALLINT,
+  MEDIUMINT,
   INTEGER,
   BIGINT,
   DATE,

package/src/drivers/abstract/attribute.js

@@ -65,6 +65,14 @@ function createType(DataTypes, params) {
   switch (type.constructor.name) {
     case 'DATE':
       return new DataType(type.precision, type.timezone);
+    case 'TINYINT':
+    case 'SMALLINT':
+    case 'MEDIUMINT':
+    case 'INTEGER':
+    case 'BIGINT':
+    case 'BINARY':
+    case 'VARBINARY':
+      return new DataType(type.length);
     default:
       return new DataType();
   }

package/src/drivers/postgres/data_types.js

@@ -61,12 +61,22 @@ class Postgres_BIGINT extends Postgres_INTEGER {
   }
 }
 
+class Postgres_SMALLINT extends Postgres_INTEGER {
+  constructor() {
+    super();
+    this.dataType = 'smallint';
+  }
+}
+
 class Postgres_DataTypes extends DataTypes {
   static DATE = Postgres_DATE;
   static JSONB = Postgres_JSONB;
   static BINARY = Postgres_BINARY;
   static VARBINARY = Postgres_BINARY;
   static BLOB = Postgres_BINARY;
+  static TINYINT = Postgres_SMALLINT;
+  static SMALLINT = Postgres_SMALLINT;
+  static MEDIUMINT = Postgres_INTEGER;
   static INTEGER = Postgres_INTEGER;
   static BIGINT =  Postgres_BIGINT;
 }

package/src/realm.js

@@ -129,6 +129,11 @@ class Realm {
     this.options = Spine.options = options;
   }
 
+  get DataTypes() {
+    if (!this.driver) throw new Error('database not connected yet');
+    return this.driver.DataTypes;
+  }
+
   define(name, attributes, opts = {}, descriptors = {}) {
     const Model = class extends this.Bone {
       static name = name;

package/types/index.d.ts

@@ -599,6 +599,7 @@ export interface ConnectOptions {
   host?: string;
   port?: number | string;
   user?: string;
+  password?: string;
   database: string;
   models?: string | (typeof Bone)[];
   subclass?: boolean;
@@ -644,7 +645,7 @@ export default class Realm {
     attributes: Record<string, DataTypes<DataType> | AttributeMeta>,
     options?: InitOptions,
     descriptors?: Record<string, Function>,
-  ): Bone;
+  ): typeof Bone;
 
   raw(sql: string): RawSql;