代码审查修复：UniqueConstraintViolation错误码、TIME_BUCKET边界保护、辅助方法提取

Co-authored-by: nnhy <506367+nnhy@users.noreply.github.com>

Author: Copilot

NewLife.NovaDb/Core/NovaException.cs

@@ -67,6 +67,9 @@ public enum ErrorCode
     /// <summary>约束违反</summary>
     ConstraintViolation = 4003,
 
+    /// <summary>唯一约束违反</summary>
+    UniqueConstraintViolation = 4009,
+
     /// <summary>分片未找到</summary>
     ShardNotFound = 4004,
 

NewLife.NovaDb/Engine/NovaTable.cs

@@ -486,10 +486,7 @@ public void CreateSecondaryIndex(IndexDefinition indexDef, Transaction tx)
             var idx = new SkipList<ComparableObject, List<ComparableObject>>();
             _secondaryIndexes[indexDef.IndexName] = idx;
 
-            // 获取索引列的序号
-            var colOrdinals = new Int32[indexDef.Columns.Count];
-            for (var i = 0; i < indexDef.Columns.Count; i++)
-                colOrdinals[i] = _schema.GetColumnIndex(indexDef.Columns[i]);
+            var colOrdinals = GetColumnOrdinals(indexDef);
 
             var pkCol = _schema.GetPrimaryKeyColumn()!;
 
@@ -513,7 +510,7 @@ public void CreateSecondaryIndex(IndexDefinition indexDef, Transaction tx)
                         }
                         else if (indexDef.IsUnique && pkList!.Count > 0)
                         {
-                            throw new NovaException(ErrorCode.PrimaryKeyConflict, $"Duplicate key in unique index '{indexDef.IndexName}'");
+                            throw new NovaException(ErrorCode.UniqueConstraintViolation, $"Duplicate key in unique index '{indexDef.IndexName}'");
                         }
 
                         pkList!.Add(pk);
@@ -557,6 +554,15 @@ public void DropSecondaryIndex(String indexName)
         }
     }
 
+    /// <summary>获取索引定义的列序号数组</summary>
+    private Int32[] GetColumnOrdinals(IndexDefinition indexDef)
+    {
+        var colOrdinals = new Int32[indexDef.Columns.Count];
+        for (var i = 0; i < indexDef.Columns.Count; i++)
+            colOrdinals[i] = _schema.GetColumnIndex(indexDef.Columns[i]);
+        return colOrdinals;
+    }
+
     /// <summary>构建索引键</summary>
     private static ComparableObject BuildIndexKey(Object?[] row, Int32[] colOrdinals)
     {
@@ -579,10 +585,7 @@ private void InsertIntoSecondaryIndexes(Object?[] row, ComparableObject pk)
             var indexDef = _schema.GetIndex(kvp.Key);
             if (indexDef == null) continue;
 
-            var colOrdinals = new Int32[indexDef.Columns.Count];
-            for (var i = 0; i < indexDef.Columns.Count; i++)
-                colOrdinals[i] = _schema.GetColumnIndex(indexDef.Columns[i]);
-
+            var colOrdinals = GetColumnOrdinals(indexDef);
             var indexKey = BuildIndexKey(row, colOrdinals);
             var idx = kvp.Value;
 
@@ -593,7 +596,7 @@ private void InsertIntoSecondaryIndexes(Object?[] row, ComparableObject pk)
             }
             else if (indexDef.IsUnique && pkList!.Count > 0)
             {
-                throw new NovaException(ErrorCode.PrimaryKeyConflict, $"Duplicate key in unique index '{indexDef.IndexName}'");
+                throw new NovaException(ErrorCode.UniqueConstraintViolation, $"Duplicate key in unique index '{indexDef.IndexName}'");
             }
 
             pkList!.Add(pk);
@@ -608,10 +611,7 @@ private void RemoveFromSecondaryIndexes(Object?[] row, ComparableObject pk)
             var indexDef = _schema.GetIndex(kvp.Key);
             if (indexDef == null) continue;
 
-            var colOrdinals = new Int32[indexDef.Columns.Count];
-            for (var i = 0; i < indexDef.Columns.Count; i++)
-                colOrdinals[i] = _schema.GetColumnIndex(indexDef.Columns[i]);
-
+            var colOrdinals = GetColumnOrdinals(indexDef);
             var indexKey = BuildIndexKey(row, colOrdinals);
             var idx = kvp.Value;
 

NewLife.NovaDb/Engine/TableSchema.cs

@@ -222,12 +222,8 @@ public void AddIndex(IndexDefinition index)
     {
         if (index == null) throw new ArgumentNullException(nameof(index));
 
-        // 检查索引名是否重复
-        foreach (var existing in _indexes)
-        {
-            if (String.Equals(existing.IndexName, index.IndexName, StringComparison.OrdinalIgnoreCase))
-                throw new NovaException(ErrorCode.InvalidArgument, $"Index '{index.IndexName}' already exists");
-        }
+        if (FindIndexByName(index.IndexName) != null)
+            throw new NovaException(ErrorCode.InvalidArgument, $"Index '{index.IndexName}' already exists");
 
         // 验证索引列是否都存在
         foreach (var col in index.Columns)
@@ -245,25 +241,20 @@ public void RemoveIndex(String indexName)
     {
         if (indexName == null) throw new ArgumentNullException(nameof(indexName));
 
-        var removed = false;
-        for (var i = _indexes.Count - 1; i >= 0; i--)
-        {
-            if (String.Equals(_indexes[i].IndexName, indexName, StringComparison.OrdinalIgnoreCase))
-            {
-                _indexes.RemoveAt(i);
-                removed = true;
-                break;
-            }
-        }
-
-        if (!removed)
+        var idx = FindIndexByName(indexName);
+        if (idx == null)
             throw new NovaException(ErrorCode.InvalidArgument, $"Index '{indexName}' not found");
+
+        _indexes.Remove(idx);
     }
 
     /// <summary>根据索引名获取索引定义</summary>
     /// <param name="indexName">索引名</param>
     /// <returns>索引定义，不存在返回 null</returns>
-    public IndexDefinition? GetIndex(String indexName)
+    public IndexDefinition? GetIndex(String indexName) => FindIndexByName(indexName);
+
+    /// <summary>按名称查找索引定义</summary>
+    private IndexDefinition? FindIndexByName(String indexName)
     {
         foreach (var idx in _indexes)
         {

NewLife.NovaDb/Sql/SqlEngine.Expression.cs

@@ -758,9 +758,9 @@ private static DateTime ParseTimeBucket(String bucket, DateTime dt)
             "second" => new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, dt.Second / amount * amount),
             "minute" => new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute / amount * amount, 0),
             "hour" => new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour / amount * amount, 0, 0),
-            "day" => new DateTime(dt.Year, dt.Month, (dt.Day - 1) / amount * amount + 1),
+            "day" => new DateTime(dt.Year, dt.Month, Math.Min((dt.Day - 1) / amount * amount + 1, DateTime.DaysInMonth(dt.Year, dt.Month))),
             "month" => new DateTime(dt.Year, (dt.Month - 1) / amount * amount + 1, 1),
-            "year" => new DateTime(dt.Year / amount * amount, 1, 1),
+            "year" => new DateTime(dt.Year / amount * amount == 0 ? 1 : dt.Year / amount * amount, 1, 1),
             _ => throw new NovaException(ErrorCode.InvalidArgument, $"Unknown TIME_BUCKET unit: {unit}")
         };
     }