@housekit/kit 0.1.32 → 0.1.34

package/dist/index.js

@@ -8448,7 +8448,22 @@ function resolveDatabase(config, name) {
   const selected = pickDatabase(config, name);
   let url = selected.db.url;
   if (!url && selected.db.host) {
-    url = selected.db.host.startsWith("http://") || selected.db.host.startsWith("https://") ? selected.db.host : `http://${selected.db.host}`;
+    let host = selected.db.host;
+    if (!host.startsWith("http://") && !host.startsWith("https://")) {
+      host = `http://${host}`;
+    }
+    if (selected.db.port) {
+      try {
+        const parsed = new URL(host);
+        if (!parsed.port) {
+          parsed.port = String(selected.db.port);
+          host = parsed.toString().replace(/\/$/, "");
+        }
+      } catch {
+        host = `${host}:${selected.db.port}`;
+      }
+    }
+    url = host;
   }
   url = url || "http://localhost:8123";
   const client = createClient({
@@ -8622,10 +8637,18 @@ function normalizeClause(val) {
     return val.expression;
   return String(val);
 }
+function normalizePartitionExpr(val) {
+  if (!val)
+    return;
+  let normalized = val.toLowerCase().replace(/\s+/g, "");
+  return normalized;
+}
 function normalizeTtlExpr(val) {
   if (!val)
     return;
-  return val.toLowerCase().replace(/\s+/g, "").replace(/tointervalday\((\d+)\)/g, "interval$1day");
+  let normalized = val.toLowerCase().replace(/\s+/g, "");
+  normalized = normalized.replace(/tointerval(day|year|month|week|hour|minute|second)\((\d+)\)/g, "interval$2$1").replace(/interval\s*(\d+)\s*(day|year|month|week|hour|minute|second)/g, "interval$1$2");
+  return normalized;
 }
 function canonicalName(name) {
   return name.toLowerCase().replace(/[^a-z0-9]/g, "");
@@ -8756,8 +8779,21 @@ function diffTable(table, localCols, remote, opts) {
   const compare = (label, local, remoteValue, action) => {
     if (!local && !remoteValue)
       return;
-    const l = label === "ttl" ? normalizeTtlExpr(normalizeClause(local)) : normalizeClause(local);
-    const r = label === "ttl" ? normalizeTtlExpr(normalizeClause(remoteValue)) : normalizeClause(remoteValue);
+    let l;
+    let r;
+    if (label === "ttl") {
+      l = normalizeTtlExpr(normalizeClause(local));
+      r = normalizeTtlExpr(normalizeClause(remoteValue));
+    } else if (label === "partitionBy") {
+      l = normalizePartitionExpr(normalizeClause(local));
+      r = normalizePartitionExpr(normalizeClause(remoteValue));
+      if (l && r && l.startsWith(r + "(")) {
+        return;
+      }
+    } else {
+      l = normalizeClause(local);
+      r = normalizeClause(remoteValue);
+    }
     if ((l || "unset") !== (r || "unset")) {
       optionChanges.push(label);
       if (action)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@housekit/kit",
-    "version": "0.1.32",
+    "version": "0.1.34",
     "description": "CLI tool for HouseKit - manage ClickHouse schemas, migrations, and database operations with type-safe workflows.",
     "type": "module",
     "main": "./dist/index.js",
@@ -48,7 +48,7 @@
     },
     "dependencies": {
         "@clickhouse/client": "^1.14.0",
-        "@housekit/orm": "^0.1.38",
+        "@housekit/orm": "^0.1.40",
         "boxen": "8.0.1",
         "chalk": "^5.6.2",
         "cli-table3": "^0.6.5",