imean-cassandra-orm 3.3.0 → 3.3.2

package/dist/mod.cjs

@@ -667,11 +667,7 @@ function shouldWrite(op, conf) {
 // src/indexes.ts
 function createIndex(keyspace, tableName, fieldName, options) {
   const indexName = `${tableName}_${String(fieldName).toLowerCase()}_sai_idx`;
-  const config = options !== true ? options : {
-    case_sensitive: false,
-    normalize: true,
-    ascii: true
-  };
+  const config = options !== true ? options : {};
   const optionsString = JSON.stringify(config).replace(/"/g, "'");
   return `CREATE INDEX IF NOT EXISTS ${indexName} ON ${keyspace}.${tableName} (${String(
     fieldName
@@ -810,41 +806,82 @@ function buildInsertParams(data, fieldConfigs) {
   });
   return params;
 }
+function isInOperator(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && "in" in value && Array.isArray(value.in);
+}
+function buildKeyConditionsAndParams(keyFields, keyValues, fieldConfigs) {
+  const conditions = [];
+  const params = [];
+  for (const key of keyFields) {
+    if (!Object.prototype.hasOwnProperty.call(keyValues, key)) continue;
+    const value = keyValues[key];
+    const config = fieldConfigs[key];
+    if (isInOperator(value)) {
+      const arr = value.in;
+      conditions.push(`${key} IN ?`);
+      const converted = arr.map(
+        (v) => config ? convertValueToCassandra(v, config) : v
+      );
+      params.push(converted);
+    } else {
+      conditions.push(`${key} = ?`);
+      params.push(config ? convertValueToCassandra(value, config) : value);
+    }
+  }
+  return { conditions, params };
+}
 function buildSelectCql(schema, partitionKey, clusteringKey, limit) {
   const tableRef = schema.keyspace ? `${schema.keyspace}.${schema.tableName}` : schema.tableName;
-  const conditions = [];
-  Object.keys(partitionKey).forEach((key) => {
-    conditions.push(`${key} = ?`);
-  });
+  const { conditions: pkConditions } = buildKeyConditionsAndParams(
+    schema.partitionKeyFields,
+    partitionKey,
+    convertSchemaToFieldConfigs(schema)
+  );
+  const conditions = [...pkConditions];
   if (clusteringKey) {
-    Object.keys(clusteringKey).forEach((key) => {
-      conditions.push(`${key} = ?`);
-    });
+    const ckFields = schema.clusteringKeyFields.map((ck) => ck.field);
+    const { conditions: ckConditions } = buildKeyConditionsAndParams(
+      ckFields,
+      clusteringKey,
+      convertSchemaToFieldConfigs(schema)
+    );
+    conditions.push(...ckConditions);
   }
   const whereClause = conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "";
-  const limitClause = limit ? ` LIMIT ${limit}` : "";
-  const allowFiltering = conditions.length > 0 ? ` ALLOW FILTERING` : "";
+  const limitClause = limit != null ? ` LIMIT ${limit}` : "";
+  const hasIn = Object.values(partitionKey).some(isInOperator);
+  const allowFiltering = conditions.length > 0 && !hasIn ? ` ALLOW FILTERING` : "";
   return `SELECT * FROM ${tableRef}${whereClause}${limitClause}${allowFiltering};`;
 }
-function buildQueryParams(partitionKey, fieldConfigs, clusteringKey) {
+function buildQueryParams(partitionKey, fieldConfigs, clusteringKey, schema) {
   const params = [];
-  Object.entries(partitionKey).forEach(([fieldName, value]) => {
-    const config = fieldConfigs[fieldName];
-    if (config) {
-      params.push(convertValueToCassandra(value, config));
-    } else {
-      params.push(value);
+  if (schema) {
+    const pk = buildKeyConditionsAndParams(
+      schema.partitionKeyFields,
+      partitionKey,
+      fieldConfigs
+    );
+    params.push(...pk.params);
+    if (clusteringKey) {
+      const ckFields = schema.clusteringKeyFields.map((c) => c.field);
+      const ck = buildKeyConditionsAndParams(
+        ckFields,
+        clusteringKey,
+        fieldConfigs
+      );
+      params.push(...ck.params);
     }
-  });
-  if (clusteringKey) {
-    Object.entries(clusteringKey).forEach(([fieldName, value]) => {
+  } else {
+    Object.entries(partitionKey).forEach(([fieldName, value]) => {
       const config = fieldConfigs[fieldName];
-      if (config) {
-        params.push(convertValueToCassandra(value, config));
-      } else {
-        params.push(value);
-      }
+      params.push(config ? convertValueToCassandra(value, config) : value);
     });
+    if (clusteringKey) {
+      Object.entries(clusteringKey).forEach(([fieldName, value]) => {
+        const config = fieldConfigs[fieldName];
+        params.push(config ? convertValueToCassandra(value, config) : value);
+      });
+    }
   }
   return params;
 }
@@ -2218,9 +2255,10 @@ var Model = class _Model {
       (key) => Object.prototype.hasOwnProperty.call(filters, key)
     );
     const hasClusteringKey = Object.keys(clusteringKey).length > 0;
+    const noOtherFilters = Object.keys(otherFilters).length === 0;
     let selectQuery;
     let params;
-    if (isPartitionKeyQuery && (hasClusteringKey || Object.keys(otherFilters).length === 0)) {
+    if (isPartitionKeyQuery && (hasClusteringKey || noOtherFilters)) {
       selectQuery = queryHelper.buildSelectCql(
         this.schema,
         partitionKey,
@@ -2230,7 +2268,8 @@ var Model = class _Model {
       params = queryHelper.buildQueryParams(
         partitionKey,
         fieldConfigs,
-        Object.keys(clusteringKey).length > 0 ? clusteringKey : void 0
+        Object.keys(clusteringKey).length > 0 ? clusteringKey : void 0,
+        this.schema
       );
     } else {
       selectQuery = queryHelper.buildSelectByIndexCql(this.schema, filters, limit);
@@ -2262,11 +2301,12 @@ var Model = class _Model {
         query,
         void 0,
         1
-        // 限制返回1条记录
       );
       params = queryHelper.buildQueryParams(
         query,
-        fieldConfigs
+        fieldConfigs,
+        void 0,
+        this.schema
       );
     } else {
       selectQuery = queryHelper.buildSelectByIndexCql(

package/dist/mod.js

@@ -665,11 +665,7 @@ function shouldWrite(op, conf) {
 // src/indexes.ts
 function createIndex(keyspace, tableName, fieldName, options) {
   const indexName = `${tableName}_${String(fieldName).toLowerCase()}_sai_idx`;
-  const config = options !== true ? options : {
-    case_sensitive: false,
-    normalize: true,
-    ascii: true
-  };
+  const config = options !== true ? options : {};
   const optionsString = JSON.stringify(config).replace(/"/g, "'");
   return `CREATE INDEX IF NOT EXISTS ${indexName} ON ${keyspace}.${tableName} (${String(
     fieldName
@@ -808,41 +804,82 @@ function buildInsertParams(data, fieldConfigs) {
   });
   return params;
 }
+function isInOperator(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && "in" in value && Array.isArray(value.in);
+}
+function buildKeyConditionsAndParams(keyFields, keyValues, fieldConfigs) {
+  const conditions = [];
+  const params = [];
+  for (const key of keyFields) {
+    if (!Object.prototype.hasOwnProperty.call(keyValues, key)) continue;
+    const value = keyValues[key];
+    const config = fieldConfigs[key];
+    if (isInOperator(value)) {
+      const arr = value.in;
+      conditions.push(`${key} IN ?`);
+      const converted = arr.map(
+        (v) => config ? convertValueToCassandra(v, config) : v
+      );
+      params.push(converted);
+    } else {
+      conditions.push(`${key} = ?`);
+      params.push(config ? convertValueToCassandra(value, config) : value);
+    }
+  }
+  return { conditions, params };
+}
 function buildSelectCql(schema, partitionKey, clusteringKey, limit) {
   const tableRef = schema.keyspace ? `${schema.keyspace}.${schema.tableName}` : schema.tableName;
-  const conditions = [];
-  Object.keys(partitionKey).forEach((key) => {
-    conditions.push(`${key} = ?`);
-  });
+  const { conditions: pkConditions } = buildKeyConditionsAndParams(
+    schema.partitionKeyFields,
+    partitionKey,
+    convertSchemaToFieldConfigs(schema)
+  );
+  const conditions = [...pkConditions];
   if (clusteringKey) {
-    Object.keys(clusteringKey).forEach((key) => {
-      conditions.push(`${key} = ?`);
-    });
+    const ckFields = schema.clusteringKeyFields.map((ck) => ck.field);
+    const { conditions: ckConditions } = buildKeyConditionsAndParams(
+      ckFields,
+      clusteringKey,
+      convertSchemaToFieldConfigs(schema)
+    );
+    conditions.push(...ckConditions);
   }
   const whereClause = conditions.length > 0 ? ` WHERE ${conditions.join(" AND ")}` : "";
-  const limitClause = limit ? ` LIMIT ${limit}` : "";
-  const allowFiltering = conditions.length > 0 ? ` ALLOW FILTERING` : "";
+  const limitClause = limit != null ? ` LIMIT ${limit}` : "";
+  const hasIn = Object.values(partitionKey).some(isInOperator);
+  const allowFiltering = conditions.length > 0 && !hasIn ? ` ALLOW FILTERING` : "";
   return `SELECT * FROM ${tableRef}${whereClause}${limitClause}${allowFiltering};`;
 }
-function buildQueryParams(partitionKey, fieldConfigs, clusteringKey) {
+function buildQueryParams(partitionKey, fieldConfigs, clusteringKey, schema) {
   const params = [];
-  Object.entries(partitionKey).forEach(([fieldName, value]) => {
-    const config = fieldConfigs[fieldName];
-    if (config) {
-      params.push(convertValueToCassandra(value, config));
-    } else {
-      params.push(value);
+  if (schema) {
+    const pk = buildKeyConditionsAndParams(
+      schema.partitionKeyFields,
+      partitionKey,
+      fieldConfigs
+    );
+    params.push(...pk.params);
+    if (clusteringKey) {
+      const ckFields = schema.clusteringKeyFields.map((c) => c.field);
+      const ck = buildKeyConditionsAndParams(
+        ckFields,
+        clusteringKey,
+        fieldConfigs
+      );
+      params.push(...ck.params);
     }
-  });
-  if (clusteringKey) {
-    Object.entries(clusteringKey).forEach(([fieldName, value]) => {
+  } else {
+    Object.entries(partitionKey).forEach(([fieldName, value]) => {
       const config = fieldConfigs[fieldName];
-      if (config) {
-        params.push(convertValueToCassandra(value, config));
-      } else {
-        params.push(value);
-      }
+      params.push(config ? convertValueToCassandra(value, config) : value);
     });
+    if (clusteringKey) {
+      Object.entries(clusteringKey).forEach(([fieldName, value]) => {
+        const config = fieldConfigs[fieldName];
+        params.push(config ? convertValueToCassandra(value, config) : value);
+      });
+    }
   }
   return params;
 }
@@ -2216,9 +2253,10 @@ var Model = class _Model {
       (key) => Object.prototype.hasOwnProperty.call(filters, key)
     );
     const hasClusteringKey = Object.keys(clusteringKey).length > 0;
+    const noOtherFilters = Object.keys(otherFilters).length === 0;
     let selectQuery;
     let params;
-    if (isPartitionKeyQuery && (hasClusteringKey || Object.keys(otherFilters).length === 0)) {
+    if (isPartitionKeyQuery && (hasClusteringKey || noOtherFilters)) {
       selectQuery = queryHelper.buildSelectCql(
         this.schema,
         partitionKey,
@@ -2228,7 +2266,8 @@ var Model = class _Model {
       params = queryHelper.buildQueryParams(
         partitionKey,
         fieldConfigs,
-        Object.keys(clusteringKey).length > 0 ? clusteringKey : void 0
+        Object.keys(clusteringKey).length > 0 ? clusteringKey : void 0,
+        this.schema
       );
     } else {
       selectQuery = queryHelper.buildSelectByIndexCql(this.schema, filters, limit);
@@ -2260,11 +2299,12 @@ var Model = class _Model {
         query,
         void 0,
         1
-        // 限制返回1条记录
       );
       params = queryHelper.buildQueryParams(
         query,
-        fieldConfigs
+        fieldConfigs,
+        void 0,
+        this.schema
       );
     } else {
       selectQuery = queryHelper.buildSelectByIndexCql(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imean-cassandra-orm",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "cassandra orm",
   "keywords": [
     "cassandra",
@@ -26,12 +26,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "dev": "tsx watch dev.ts",
-    "build": "tsup",
-    "test": "vitest run",
-    "prepublishOnly": "npm run build && npm run test"
-  },
   "dependencies": {
     "@clickhouse/client": "^1.12.1"
   },
@@ -64,5 +58,10 @@
   },
   "engines": {
     "node": ">=20"
+  },
+  "scripts": {
+    "dev": "tsx watch dev.ts",
+    "build": "tsup",
+    "test": "vitest run"
   }
-}
+}