imean-cassandra-orm 3.0.0 → 3.0.2

package/dist/mod.cjs

@@ -1527,10 +1527,12 @@ var Model = class _Model {
   // 同步 Schema
   async syncSchema(force = false) {
     try {
+      console.log(`\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`);
       const operations = await this.syncTableSchema(force);
+      console.log(`\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`);
       return operations.join("\n");
     } catch (error) {
-      console.error("\u540C\u6B65\u8868\u7ED3\u6784\u65F6\u53D1\u751F\u9519\u8BEF:", error);
+      console.error(`\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`, error);
       throw error;
     }
   }
@@ -1538,6 +1540,12 @@ var Model = class _Model {
   async syncTableSchema(forceRecreate = false) {
     const operations = [];
     try {
+      console.log(`  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(`  \u{1F511} \u5206\u533A\u952E: [${this.schema.partitionKey.join(", ")}]`);
+      if (this.schema.clusteringKey) {
+        console.log(`  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`);
+      }
+      console.log(`  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`);
       await this.client.execute(
         queryHelper.ensureKeyspace(
           this.schema.keyspace,
@@ -1551,10 +1559,11 @@ var Model = class _Model {
         operations.push(...indexQueries);
       } else {
         const tableChanges = await this.analyzeTableChanges();
-        const hasUnalterableChanges = tableChanges.some(
-          (op) => op.startsWith("DROP TABLE")
-        );
+        const hasUnalterableChanges = tableChanges.unalterableReasons.length > 0;
         if (forceRecreate && hasUnalterableChanges) {
+          console.log("\u68C0\u6D4B\u5230\u4E0D\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u91CD\u5EFA\u8868");
+          console.log("\u4E0D\u53EF\u53D8\u66F4\u539F\u56E0:", tableChanges.unalterableReasons);
+          console.log("\u6240\u6709\u53D8\u66F4:", tableChanges.changes);
           operations.push(
             queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
           );
@@ -1562,15 +1571,23 @@ var Model = class _Model {
           const indexQueries = queryHelper.createIndexes(this.schema);
           operations.push(...indexQueries);
         } else if (forceRecreate && !hasUnalterableChanges) {
-          operations.push(...tableChanges);
+          console.log("\u68C0\u6D4B\u5230\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u4F7F\u7528 ALTER TABLE");
+          console.log("\u53D8\u66F4\u8BE6\u60C5:", tableChanges.changes);
+          operations.push(...tableChanges.operations);
           const indexOperations = await this.syncIndexes();
           operations.push(...indexOperations);
         } else if (!forceRecreate && hasUnalterableChanges) {
+          const reasons = tableChanges.unalterableReasons.join("; ");
           throw new Error(
-            `\u8868\u7ED3\u6784\u5B58\u5728\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\uFF0C\u9700\u8981\u4F7F\u7528 forceRecreate=true \u6765\u91CD\u5EFA\u8868\u3002\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\u5305\u62EC\uFF1A\u4E3B\u952E\u53D8\u66F4\u3001\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\u7B49\u3002`
+            `\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u5B58\u5728\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\uFF0C\u9700\u8981\u4F7F\u7528 forceRecreate=true \u6765\u91CD\u5EFA\u8868\u3002
+\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\u5305\u62EC\uFF1A
+${reasons}
+\u5176\u4ED6\u53D8\u66F4\uFF1A${tableChanges.changes.join("; ")}`
           );
         } else {
-          operations.push(...tableChanges);
+          console.log("\u68C0\u6D4B\u5230\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u4F7F\u7528 ALTER TABLE");
+          console.log("\u53D8\u66F4\u8BE6\u60C5:", tableChanges.changes);
+          operations.push(...tableChanges.operations);
           const indexOperations = await this.syncIndexes();
           operations.push(...indexOperations);
         }
@@ -1599,6 +1616,8 @@ var Model = class _Model {
   // 分析表结构变更
   async analyzeTableChanges() {
     const operations = [];
+    const changes = [];
+    const unalterableReasons = [];
     try {
       const tableMetadata2 = await this.client.execute(queryHelper.tableMetadata(), [
         this.schema.keyspace,
@@ -1607,34 +1626,44 @@ var Model = class _Model {
       const schemaFields = Object.keys(this.schema.fields.shape);
       const newFields = this.getNewFields(schemaFields, tableMetadata2);
       const deletedFields = this.getDeletedFields(schemaFields, tableMetadata2);
-      const hasPrimaryKeyChanges = await this.checkPrimaryKeyChanges();
-      if (hasPrimaryKeyChanges) {
+      if (newFields.length > 0) {
+        changes.push(`\u65B0\u589E\u5B57\u6BB5: ${newFields.join(", ")}`);
+        operations.push(queryHelper.addColumns(this.schema, newFields));
+      }
+      if (deletedFields.length > 0) {
+        changes.push(`\u5220\u9664\u5B57\u6BB5: ${deletedFields.join(", ")}`);
+        operations.push(queryHelper.dropColumns(this.schema, deletedFields));
+      }
+      const primaryKeyChanges = await this.checkPrimaryKeyChanges();
+      if (primaryKeyChanges.hasChanges) {
+        unalterableReasons.push(
+          `\u4E3B\u952E\u53D8\u66F4: ${primaryKeyChanges.reasons.join(", ")}`
+        );
         operations.push(
           queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
         );
         operations.push(queryHelper.createTable(this.schema));
-        return operations;
+        const indexQueries = queryHelper.createIndexes(this.schema);
+        operations.push(...indexQueries);
       }
-      const hasTypeChanges = await this.checkFieldTypeChanges(tableMetadata2);
-      if (hasTypeChanges) {
+      const typeChanges = await this.checkFieldTypeChanges(tableMetadata2);
+      if (typeChanges.hasChanges) {
+        unalterableReasons.push(
+          `\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4: ${typeChanges.reasons.join(", ")}`
+        );
         operations.push(
           queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
         );
         operations.push(queryHelper.createTable(this.schema));
-        return operations;
-      }
-      if (newFields.length > 0) {
-        const addQuery = queryHelper.addColumns(this.schema, newFields);
-        operations.push(addQuery);
-      }
-      if (deletedFields.length > 0) {
-        const dropQuery = queryHelper.dropColumns(this.schema, deletedFields);
-        operations.push(dropQuery);
+        const indexQueries = queryHelper.createIndexes(this.schema);
+        operations.push(...indexQueries);
       }
+      const indexOperations = await this.syncIndexes();
+      operations.push(...indexOperations);
+      return { operations, changes, unalterableReasons };
     } catch (error) {
-      console.error("\u5206\u6790\u8868\u7ED3\u6784\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
+      throw new Error(`\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`);
     }
-    return operations;
   }
   // 智能同步索引
   async syncIndexes() {
@@ -1675,7 +1704,7 @@ var Model = class _Model {
         [this.schema.keyspace, this.schema.tableName]
       );
       if (partitionKeyResult.rows.length !== this.schema.partitionKey.length) {
-        return true;
+        return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u6570\u91CF\u4E0D\u4E00\u81F4"] };
       }
       const existingPartitionKeys = new Set(
         partitionKeyResult.rows.map((row) => row.column_name.toLowerCase())
@@ -1684,11 +1713,11 @@ var Model = class _Model {
         this.schema.partitionKey.map((key) => String(key).toLowerCase())
       );
       if (existingPartitionKeys.size !== schemaPartitionKeys.size) {
-        return true;
+        return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u5B57\u6BB5\u540D\u4E0D\u4E00\u81F4"] };
       }
       for (const key of existingPartitionKeys) {
         if (!schemaPartitionKeys.has(key)) {
-          return true;
+          return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u5B57\u6BB5\u540D\u4E0D\u4E00\u81F4"] };
         }
       }
       if (this.schema.clusteringKey) {
@@ -1701,20 +1730,20 @@ var Model = class _Model {
           Object.keys(this.schema.clusteringKey).map((key) => key.toLowerCase())
         );
         if (existingClusteringKeys.size !== schemaClusteringKeys.size) {
-          return true;
+          return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
         }
         for (const key of existingClusteringKeys) {
           if (!schemaClusteringKeys.has(key)) {
-            return true;
+            return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
           }
         }
       } else if (clusteringKeyResult.rows.length > 0) {
-        return true;
+        return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
       }
-      return false;
+      return { hasChanges: false, reasons: [] };
     } catch (error) {
       console.error("\u68C0\u67E5\u4E3B\u952E\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
-      return false;
+      return { hasChanges: false, reasons: [] };
     }
   }
   // 检查字段类型变更
@@ -1730,14 +1759,17 @@ var Model = class _Model {
           );
           const existingType = existingField.type.toLowerCase();
           if (!this.isTypeCompatible(existingType, schemaType)) {
-            return true;
+            return {
+              hasChanges: true,
+              reasons: [`\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`]
+            };
           }
         }
       }
-      return false;
+      return { hasChanges: false, reasons: [] };
     } catch (error) {
       console.error("\u68C0\u67E5\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
-      return false;
+      return { hasChanges: false, reasons: [] };
     }
   }
   // 获取 Cassandra 类型

package/dist/mod.js

@@ -1525,10 +1525,12 @@ var Model = class _Model {
   // 同步 Schema
   async syncSchema(force = false) {
     try {
+      console.log(`\u{1F504} \u5F00\u59CB\u540C\u6B65\u8868: ${this.schema.keyspace}.${this.schema.tableName}`);
       const operations = await this.syncTableSchema(force);
+      console.log(`\u2705 \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5B8C\u6210`);
       return operations.join("\n");
     } catch (error) {
-      console.error("\u540C\u6B65\u8868\u7ED3\u6784\u65F6\u53D1\u751F\u9519\u8BEF:", error);
+      console.error(`\u274C \u8868 ${this.schema.keyspace}.${this.schema.tableName} \u540C\u6B65\u5931\u8D25:`, error);
       throw error;
     }
   }
@@ -1536,6 +1538,12 @@ var Model = class _Model {
   async syncTableSchema(forceRecreate = false) {
     const operations = [];
     try {
+      console.log(`  \u{1F4CB} \u8868\u7ED3\u6784: ${this.schema.keyspace}.${this.schema.tableName}`);
+      console.log(`  \u{1F511} \u5206\u533A\u952E: [${this.schema.partitionKey.join(", ")}]`);
+      if (this.schema.clusteringKey) {
+        console.log(`  \u{1F4CA} \u805A\u7C7B\u952E: ${Object.entries(this.schema.clusteringKey).map(([k, v]) => `${k}:${v}`).join(", ")}`);
+      }
+      console.log(`  \u{1F4DD} \u5B57\u6BB5\u6570\u91CF: ${Object.keys(this.schema.fields.shape).length}`);
       await this.client.execute(
         queryHelper.ensureKeyspace(
           this.schema.keyspace,
@@ -1549,10 +1557,11 @@ var Model = class _Model {
         operations.push(...indexQueries);
       } else {
         const tableChanges = await this.analyzeTableChanges();
-        const hasUnalterableChanges = tableChanges.some(
-          (op) => op.startsWith("DROP TABLE")
-        );
+        const hasUnalterableChanges = tableChanges.unalterableReasons.length > 0;
         if (forceRecreate && hasUnalterableChanges) {
+          console.log("\u68C0\u6D4B\u5230\u4E0D\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u91CD\u5EFA\u8868");
+          console.log("\u4E0D\u53EF\u53D8\u66F4\u539F\u56E0:", tableChanges.unalterableReasons);
+          console.log("\u6240\u6709\u53D8\u66F4:", tableChanges.changes);
           operations.push(
             queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
           );
@@ -1560,15 +1569,23 @@ var Model = class _Model {
           const indexQueries = queryHelper.createIndexes(this.schema);
           operations.push(...indexQueries);
         } else if (forceRecreate && !hasUnalterableChanges) {
-          operations.push(...tableChanges);
+          console.log("\u68C0\u6D4B\u5230\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u4F7F\u7528 ALTER TABLE");
+          console.log("\u53D8\u66F4\u8BE6\u60C5:", tableChanges.changes);
+          operations.push(...tableChanges.operations);
           const indexOperations = await this.syncIndexes();
           operations.push(...indexOperations);
         } else if (!forceRecreate && hasUnalterableChanges) {
+          const reasons = tableChanges.unalterableReasons.join("; ");
           throw new Error(
-            `\u8868\u7ED3\u6784\u5B58\u5728\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\uFF0C\u9700\u8981\u4F7F\u7528 forceRecreate=true \u6765\u91CD\u5EFA\u8868\u3002\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\u5305\u62EC\uFF1A\u4E3B\u952E\u53D8\u66F4\u3001\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\u7B49\u3002`
+            `\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u5B58\u5728\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\uFF0C\u9700\u8981\u4F7F\u7528 forceRecreate=true \u6765\u91CD\u5EFA\u8868\u3002
+\u4E0D\u53EF\u53D8\u66F4\u7684\u4FEE\u6539\u5305\u62EC\uFF1A
+${reasons}
+\u5176\u4ED6\u53D8\u66F4\uFF1A${tableChanges.changes.join("; ")}`
           );
         } else {
-          operations.push(...tableChanges);
+          console.log("\u68C0\u6D4B\u5230\u53EF\u53D8\u66F4\u7684\u8868\u7ED3\u6784\u4FEE\u6539\uFF0C\u5C06\u4F7F\u7528 ALTER TABLE");
+          console.log("\u53D8\u66F4\u8BE6\u60C5:", tableChanges.changes);
+          operations.push(...tableChanges.operations);
           const indexOperations = await this.syncIndexes();
           operations.push(...indexOperations);
         }
@@ -1597,6 +1614,8 @@ var Model = class _Model {
   // 分析表结构变更
   async analyzeTableChanges() {
     const operations = [];
+    const changes = [];
+    const unalterableReasons = [];
     try {
       const tableMetadata2 = await this.client.execute(queryHelper.tableMetadata(), [
         this.schema.keyspace,
@@ -1605,34 +1624,44 @@ var Model = class _Model {
       const schemaFields = Object.keys(this.schema.fields.shape);
       const newFields = this.getNewFields(schemaFields, tableMetadata2);
       const deletedFields = this.getDeletedFields(schemaFields, tableMetadata2);
-      const hasPrimaryKeyChanges = await this.checkPrimaryKeyChanges();
-      if (hasPrimaryKeyChanges) {
+      if (newFields.length > 0) {
+        changes.push(`\u65B0\u589E\u5B57\u6BB5: ${newFields.join(", ")}`);
+        operations.push(queryHelper.addColumns(this.schema, newFields));
+      }
+      if (deletedFields.length > 0) {
+        changes.push(`\u5220\u9664\u5B57\u6BB5: ${deletedFields.join(", ")}`);
+        operations.push(queryHelper.dropColumns(this.schema, deletedFields));
+      }
+      const primaryKeyChanges = await this.checkPrimaryKeyChanges();
+      if (primaryKeyChanges.hasChanges) {
+        unalterableReasons.push(
+          `\u4E3B\u952E\u53D8\u66F4: ${primaryKeyChanges.reasons.join(", ")}`
+        );
         operations.push(
           queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
         );
         operations.push(queryHelper.createTable(this.schema));
-        return operations;
+        const indexQueries = queryHelper.createIndexes(this.schema);
+        operations.push(...indexQueries);
       }
-      const hasTypeChanges = await this.checkFieldTypeChanges(tableMetadata2);
-      if (hasTypeChanges) {
+      const typeChanges = await this.checkFieldTypeChanges(tableMetadata2);
+      if (typeChanges.hasChanges) {
+        unalterableReasons.push(
+          `\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4: ${typeChanges.reasons.join(", ")}`
+        );
         operations.push(
           queryHelper.dropTable(this.schema.keyspace, this.schema.tableName)
         );
         operations.push(queryHelper.createTable(this.schema));
-        return operations;
-      }
-      if (newFields.length > 0) {
-        const addQuery = queryHelper.addColumns(this.schema, newFields);
-        operations.push(addQuery);
-      }
-      if (deletedFields.length > 0) {
-        const dropQuery = queryHelper.dropColumns(this.schema, deletedFields);
-        operations.push(dropQuery);
+        const indexQueries = queryHelper.createIndexes(this.schema);
+        operations.push(...indexQueries);
       }
+      const indexOperations = await this.syncIndexes();
+      operations.push(...indexOperations);
+      return { operations, changes, unalterableReasons };
     } catch (error) {
-      console.error("\u5206\u6790\u8868\u7ED3\u6784\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
+      throw new Error(`\u5206\u6790\u8868 ${this.schema.keyspace}.${this.schema.tableName} \u7ED3\u6784\u53D8\u66F4\u5931\u8D25: ${error}`);
     }
-    return operations;
   }
   // 智能同步索引
   async syncIndexes() {
@@ -1673,7 +1702,7 @@ var Model = class _Model {
         [this.schema.keyspace, this.schema.tableName]
       );
       if (partitionKeyResult.rows.length !== this.schema.partitionKey.length) {
-        return true;
+        return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u6570\u91CF\u4E0D\u4E00\u81F4"] };
       }
       const existingPartitionKeys = new Set(
         partitionKeyResult.rows.map((row) => row.column_name.toLowerCase())
@@ -1682,11 +1711,11 @@ var Model = class _Model {
         this.schema.partitionKey.map((key) => String(key).toLowerCase())
       );
       if (existingPartitionKeys.size !== schemaPartitionKeys.size) {
-        return true;
+        return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u5B57\u6BB5\u540D\u4E0D\u4E00\u81F4"] };
       }
       for (const key of existingPartitionKeys) {
         if (!schemaPartitionKeys.has(key)) {
-          return true;
+          return { hasChanges: true, reasons: ["\u5206\u533A\u952E\u5B57\u6BB5\u540D\u4E0D\u4E00\u81F4"] };
         }
       }
       if (this.schema.clusteringKey) {
@@ -1699,20 +1728,20 @@ var Model = class _Model {
           Object.keys(this.schema.clusteringKey).map((key) => key.toLowerCase())
         );
         if (existingClusteringKeys.size !== schemaClusteringKeys.size) {
-          return true;
+          return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
         }
         for (const key of existingClusteringKeys) {
           if (!schemaClusteringKeys.has(key)) {
-            return true;
+            return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
           }
         }
       } else if (clusteringKeyResult.rows.length > 0) {
-        return true;
+        return { hasChanges: true, reasons: ["\u805A\u7C7B\u952E\u914D\u7F6E\u4E0D\u4E00\u81F4"] };
       }
-      return false;
+      return { hasChanges: false, reasons: [] };
     } catch (error) {
       console.error("\u68C0\u67E5\u4E3B\u952E\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
-      return false;
+      return { hasChanges: false, reasons: [] };
     }
   }
   // 检查字段类型变更
@@ -1728,14 +1757,17 @@ var Model = class _Model {
           );
           const existingType = existingField.type.toLowerCase();
           if (!this.isTypeCompatible(existingType, schemaType)) {
-            return true;
+            return {
+              hasChanges: true,
+              reasons: [`\u5B57\u6BB5\u7C7B\u578B\u4E0D\u517C\u5BB9: ${field} (${existingType} \u2192 ${schemaType})`]
+            };
           }
         }
       }
-      return false;
+      return { hasChanges: false, reasons: [] };
     } catch (error) {
       console.error("\u68C0\u67E5\u5B57\u6BB5\u7C7B\u578B\u53D8\u66F4\u65F6\u53D1\u751F\u9519\u8BEF:", error);
-      return false;
+      return { hasChanges: false, reasons: [] };
     }
   }
   // 获取 Cassandra 类型

package/package.json

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