neopg 2.0.2 → 2.0.3

package/lib/NeoPG.js

@@ -11,6 +11,17 @@ const path = require('node:path')
 const fs = require('node:fs')
 const { pathToFileURL } = require('node:url')
 
+/**
+ * 将下划线命名转换为大驼峰命名 (e.g. shop_order -> ShopOrder)
+ */
+function toPascalCase(str) {
+  if (!str) return ''
+
+  return str.split('_')
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join('')
+}
+
 class NeoPG {
   constructor(config) {
     this.driver = postgres(config)
@@ -50,6 +61,42 @@ class NeoPG {
 
     if (!rawSchema) throw new Error(`[NeoPG] Missing static schema for ${ModelClass.name}`)
 
+    // 如果没有显式指定 modelName，则尝试自动推断
+    if (!rawSchema.modelName) {
+      const className = ModelClass.name
+      
+      const genericNames = ['AnonymousModel', 'ModelChain', 'Function', '']
+
+      // 1. 优先尝试使用类名 (如果类名不是通用的)
+      if (className && !genericNames.includes(className)) {
+        rawSchema.modelName = className
+      } else if (rawSchema.tableName) {
+        rawSchema.modelName = toPascalCase(rawSchema.tableName)
+        setTimeout(() => {
+          console.error(`\x1b[33;5m[NeoPG]Warning: modelName is not specified, `
+                + `use ${rawSchema.modelName} as the modelName\x1b[0m`)
+        }, 100)
+      } else {
+        // 此时说明modelName无法确定，但是tableName也没有指定
+        throw new Error(`\x1b[31m[NeoPG] Missing modelName and tableName\x1b[0m`)
+      }
+      // 3. 如果依然无法确定，稍后 ModelDef 可能会报错，或者你可以选择在这里抛出
+    }
+
+    //经过以上处理，modelName已经确定了，此时若没有指定tableName则把modelName转换为小写作为tableName
+    if (!rawSchema.tableName) {
+      rawSchema.tableName = rawSchema.modelName.toLowerCase()
+
+      setTimeout(() => {
+        console.error(`\x1b[33;5m[NeoPG]Warning: tableName is not specified, `
+              + `use ${rawSchema.modelName.toLowerCase()} as the tableName\x1b[0m`)
+      }, 100)
+    }
+
+    if ((/[a-z]/).test(rawSchema.modelName[0])) {
+      throw new Error(`\x1b[31;5m[NeoPG] ${rawSchema.modelName}: modelName must start with an uppercase letter.\x1b[0m`)
+    }
+
     const def = new ModelDef(rawSchema)
 
     //已经存在又不是更新，则报错
@@ -93,6 +140,16 @@ class NeoPG {
 
     if (!options.schema) options.schema = this.defaultSchema
 
+    if (options.model) {
+      let model = this.registry.get(options.model)
+
+      if (!model) {
+        throw new Error(`[NeoPG] sync: ${modelname} not found.`)
+      }
+
+      return await SchemaSync.execute(this.driver, model.def, this, options)
+    }
+
     for (const item of this.registry.values()) {
       await SchemaSync.execute(this.driver, item.def, this, options)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neopg",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "orm for postgres",
   "keywords": [
     "neopg",

package/test/test-db.js

@@ -138,12 +138,58 @@ const User = {
 }
 
 // 3. 注册
-db.add(User);
+db.add(User)
 
 ;(async () => {
   await db.sync({force: true, debug: true})
   // 插入
 
+  //测试modelName和tableName
+
+  class ShopOrder extends ModelChain {
+    static schema = {
+      column: {
+        id: {
+          type: dataTypes.ID
+        },
+
+        name: {
+          type: dataTypes.STRING(30)
+        },
+
+        order_no: {
+          type: dataTypes.STRING(40)
+        }
+      }
+    }
+  }
+
+  db.define(ShopOrder)
+
+  //未指定modelName
+  let Cart = {
+    tableName: 'cart',
+    column: {
+
+    }
+  }
+
+  db.define(Cart)
+
+  let Category = {
+    column: {}
+  }
+
+  try {
+    db.define(Category)
+  } catch (err) {
+    setTimeout(() => {
+      console.error(err.message)
+    }, 100)
+  }
+
+  db.sync({force: true, debug: true, model: 'ShopOrder'})
+
   await db.model('User').where('1=1').delete()
 
   try {