imean-cassandra-orm 1.4.2 → 1.4.4

package/dist/mod.cjs

@@ -130,14 +130,14 @@ var Model = class {
       return;
     }
     const currentColumns = new Map(
-      tableInfo.columns.map((col) => [col.name, col])
+      tableInfo.columns.map((col) => [col.name.toLowerCase(), col])
     );
     const newFields = Object.entries(this.schema).filter(
-      ([fieldName]) => !currentColumns.has(fieldName)
+      ([fieldName]) => !currentColumns.has(fieldName.toLowerCase())
     );
     const changes = [];
     Object.entries(this.schema).forEach(([fieldName, config]) => {
-      const currentColumn = currentColumns.get(fieldName);
+      const currentColumn = currentColumns.get(fieldName.toLowerCase());
       if (!currentColumn) return;
       const currentType = this.getCqlTypeFromCode(currentColumn.type.code);
       const newType = config.type;
@@ -147,7 +147,7 @@ var Model = class {
         );
       }
       const isCurrentPartitionKey = tableInfo.partitionKeys.some(
-        (key) => key.name === fieldName
+        (key) => key.name.toLowerCase() === fieldName.toLowerCase()
       );
       if (isCurrentPartitionKey !== config.flags.partitionKey) {
         changes.push(
@@ -155,7 +155,7 @@ var Model = class {
         );
       }
       const isCurrentClusteringKey = tableInfo.clusteringKeys.some(
-        (key) => key.name === fieldName
+        (key) => key.name.toLowerCase() === fieldName.toLowerCase()
       );
       const isClusteringKey = !!config.flags.clusteringKey;
       if (isCurrentClusteringKey !== isClusteringKey) {
@@ -219,6 +219,18 @@ ${changes.join(
     }
     return typeName;
   }
+  // 将查询结果转换为我们的类型
+  convertResultToType(result) {
+    const converted = {};
+    Object.keys(this.schema).forEach((key) => {
+      const lowerKey = key.toLowerCase();
+      const resultKey = Object.keys(result).find((k) => k.toLowerCase() === lowerKey);
+      if (resultKey) {
+        converted[key] = result[resultKey];
+      }
+    });
+    return this.zodSchemas.entity.parse(converted);
+  }
   // 构建查询条件
   buildWhereClause(partitionFields, clusteringFields) {
     const conditions = [];
@@ -275,14 +287,6 @@ ${changes.join(
       return error;
     }
   }
-  // 将查询结果转换为我们的类型
-  convertResultToType(result) {
-    const converted = {};
-    Object.keys(this.schema).forEach((key) => {
-      converted[key] = result[key];
-    });
-    return this.zodSchemas.entity.parse(converted);
-  }
   // 查询方法
   async findAll(partitionFields, clusteringFields) {
     const whereClause = this.buildWhereClause(

package/dist/mod.d.cts

@@ -266,11 +266,11 @@ declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = In
     getTableSchema(): string;
     syncSchema(force?: boolean): Promise<void>;
     private getCqlTypeFromCode;
+    private convertResultToType;
     private buildWhereClause;
     private buildQueryParams;
     validate(data: any): data is Simplify<A>;
     getValidationErrors(data: any): z.ZodError | null;
-    private convertResultToType;
     findAll(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
     findOne(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A> | null>;
     create(data: Simplify<P & Partial<NP>>): Promise<void>;

package/dist/mod.d.ts

@@ -266,11 +266,11 @@ declare class Model<S extends Record<string, FieldConfig<keyof TypeMap>>, P = In
     getTableSchema(): string;
     syncSchema(force?: boolean): Promise<void>;
     private getCqlTypeFromCode;
+    private convertResultToType;
     private buildWhereClause;
     private buildQueryParams;
     validate(data: any): data is Simplify<A>;
     getValidationErrors(data: any): z.ZodError | null;
-    private convertResultToType;
     findAll(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A>[]>;
     findOne(partitionFields: Simplify<P>, clusteringFields?: Simplify<Partial<C>>): Promise<Simplify<A> | null>;
     create(data: Simplify<P & Partial<NP>>): Promise<void>;

package/dist/mod.js

@@ -126,14 +126,14 @@ var Model = class {
       return;
     }
     const currentColumns = new Map(
-      tableInfo.columns.map((col) => [col.name, col])
+      tableInfo.columns.map((col) => [col.name.toLowerCase(), col])
     );
     const newFields = Object.entries(this.schema).filter(
-      ([fieldName]) => !currentColumns.has(fieldName)
+      ([fieldName]) => !currentColumns.has(fieldName.toLowerCase())
     );
     const changes = [];
     Object.entries(this.schema).forEach(([fieldName, config]) => {
-      const currentColumn = currentColumns.get(fieldName);
+      const currentColumn = currentColumns.get(fieldName.toLowerCase());
       if (!currentColumn) return;
       const currentType = this.getCqlTypeFromCode(currentColumn.type.code);
       const newType = config.type;
@@ -143,7 +143,7 @@ var Model = class {
         );
       }
       const isCurrentPartitionKey = tableInfo.partitionKeys.some(
-        (key) => key.name === fieldName
+        (key) => key.name.toLowerCase() === fieldName.toLowerCase()
       );
       if (isCurrentPartitionKey !== config.flags.partitionKey) {
         changes.push(
@@ -151,7 +151,7 @@ var Model = class {
         );
       }
       const isCurrentClusteringKey = tableInfo.clusteringKeys.some(
-        (key) => key.name === fieldName
+        (key) => key.name.toLowerCase() === fieldName.toLowerCase()
       );
       const isClusteringKey = !!config.flags.clusteringKey;
       if (isCurrentClusteringKey !== isClusteringKey) {
@@ -215,6 +215,18 @@ ${changes.join(
     }
     return typeName;
   }
+  // 将查询结果转换为我们的类型
+  convertResultToType(result) {
+    const converted = {};
+    Object.keys(this.schema).forEach((key) => {
+      const lowerKey = key.toLowerCase();
+      const resultKey = Object.keys(result).find((k) => k.toLowerCase() === lowerKey);
+      if (resultKey) {
+        converted[key] = result[resultKey];
+      }
+    });
+    return this.zodSchemas.entity.parse(converted);
+  }
   // 构建查询条件
   buildWhereClause(partitionFields, clusteringFields) {
     const conditions = [];
@@ -271,14 +283,6 @@ ${changes.join(
       return error;
     }
   }
-  // 将查询结果转换为我们的类型
-  convertResultToType(result) {
-    const converted = {};
-    Object.keys(this.schema).forEach((key) => {
-      converted[key] = result[key];
-    });
-    return this.zodSchemas.entity.parse(converted);
-  }
   // 查询方法
   async findAll(partitionFields, clusteringFields) {
     const whereClause = this.buildWhereClause(

package/package.json

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