imean-cassandra-orm 2.0.0 → 2.0.2

package/dist/mod.cjs

@@ -56,16 +56,26 @@ function convertZodToCassandraType(schema) {
 }
 function getNewFields(schemaFields, tableMetadata2) {
   return schemaFields.filter(
-    (field) => !tableMetadata2.some((t) => t.column_name === field)
+    (field) => !tableMetadata2.some(
+      (t) => t.column_name.toLowerCase() === field.toLowerCase()
+    )
   );
 }
 function getDeletedFields(schemaFields, tableMetadata2) {
-  return tableMetadata2.filter((t) => !schemaFields.includes(t.column_name)).map((t) => t.column_name);
+  return tableMetadata2.filter((t) => !schemaFields.some(
+    (field) => field.toLowerCase() === t.column_name.toLowerCase()
+  )).map((t) => t.column_name);
 }
 function getUpdatedFields(schemaFields, tableMetadata2, shape) {
   return schemaFields.filter(
     (field) => tableMetadata2.some(
-      (t) => t.column_name === field && t.type !== convertZodToCassandraType(shape[field])
+      (t) => {
+        const dbFieldName = t.column_name;
+        const schemaFieldName = field;
+        const dbType = t.type;
+        const schemaType = convertZodToCassandraType(shape[field]);
+        return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
+      }
     )
   );
 }
@@ -298,8 +308,34 @@ function buildDeleteCql(schema, partitionKey, clusteringKey) {
 }
 function convertRowToObject(row, fieldConfigs, zodSchema) {
   const result = {};
+  const fieldNameMap = /* @__PURE__ */ new Map();
+  Object.keys(fieldConfigs).forEach((camelCaseName) => {
+    fieldNameMap.set(camelCaseName.toLowerCase(), camelCaseName);
+  });
   Object.entries(fieldConfigs).forEach(([fieldName, config]) => {
-    const value = row[fieldName];
+    const possibleNames = [
+      fieldName,
+      // 原始驼峰名
+      fieldName.toLowerCase(),
+      // 全小写
+      fieldName.toUpperCase()
+      // 全大写
+    ];
+    let value = void 0;
+    for (const possibleName of possibleNames) {
+      if (possibleName in row) {
+        value = row[possibleName];
+        break;
+      }
+    }
+    if (value === void 0) {
+      for (const [dbFieldName, dbValue] of Object.entries(row)) {
+        if (dbFieldName.toLowerCase() === fieldName.toLowerCase()) {
+          value = dbValue;
+          break;
+        }
+      }
+    }
     if (value !== void 0) {
       result[fieldName] = convertValueFromCassandra(value, config);
     }
@@ -442,6 +478,12 @@ var Model = class _Model {
     this.schema = schema;
     this.client = client;
   }
+  get types() {
+    return this.schema.types;
+  }
+  get schemas() {
+    return this.schema.schemas;
+  }
   // 静态方法：创建模型（需要外部传入 client）
   static create(definition, client) {
     const schema = new TableSchema(definition);
@@ -577,13 +619,45 @@ var Model = class _Model {
         syncQueries.push(queryHelper.dropColumns(this.schema, deletedFields));
       }
       if (updatedFields.length > 0) {
-        errorReason = "\u5B57\u6BB5\u7C7B\u578B\u6709\u66F4\u65B0\uFF0C\u4F46 force \u4E3A false\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const fieldDetails = updatedFields.map((field) => {
+          const meta = tableMetadata2.find((t) => t.column_name.toLowerCase() === field.toLowerCase());
+          const existingType = meta?.type || "unknown";
+          const newType = convertZodToCassandraType(
+            this.schema.fields.shape[field]
+          );
+          return `${field}(${existingType} -> ${newType})`;
+        }).join(", ");
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u5B57\u6BB5\u7C7B\u578B\u6709\u66F4\u65B0\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002\u53D8\u66F4\u5B57\u6BB5: ${fieldDetails}`;
       }
       if (hasKeyFieldChanged(this.schema, newFields, deletedFields)) {
-        errorReason = "\u5220\u9664\u7684\u5B57\u6BB5\u6216\u8005\u65B0\u589E\u7684\u5B57\u6BB5\u6709\u5206\u533A\u952E\u6216\u8005\u805A\u7C7B\u952E\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const partitionKeyFields = this.schema.partitionKeyFields;
+        const clusteringKeyFields = this.schema.clusteringKeyFields.map(
+          (ck) => ck.field
+        );
+        const keyFields = [...partitionKeyFields, ...clusteringKeyFields];
+        const newKeyFields = newFields.filter(
+          (field) => keyFields.includes(field)
+        );
+        const deletedKeyFields = deletedFields.filter(
+          (field) => keyFields.includes(field)
+        );
+        let keyChangeDetails = [];
+        if (newKeyFields.length > 0) {
+          keyChangeDetails.push(`\u65B0\u589E\u952E\u5B57\u6BB5: ${newKeyFields.join(", ")}`);
+        }
+        if (deletedKeyFields.length > 0) {
+          keyChangeDetails.push(`\u5220\u9664\u952E\u5B57\u6BB5: ${deletedKeyFields.join(", ")}`);
+        }
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u952E\u5B57\u6BB5\u53D1\u751F\u53D8\u66F4\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002${keyChangeDetails.join("; ")}`;
       }
       if (isClusteringKeyChanged(this.schema, tableMetadata2)) {
-        errorReason = "\u805A\u7C7B\u952E\u914D\u7F6E\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const existingClusteringKeys = tableMetadata2.filter((t) => t.kind === "clustering").map((t) => t.column_name);
+        const currentClusteringKeys = this.schema.clusteringKeyFields.map(
+          (ck) => ck.field
+        );
+        const existingOrder = existingClusteringKeys.join(", ");
+        const currentOrder = currentClusteringKeys.join(", ");
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u805A\u7C7B\u952E\u914D\u7F6E\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002\u73B0\u6709\u987A\u5E8F: [${existingOrder}]\uFF0C\u65B0\u987A\u5E8F: [${currentOrder}]`;
       }
     }
     if (errorReason) {
@@ -613,7 +687,7 @@ var uuid = () => cassandraDriver.types.Uuid.random().toString();
 var Client = class {
   constructor(options) {
     this.options = options;
-    this.cassandraClient = new cassandraDriver.Client(options);
+    this.cassandraClient = new cassandraDriver.Client({ ...options });
   }
   cassandraClient;
   models = [];
@@ -663,7 +737,11 @@ var Client = class {
       }
     }
     try {
-      const result = await this.cassandraClient.execute(cql, params, executeOptions);
+      const result = await this.cassandraClient.execute(
+        cql,
+        params,
+        executeOptions
+      );
       if (this.options.debug) {
         console.log({ query: cql, params, rows: result.rows });
       }

package/dist/mod.d.cts

@@ -179,6 +179,16 @@ declare class Model<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends
     readonly schema: TableSchema<F, PK, CK>;
     readonly client: Client;
     constructor(schema: TableSchema<F, PK, CK>, client: Client);
+    get types(): {
+        model: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any>[k]; } : never;
+        partitionKey: ExtractPartitionKeyType<F, PK>;
+        clusteringKey: ExtractClusteringKeyType<F, CK>;
+    };
+    get schemas(): {
+        model: z.ZodObject<F, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any>[k]; } : never, z.baseObjectInputType<F> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<F>[k_1]; } : never>;
+        partitionKey: z.ZodObject<ExtractPartitionKeyShape<F, PK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractPartitionKeyShape<F, PK>>, any> extends infer T_2 ? { [k_2 in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractPartitionKeyShape<F, PK>>, any>[k_2]; } : never, z.baseObjectInputType<ExtractPartitionKeyShape<F, PK>> extends infer T_3 ? { [k_3 in keyof T_3]: z.baseObjectInputType<ExtractPartitionKeyShape<F, PK>>[k_3]; } : never>;
+        clusteringKey: CK extends ClusteringKeyConfig ? z.ZodObject<ExtractClusteringKeyShape<F, CK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any> extends infer T_4 ? { [k_4 in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any>[k_4]; } : never, z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>> extends infer T_5 ? { [k_5 in keyof T_5]: z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>>[k_5]; } : never> : never;
+    };
     static create<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends ClusteringKeyConfig | undefined = undefined>(definition: SchemaDefinition<F, PK, CK>, client: Client): Model<F, PK, CK>;
     insert(data: z.infer<z.ZodObject<F>>): Promise<void>;
     batchInsert(data: z.infer<z.ZodObject<F>>[]): Promise<void>;

package/dist/mod.d.ts

@@ -179,6 +179,16 @@ declare class Model<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends
     readonly schema: TableSchema<F, PK, CK>;
     readonly client: Client;
     constructor(schema: TableSchema<F, PK, CK>, client: Client);
+    get types(): {
+        model: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any>[k]; } : never;
+        partitionKey: ExtractPartitionKeyType<F, PK>;
+        clusteringKey: ExtractClusteringKeyType<F, CK>;
+    };
+    get schemas(): {
+        model: z.ZodObject<F, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any> extends infer T ? { [k in keyof T]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<F>, any>[k]; } : never, z.baseObjectInputType<F> extends infer T_1 ? { [k_1 in keyof T_1]: z.baseObjectInputType<F>[k_1]; } : never>;
+        partitionKey: z.ZodObject<ExtractPartitionKeyShape<F, PK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractPartitionKeyShape<F, PK>>, any> extends infer T_2 ? { [k_2 in keyof T_2]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractPartitionKeyShape<F, PK>>, any>[k_2]; } : never, z.baseObjectInputType<ExtractPartitionKeyShape<F, PK>> extends infer T_3 ? { [k_3 in keyof T_3]: z.baseObjectInputType<ExtractPartitionKeyShape<F, PK>>[k_3]; } : never>;
+        clusteringKey: CK extends ClusteringKeyConfig ? z.ZodObject<ExtractClusteringKeyShape<F, CK>, z.UnknownKeysParam, z.ZodTypeAny, z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any> extends infer T_4 ? { [k_4 in keyof T_4]: z.objectUtil.addQuestionMarks<z.baseObjectOutputType<ExtractClusteringKeyShape<F, CK>>, any>[k_4]; } : never, z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>> extends infer T_5 ? { [k_5 in keyof T_5]: z.baseObjectInputType<ExtractClusteringKeyShape<F, CK>>[k_5]; } : never> : never;
+    };
     static create<F extends z.ZodRawShape, PK extends (keyof F)[], CK extends ClusteringKeyConfig | undefined = undefined>(definition: SchemaDefinition<F, PK, CK>, client: Client): Model<F, PK, CK>;
     insert(data: z.infer<z.ZodObject<F>>): Promise<void>;
     batchInsert(data: z.infer<z.ZodObject<F>>[]): Promise<void>;

package/dist/mod.js

@@ -54,16 +54,26 @@ function convertZodToCassandraType(schema) {
 }
 function getNewFields(schemaFields, tableMetadata2) {
   return schemaFields.filter(
-    (field) => !tableMetadata2.some((t) => t.column_name === field)
+    (field) => !tableMetadata2.some(
+      (t) => t.column_name.toLowerCase() === field.toLowerCase()
+    )
   );
 }
 function getDeletedFields(schemaFields, tableMetadata2) {
-  return tableMetadata2.filter((t) => !schemaFields.includes(t.column_name)).map((t) => t.column_name);
+  return tableMetadata2.filter((t) => !schemaFields.some(
+    (field) => field.toLowerCase() === t.column_name.toLowerCase()
+  )).map((t) => t.column_name);
 }
 function getUpdatedFields(schemaFields, tableMetadata2, shape) {
   return schemaFields.filter(
     (field) => tableMetadata2.some(
-      (t) => t.column_name === field && t.type !== convertZodToCassandraType(shape[field])
+      (t) => {
+        const dbFieldName = t.column_name;
+        const schemaFieldName = field;
+        const dbType = t.type;
+        const schemaType = convertZodToCassandraType(shape[field]);
+        return dbFieldName.toLowerCase() === schemaFieldName.toLowerCase() && dbType !== schemaType;
+      }
     )
   );
 }
@@ -296,8 +306,34 @@ function buildDeleteCql(schema, partitionKey, clusteringKey) {
 }
 function convertRowToObject(row, fieldConfigs, zodSchema) {
   const result = {};
+  const fieldNameMap = /* @__PURE__ */ new Map();
+  Object.keys(fieldConfigs).forEach((camelCaseName) => {
+    fieldNameMap.set(camelCaseName.toLowerCase(), camelCaseName);
+  });
   Object.entries(fieldConfigs).forEach(([fieldName, config]) => {
-    const value = row[fieldName];
+    const possibleNames = [
+      fieldName,
+      // 原始驼峰名
+      fieldName.toLowerCase(),
+      // 全小写
+      fieldName.toUpperCase()
+      // 全大写
+    ];
+    let value = void 0;
+    for (const possibleName of possibleNames) {
+      if (possibleName in row) {
+        value = row[possibleName];
+        break;
+      }
+    }
+    if (value === void 0) {
+      for (const [dbFieldName, dbValue] of Object.entries(row)) {
+        if (dbFieldName.toLowerCase() === fieldName.toLowerCase()) {
+          value = dbValue;
+          break;
+        }
+      }
+    }
     if (value !== void 0) {
       result[fieldName] = convertValueFromCassandra(value, config);
     }
@@ -440,6 +476,12 @@ var Model = class _Model {
     this.schema = schema;
     this.client = client;
   }
+  get types() {
+    return this.schema.types;
+  }
+  get schemas() {
+    return this.schema.schemas;
+  }
   // 静态方法：创建模型（需要外部传入 client）
   static create(definition, client) {
     const schema = new TableSchema(definition);
@@ -575,13 +617,45 @@ var Model = class _Model {
         syncQueries.push(queryHelper.dropColumns(this.schema, deletedFields));
       }
       if (updatedFields.length > 0) {
-        errorReason = "\u5B57\u6BB5\u7C7B\u578B\u6709\u66F4\u65B0\uFF0C\u4F46 force \u4E3A false\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const fieldDetails = updatedFields.map((field) => {
+          const meta = tableMetadata2.find((t) => t.column_name.toLowerCase() === field.toLowerCase());
+          const existingType = meta?.type || "unknown";
+          const newType = convertZodToCassandraType(
+            this.schema.fields.shape[field]
+          );
+          return `${field}(${existingType} -> ${newType})`;
+        }).join(", ");
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u5B57\u6BB5\u7C7B\u578B\u6709\u66F4\u65B0\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002\u53D8\u66F4\u5B57\u6BB5: ${fieldDetails}`;
       }
       if (hasKeyFieldChanged(this.schema, newFields, deletedFields)) {
-        errorReason = "\u5220\u9664\u7684\u5B57\u6BB5\u6216\u8005\u65B0\u589E\u7684\u5B57\u6BB5\u6709\u5206\u533A\u952E\u6216\u8005\u805A\u7C7B\u952E\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const partitionKeyFields = this.schema.partitionKeyFields;
+        const clusteringKeyFields = this.schema.clusteringKeyFields.map(
+          (ck) => ck.field
+        );
+        const keyFields = [...partitionKeyFields, ...clusteringKeyFields];
+        const newKeyFields = newFields.filter(
+          (field) => keyFields.includes(field)
+        );
+        const deletedKeyFields = deletedFields.filter(
+          (field) => keyFields.includes(field)
+        );
+        let keyChangeDetails = [];
+        if (newKeyFields.length > 0) {
+          keyChangeDetails.push(`\u65B0\u589E\u952E\u5B57\u6BB5: ${newKeyFields.join(", ")}`);
+        }
+        if (deletedKeyFields.length > 0) {
+          keyChangeDetails.push(`\u5220\u9664\u952E\u5B57\u6BB5: ${deletedKeyFields.join(", ")}`);
+        }
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u952E\u5B57\u6BB5\u53D1\u751F\u53D8\u66F4\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002${keyChangeDetails.join("; ")}`;
       }
       if (isClusteringKeyChanged(this.schema, tableMetadata2)) {
-        errorReason = "\u805A\u7C7B\u952E\u914D\u7F6E\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0";
+        const existingClusteringKeys = tableMetadata2.filter((t) => t.kind === "clustering").map((t) => t.column_name);
+        const currentClusteringKeys = this.schema.clusteringKeyFields.map(
+          (ck) => ck.field
+        );
+        const existingOrder = existingClusteringKeys.join(", ");
+        const currentOrder = currentClusteringKeys.join(", ");
+        errorReason = `[${this.schema.keyspace}.${this.schema.tableName}] \u805A\u7C7B\u952E\u914D\u7F6E\u53D1\u751F\u53D8\u5316\uFF0C\u65E0\u6CD5\u81EA\u52A8\u66F4\u65B0\u3002\u73B0\u6709\u987A\u5E8F: [${existingOrder}]\uFF0C\u65B0\u987A\u5E8F: [${currentOrder}]`;
       }
     }
     if (errorReason) {
@@ -611,7 +685,7 @@ var uuid = () => types.Uuid.random().toString();
 var Client = class {
   constructor(options) {
     this.options = options;
-    this.cassandraClient = new Client$1(options);
+    this.cassandraClient = new Client$1({ ...options });
   }
   cassandraClient;
   models = [];
@@ -661,7 +735,11 @@ var Client = class {
       }
     }
     try {
-      const result = await this.cassandraClient.execute(cql, params, executeOptions);
+      const result = await this.cassandraClient.execute(
+        cql,
+        params,
+        executeOptions
+      );
       if (this.options.debug) {
         console.log({ query: cql, params, rows: result.rows });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-cassandra-orm",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "cassandra orm",
   "keywords": [
     "cassandra",