orange-dragonfly-orm-model-to-sql 0.7.5 → 0.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-dragonfly-orm-model-to-sql",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Converts Orange Dragonfly validator model to SQL CREATE TABLE syntax",
   "main": "index.js",
   "repository": {

package/src/mysql.js

@@ -85,12 +85,12 @@ class OrangeDragonflyORMSchemaToMySQL {
     const indexes = {}
     for (let rel of Object.values(model.available_relations)) {
       if ((rel.mode === 'child') || (rel.mode === 'children')) {
-        indexes[`${rel.b.table}.${rel._b_key_by_mode}`] = false
+        indexes[`${rel.b.table}.${rel._b_key_by_mode}`] = 'asc'
       } else if ((rel.mode === 'parent')) {
-        indexes[`${rel.a.table}.${rel._a_key_by_mode}`] = false
+        indexes[`${rel.a.table}.${rel._a_key_by_mode}`] = 'asc'
       } else {
-        indexes[`${rel.class_via.table}.${rel.via_a_key || `${rel.a.table}_id`}`] = false
-        indexes[`${rel.b.table}.${rel._b_key_by_mode}`] = false
+        indexes[`${rel.class_via.table}.${rel.via_a_key || `${rel.a.table}_id`}`] = 'asc'
+        indexes[`${rel.b.table}.${rel._b_key_by_mode}`] = 'asc'
       }
     }
     return indexes
@@ -100,7 +100,17 @@ class OrangeDragonflyORMSchemaToMySQL {
     const indexes = {}
     if (model.UNIQUE_KEYS) {
       for (const fields of model.UNIQUE_KEYS) {
-        indexes[fields.map(v => `${model.table}.${v}`).join('/')] = true
+        indexes[fields.map(v => `${model.table}.${v}`).join('/')] = 'unique'
+      }
+    }
+    return indexes
+  }
+
+  _generateFulltextIndexes(model) {
+    const indexes = {}
+    if (model.FULLTEXT_INDEXES) {
+      for (const fields of model.FULLTEXT_INDEXES) {
+        indexes[fields.map(v => `${model.table}.${v}`).join('/')] = 'fulltext'
       }
     }
     return indexes
@@ -108,11 +118,17 @@ class OrangeDragonflyORMSchemaToMySQL {
 
   _convertIndexesToSql(indexes) {
     const queries = []
-    for (let [index, is_unique] of Object.entries(indexes)) {
-      if (is_unique) {
-        queries.push(`CREATE UNIQUE INDEX uq_${index.replaceAll('.', '__').replaceAll('/', '___')} ON ${index.split('/')[0].split('.')[0]} (${index.split('/').map(v => v.split('.')[1]).join(', ')});`)
+    for (let [index, indexType] of Object.entries(indexes)) {
+      const [table] = index.split('/')[0].split('.')
+      const cols = index.split('/').map((v) => v.split('.')[1])
+      if (indexType === 'unique') {
+        queries.push(`CREATE UNIQUE INDEX uq_${table}__${cols.join('__')} ON ${table} (${cols.join(', ')});`)
+      } else if (indexType === 'asc') {
+        queries.push(`CREATE INDEX ix_${table}__${cols.join('__')} ON ${table} (${cols.join(', ')});`)
+      } else if (indexType === 'fulltext') {
+        queries.push(`CREATE FULLTEXT INDEX ft_${table}__${cols.join('__')} ON ${table} (${cols.join(', ')});`)
       } else {
-        queries.push(`CREATE INDEX ix_${index.replace('.', '__')} ON ${index.split('.')[0]} (${index.split('.')[1]});`)
+        throw new Error(`Unknown index type: ${indexType}`)
       }
     }
     return queries
@@ -129,7 +145,7 @@ class OrangeDragonflyORMSchemaToMySQL {
     for (const model of models) {
       queries.push(this._generateTableSQL(model))
       if (this._auto_indexes) {
-        Object.assign(indexes, this._generateIndexes(model), this._generateUniqueIndexes(model))
+        Object.assign(indexes, this._generateIndexes(model), this._generateUniqueIndexes(model), this._generateFulltextIndexes(model))
       }
     }
     if (this._auto_indexes) {