fix(container): remove unnecessary nil check design

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.agents/instructions/markdown-format.instructions.md

@@ -1,21 +0,0 @@
----
-name: "Standardize markdown document formatting"
-description: "Standardize the formatting of all markdown documents to keep structure clear, content readable, and the overall quality and user experience consistent. This document explains requirements for heading levels, paragraph formatting, code block usage, list formatting, and image and link insertion so authors can follow a unified style that is easier to read and maintain."
-applyTo: "*.{md,MD}"
----
-
-# Primary Formatting Requirements
-
-- Keywords or specialized terms in the document must be formatted with inline code, for example `RuntimeClass`, `containerd`, `GPU`, and `AI`.
-- In Chinese text, do not add spaces around inline code.
-- For technical articles, review the generated content before finalizing it to ensure the material is technically accurate and contains no incorrect technical descriptions.
-- When the generated content is too large, split it into multiple tasks to avoid exceeding model output limits and causing the workflow to fail.
-
-
-# Detailed Content Requirements
-
-- When documenting parameters or configuration items for a component or project, prefer tables when practical, and keep tables short enough to avoid horizontal scrolling during normal reading.
-- In Chinese paragraphs, use full-width punctuation rather than half-width punctuation, for example `，` instead of `,` and `；` instead of `;`.
-- Use `mermaid` for architecture diagrams, flowcharts, and similar visuals. If you need line breaks inside `mermaid`, use `<br/>` instead of `\n`.
-- If a code block is not a `mermaid` diagram and instead uses box-drawing characters such as `┌─`, `┐`, `┤`, or `│`, keep the content in English so the layout stays aligned.
-- Do not use `---` as a separator between paragraphs.

.agents/prompts/opsx/apply.md

@@ -1,152 +0,0 @@
----
-name: "OPSX: Apply"
-description: Implement tasks from an OpenSpec change (Experimental)
-category: Workflow
-tags: [workflow, artifacts, experimental]
----
-
-Implement tasks from an OpenSpec change.
-
-**Input**: Optionally specify a change name (e.g., `/opsx:apply add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes.
-
-**Steps**
-
-1. **Select the change**
-
-   If a name is provided, use it. Otherwise:
-   - Infer from conversation context if the user mentioned a change
-   - Auto-select if only one active change exists
-   - If ambiguous, run `openspec list --json` to get available changes and use the **AskUserQuestion tool** to let the user select
-
-   Always announce: "Using change: <name>" and how to override (e.g., `/opsx:apply <other>`).
-
-2. **Check status to understand the schema**
-   ```bash
-   openspec status --change "<name>" --json
-   ```
-   Parse the JSON to understand:
-   - `schemaName`: The workflow being used (e.g., "spec-driven")
-   - Which artifact contains the tasks (typically "tasks" for spec-driven, check status for others)
-
-3. **Get apply instructions**
-
-   ```bash
-   openspec instructions apply --change "<name>" --json
-   ```
-
-   This returns:
-   - Context file paths (varies by schema)
-   - Progress (total, complete, remaining)
-   - Task list with status
-   - Dynamic instruction based on current state
-
-   **Handle states:**
-   - If `state: "blocked"` (missing artifacts): show message, suggest using `/opsx:continue`
-   - If `state: "all_done"`: congratulate, suggest archive
-   - Otherwise: proceed to implementation
-
-4. **Read context files**
-
-   Read the files listed in `contextFiles` from the apply instructions output.
-   The files depend on the schema being used:
-   - **spec-driven**: proposal, specs, design, tasks
-   - Other schemas: follow the contextFiles from CLI output
-
-5. **Show current progress**
-
-   Display:
-   - Schema being used
-   - Progress: "N/M tasks complete"
-   - Remaining tasks overview
-   - Dynamic instruction from CLI
-
-6. **Implement tasks (loop until done or blocked)**
-
-   For each pending task:
-   - Show which task is being worked on
-   - Make the code changes required
-   - Keep changes minimal and focused
-   - Mark task complete in the tasks file: `- [ ]` → `- [x]`
-   - Continue to next task
-
-   **Pause if:**
-   - Task is unclear → ask for clarification
-   - Implementation reveals a design issue → suggest updating artifacts
-   - Error or blocker encountered → report and wait for guidance
-   - User interrupts
-
-7. **On completion or pause, show status**
-
-   Display:
-   - Tasks completed this session
-   - Overall progress: "N/M tasks complete"
-   - If all done: suggest archive
-   - If paused: explain why and wait for guidance
-
-**Output During Implementation**
-
-```
-## Implementing: <change-name> (schema: <schema-name>)
-
-Working on task 3/7: <task description>
-[...implementation happening...]
-✓ Task complete
-
-Working on task 4/7: <task description>
-[...implementation happening...]
-✓ Task complete
-```
-
-**Output On Completion**
-
-```
-## Implementation Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Progress:** 7/7 tasks complete ✓
-
-### Completed This Session
-- [x] Task 1
-- [x] Task 2
-...
-
-All tasks complete! You can archive this change with `/opsx:archive`.
-```
-
-**Output On Pause (Issue Encountered)**
-
-```
-## Implementation Paused
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Progress:** 4/7 tasks complete
-
-### Issue Encountered
-<description of the issue>
-
-**Options:**
-1. <option 1>
-2. <option 2>
-3. Other approach
-
-What would you like to do?
-```
-
-**Guardrails**
-- Keep going through tasks until done or blocked
-- Always read context files before starting (from the apply instructions output)
-- If task is ambiguous, pause and ask before implementing
-- If implementation reveals issues, pause and suggest artifact updates
-- Keep code changes minimal and scoped to each task
-- Update task checkbox immediately after completing each task
-- Pause on errors, blockers, or unclear requirements - don't guess
-- Use contextFiles from CLI output, don't assume specific file names
-
-**Fluid Workflow Integration**
-
-This skill supports the "actions on a change" model:
-
-- **Can be invoked anytime**: Before all artifacts are done (if tasks exist), after partial implementation, interleaved with other actions
-- **Allows artifact updates**: If implementation reveals design issues, suggest updating artifacts - not phase-locked, work fluidly

.agents/prompts/opsx/archive.md

@@ -1,157 +0,0 @@
----
-name: "OPSX: Archive"
-description: Archive a completed change in the experimental workflow
-category: Workflow
-tags: [workflow, archive, experimental]
----
-
-Archive a completed change in the experimental workflow.
-
-**Input**: Optionally specify a change name after `/opsx:archive` (e.g., `/opsx:archive add-auth`). If omitted, check if it can be inferred from conversation context. If vague or ambiguous you MUST prompt for available changes.
-
-**Steps**
-
-1. **If no change name provided, prompt for selection**
-
-   Run `openspec list --json` to get available changes. Use the **AskUserQuestion tool** to let the user select.
-
-   Show only active changes (not already archived).
-   Include the schema used for each change if available.
-
-   **IMPORTANT**: Do NOT guess or auto-select a change. Always let the user choose.
-
-2. **Check artifact completion status**
-
-   Run `openspec status --change "<name>" --json` to check artifact completion.
-
-   Parse the JSON to understand:
-   - `schemaName`: The workflow being used
-   - `artifacts`: List of artifacts with their status (`done` or other)
-
-   **If any artifacts are not `done`:**
-   - Display warning listing incomplete artifacts
-   - Prompt user for confirmation to continue
-   - Proceed if user confirms
-
-3. **Check task completion status**
-
-   Read the tasks file (typically `tasks.md`) to check for incomplete tasks.
-
-   Count tasks marked with `- [ ]` (incomplete) vs `- [x]` (complete).
-
-   **If incomplete tasks found:**
-   - Display warning showing count of incomplete tasks
-   - Prompt user for confirmation to continue
-   - Proceed if user confirms
-
-   **If no tasks file exists:** Proceed without task-related warning.
-
-4. **Assess delta spec sync state**
-
-   Check for delta specs at `openspec/changes/<name>/specs/`. If none exist, proceed without sync prompt.
-
-   **If delta specs exist:**
-   - Compare each delta spec with its corresponding main spec at `openspec/specs/<capability>/spec.md`
-   - Determine what changes would be applied (adds, modifications, removals, renames)
-   - Show a combined summary before prompting
-
-   **Prompt options:**
-   - If changes needed: "Sync now (recommended)", "Archive without syncing"
-   - If already synced: "Archive now", "Sync anyway", "Cancel"
-
-   If user chooses sync, use Task tool (subagent_type: "general-purpose", prompt: "Use Skill tool to invoke openspec-sync-specs for change '<name>'. Delta spec analysis: <include the analyzed delta spec summary>"). Proceed to archive regardless of choice.
-
-5. **Perform the archive**
-
-   Create the archive directory if it doesn't exist:
-   ```bash
-   mkdir -p openspec/changes/archive
-   ```
-
-   Generate target name using current date: `YYYY-MM-DD-<change-name>`
-
-   **Check if target already exists:**
-   - If yes: Fail with error, suggest renaming existing archive or using different date
-   - If no: Move the change directory to archive
-
-   ```bash
-   mv openspec/changes/<name> openspec/changes/archive/YYYY-MM-DD-<name>
-   ```
-
-6. **Display summary**
-
-   Show archive completion summary including:
-   - Change name
-   - Schema that was used
-   - Archive location
-   - Spec sync status (synced / sync skipped / no delta specs)
-   - Note about any warnings (incomplete artifacts/tasks)
-
-**Output On Success**
-
-```
-## Archive Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** openspec/changes/archive/YYYY-MM-DD-<name>/
-**Specs:** ✓ Synced to main specs
-
-All artifacts complete. All tasks complete.
-```
-
-**Output On Success (No Delta Specs)**
-
-```
-## Archive Complete
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** openspec/changes/archive/YYYY-MM-DD-<name>/
-**Specs:** No delta specs
-
-All artifacts complete. All tasks complete.
-```
-
-**Output On Success With Warnings**
-
-```
-## Archive Complete (with warnings)
-
-**Change:** <change-name>
-**Schema:** <schema-name>
-**Archived to:** openspec/changes/archive/YYYY-MM-DD-<name>/
-**Specs:** Sync skipped (user chose to skip)
-
-**Warnings:**
-- Archived with 2 incomplete artifacts
-- Archived with 3 incomplete tasks
-- Delta spec sync was skipped (user chose to skip)
-
-Review the archive if this was not intentional.
-```
-
-**Output On Error (Archive Exists)**
-
-```
-## Archive Failed
-
-**Change:** <change-name>
-**Target:** openspec/changes/archive/YYYY-MM-DD-<name>/
-
-Target archive directory already exists.
-
-**Options:**
-1. Rename the existing archive
-2. Delete the existing archive if it's a duplicate
-3. Wait until a different date to archive
-```
-
-**Guardrails**
-- Always prompt for change selection if not provided
-- Use artifact graph (openspec status --json) for completion checking
-- Don't block archive on warnings - just inform and confirm
-- Preserve .openspec.yaml when moving to archive (it moves with the directory)
-- Show clear summary of what happened
-- If sync is requested, use the Skill tool to invoke `openspec-sync-specs` (agent-driven)
-- If delta specs exist, always run the sync assessment and show the combined summary before prompting

.agents/prompts/opsx/explore.md

@@ -1,173 +0,0 @@
----
-name: "OPSX: Explore"
-description: "Enter explore mode - think through ideas, investigate problems, clarify requirements"
-category: Workflow
-tags: [workflow, explore, experimental, thinking]
----
-
-Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes.
-
-**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first and create a change proposal. You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing.
-
-**This is a stance, not a workflow.** There are no fixed steps, no required sequence, no mandatory outputs. You're a thinking partner helping the user explore.
-
-**Input**: The argument after `/opsx:explore` is whatever the user wants to think about. Could be:
-- A vague idea: "real-time collaboration"
-- A specific problem: "the auth system is getting unwieldy"
-- A change name: "add-dark-mode" (to explore in context of that change)
-- A comparison: "postgres vs sqlite for this"
-- Nothing (just enter explore mode)
-
----
-
-## The Stance
-
-- **Curious, not prescriptive** - Ask questions that emerge naturally, don't follow a script
-- **Open threads, not interrogations** - Surface multiple interesting directions and let the user follow what resonates. Don't funnel them through a single path of questions.
-- **Visual** - Use ASCII diagrams liberally when they'd help clarify thinking
-- **Adaptive** - Follow interesting threads, pivot when new information emerges
-- **Patient** - Don't rush to conclusions, let the shape of the problem emerge
-- **Grounded** - Explore the actual codebase when relevant, don't just theorize
-
----
-
-## What You Might Do
-
-Depending on what the user brings, you might:
-
-**Explore the problem space**
-- Ask clarifying questions that emerge from what they said
-- Challenge assumptions
-- Reframe the problem
-- Find analogies
-
-**Investigate the codebase**
-- Map existing architecture relevant to the discussion
-- Find integration points
-- Identify patterns already in use
-- Surface hidden complexity
-
-**Compare options**
-- Brainstorm multiple approaches
-- Build comparison tables
-- Sketch tradeoffs
-- Recommend a path (if asked)
-
-**Visualize**
-```
-┌─────────────────────────────────────────┐
-│     Use ASCII diagrams liberally        │
-├─────────────────────────────────────────┤
-│                                         │
-│   ┌────────┐         ┌────────┐        │
-│   │ State  │────────▶│ State  │        │
-│   │   A    │         │   B    │        │
-│   └────────┘         └────────┘        │
-│                                         │
-│   System diagrams, state machines,      │
-│   data flows, architecture sketches,    │
-│   dependency graphs, comparison tables  │
-│                                         │
-└─────────────────────────────────────────┘
-```
-
-**Surface risks and unknowns**
-- Identify what could go wrong
-- Find gaps in understanding
-- Suggest spikes or investigations
-
----
-
-## OpenSpec Awareness
-
-You have full context of the OpenSpec system. Use it naturally, don't force it.
-
-### Check for context
-
-At the start, quickly check what exists:
-```bash
-openspec list --json
-```
-
-This tells you:
-- If there are active changes
-- Their names, schemas, and status
-- What the user might be working on
-
-If the user mentioned a specific change name, read its artifacts for context.
-
-### When no change exists
-
-Think freely. When insights crystallize, you might offer:
-
-- "This feels solid enough to start a change. Want me to create a proposal?"
-- Or keep exploring - no pressure to formalize
-
-### When a change exists
-
-If the user mentions a change or you detect one is relevant:
-
-1. **Read existing artifacts for context**
-   - `openspec/changes/<name>/proposal.md`
-   - `openspec/changes/<name>/design.md`
-   - `openspec/changes/<name>/tasks.md`
-   - etc.
-
-2. **Reference them naturally in conversation**
-   - "Your design mentions using Redis, but we just realized SQLite fits better..."
-   - "The proposal scopes this to premium users, but we're now thinking everyone..."
-
-3. **Offer to capture when decisions are made**
-
-   | Insight Type | Where to Capture |
-   |--------------|------------------|
-   | New requirement discovered | `specs/<capability>/spec.md` |
-   | Requirement changed | `specs/<capability>/spec.md` |
-   | Design decision made | `design.md` |
-   | Scope changed | `proposal.md` |
-   | New work identified | `tasks.md` |
-   | Assumption invalidated | Relevant artifact |
-
-   Example offers:
-   - "That's a design decision. Capture it in design.md?"
-   - "This is a new requirement. Add it to specs?"
-   - "This changes scope. Update the proposal?"
-
-4. **The user decides** - Offer and move on. Don't pressure. Don't auto-capture.
-
----
-
-## What You Don't Have To Do
-
-- Follow a script
-- Ask the same questions every time
-- Produce a specific artifact
-- Reach a conclusion
-- Stay on topic if a tangent is valuable
-- Be brief (this is thinking time)
-
----
-
-## Ending Discovery
-
-There's no required ending. Discovery might:
-
-- **Flow into a proposal**: "Ready to start? I can create a change proposal."
-- **Result in artifact updates**: "Updated design.md with these decisions"
-- **Just provide clarity**: User has what they need, moves on
-- **Continue later**: "We can pick this up anytime"
-
-When things crystallize, you might offer a summary - but it's optional. Sometimes the thinking IS the value.
-
----
-
-## Guardrails
-
-- **Don't implement** - Never write code or implement features. Creating OpenSpec artifacts is fine, writing application code is not.
-- **Don't fake understanding** - If something is unclear, dig deeper
-- **Don't rush** - Discovery is thinking time, not task time
-- **Don't force structure** - Let patterns emerge naturally
-- **Don't auto-capture** - Offer to save insights, don't just do it
-- **Do visualize** - A good diagram is worth many paragraphs
-- **Do explore the codebase** - Ground discussions in reality
-- **Do question assumptions** - Including the user's and your own

.agents/prompts/opsx/propose.md

@@ -1,106 +0,0 @@
----
-name: "OPSX: Propose"
-description: Propose a new change - create it and generate all artifacts in one step
-category: Workflow
-tags: [workflow, artifacts, experimental]
----
-
-Propose a new change - create the change and generate all artifacts in one step.
-
-I'll create a change with artifacts:
-- proposal.md (what & why)
-- design.md (how)
-- tasks.md (implementation steps)
-
-When ready to implement, run /opsx:apply
-
----
-
-**Input**: The argument after `/opsx:propose` is the change name (kebab-case), OR a description of what the user wants to build.
-
-**Steps**
-
-1. **If no input provided, ask what they want to build**
-
-   Use the **AskUserQuestion tool** (open-ended, no preset options) to ask:
-   > "What change do you want to work on? Describe what you want to build or fix."
-
-   From their description, derive a kebab-case name (e.g., "add user authentication" → `add-user-auth`).
-
-   **IMPORTANT**: Do NOT proceed without understanding what the user wants to build.
-
-2. **Create the change directory**
-   ```bash
-   openspec new change "<name>"
-   ```
-   This creates a scaffolded change at `openspec/changes/<name>/` with `.openspec.yaml`.
-
-3. **Get the artifact build order**
-   ```bash
-   openspec status --change "<name>" --json
-   ```
-   Parse the JSON to get:
-   - `applyRequires`: array of artifact IDs needed before implementation (e.g., `["tasks"]`)
-   - `artifacts`: list of all artifacts with their status and dependencies
-
-4. **Create artifacts in sequence until apply-ready**
-
-   Use the **TodoWrite tool** to track progress through the artifacts.
-
-   Loop through artifacts in dependency order (artifacts with no pending dependencies first):
-
-   a. **For each artifact that is `ready` (dependencies satisfied)**:
-      - Get instructions:
-        ```bash
-        openspec instructions <artifact-id> --change "<name>" --json
-        ```
-      - The instructions JSON includes:
-        - `context`: Project background (constraints for you - do NOT include in output)
-        - `rules`: Artifact-specific rules (constraints for you - do NOT include in output)
-        - `template`: The structure to use for your output file
-        - `instruction`: Schema-specific guidance for this artifact type
-        - `outputPath`: Where to write the artifact
-        - `dependencies`: Completed artifacts to read for context
-      - Read any completed dependency files for context
-      - Create the artifact file using `template` as the structure
-      - Apply `context` and `rules` as constraints - but do NOT copy them into the file
-      - Show brief progress: "Created <artifact-id>"
-
-   b. **Continue until all `applyRequires` artifacts are complete**
-      - After creating each artifact, re-run `openspec status --change "<name>" --json`
-      - Check if every artifact ID in `applyRequires` has `status: "done"` in the artifacts array
-      - Stop when all `applyRequires` artifacts are done
-
-   c. **If an artifact requires user input** (unclear context):
-      - Use **AskUserQuestion tool** to clarify
-      - Then continue with creation
-
-5. **Show final status**
-   ```bash
-   openspec status --change "<name>"
-   ```
-
-**Output**
-
-After completing all artifacts, summarize:
-- Change name and location
-- List of artifacts created with brief descriptions
-- What's ready: "All artifacts created! Ready for implementation."
-- Prompt: "Run `/opsx:apply` to start implementing."
-
-**Artifact Creation Guidelines**
-
-- Follow the `instruction` field from `openspec instructions` for each artifact type
-- The schema defines what each artifact should contain - follow it
-- Read dependency artifacts for context before creating new ones
-- Use `template` as the structure for your output file - fill in its sections
-- **IMPORTANT**: `context` and `rules` are constraints for YOU, not content for the file
-  - Do NOT copy `<context>`, `<rules>`, `<project_context>` blocks into the artifact
-  - These guide what you write, but should never appear in the output
-
-**Guardrails**
-- Create ALL artifacts needed for implementation (as defined by schema's `apply.requires`)
-- Always read dependency artifacts before creating a new one
-- If context is critically unclear, ask the user - but prefer making reasonable decisions to keep momentum
-- If a change with that name already exists, ask if user wants to continue it or create a new one
-- Verify each artifact file exists after writing before proceeding to next

.agents/skills/gf-feedback/SKILL.md

@@ -1,280 +0,0 @@
----
-name: gf-feedback
-description: >-
-  Track, fix, verify, and test any bugs, improvements, or gaps reported against an OpenSpec change.
-  MUST use this skill whenever user reports problems, defects, issues, bugs, or gaps related to
-  existing implementations, even if they don't explicitly say "feedback" or mention OpenSpec.
-compatibility: Requires openspec CLI, Go toolchain, and gf-review skill.
----
-
-# Feedback: Structured Fix, Verification & Test Coverage Loop
-
-When users discover bugs or improvement points after implementation, this skill captures those issues, organizes them into a traceable task list in `tasks.md`, systematically fixes and verifies each one, and ensures every behavior-changing fix is covered by focused unit tests.
-
-**Core principles:**
-1. **Spec is the source of truth** — Spec-level changes require spec update before task recording
-2. **Write it down first, then fix it** — Every issue gets recorded before any code change
-3. **Every fix deserves a test** — Behavior-changing code changes require unit test coverage in the affected package
-
----
-
-## Workflow
-
-### 1. Identify Target Change
-
-**CRITICAL:** 
-1. Always append to existing active changes. Only create new change when none exist.
-2. An **active change** is any change directory that still exists directly under `openspec/changes/` and has **not** been moved into `openspec/changes/archive/`. Do **not** treat `status: complete`, all tasks checked off, or similar completion signals as "inactive" until archive actually happens.
-3. Regardless of whether the feedback content is related to the main functionality of the current active iteration, it MUST be appended to the current active iteration. This ensures all changes are tracked in a single change record for unified management and archiving.
-
-```bash
-openspec list --json
-# Or: ls openspec/changes/ | grep -v archive
-```
-
-When the two signals disagree, prefer the filesystem rule:
-
-- If a change directory still exists under `openspec/changes/` and is not inside `archive/`, it is active.
-- `openspec list --json` may still report such a change as `status: complete`; that only means implementation tasks are done, **not** that the change is inactive.
-- Only archived changes under `openspec/changes/archive/` are inactive.
-
-| Active Changes | Action |
-|----------------|--------|
-| None | Create new change (see below) |
-| One | Auto-select it, announce and proceed |
-| Multiple | Ask user to select from list |
-
-**When multiple active changes exist:**
-```
-Multiple active changes detected. Which change should this feedback be appended to?
-
-1. config-management — System config CRUD management
-2. user-auth — User authentication enhancement
-
-Please select 1 or 2:
-```
-
-**When no active change exists:**
-1. Derive kebab-case name from feedback (e.g., "fix-menu-circular-ref")
-2. If name exists, append suffix ("-2")
-3. Create: `openspec new change "<name>"`
-4. Generate minimal `proposal.md` (one paragraph summarizing context)
-5. Skip `design.md` for pure bug fixes unless architectural changes needed
-
-Announce: "Applying feedback fixes to change: **<name>**"
-
----
-
-### 2. Read Current Context
-
-| File | Purpose |
-|------|---------|
-| `tasks.md` | Task structure, naming conventions, numbering |
-| `design.md` | Architectural context |
-| `proposal.md` | Feature scope and intent |
-| `specs/` | Delta spec definitions |
-
-```bash
-# Locate existing unit tests in the impacted package before adding a new one
-rg --files <pkg-dir> | rg '_test\\.go$'
-```
-
----
-
-### 3. Analyze and Organize Issues
-
-For each reported issue:
-
-**Classify by type:**
-- **bug** — Incorrect behavior, code doesn't match spec
-- **missing** — Feature incomplete, gaps in implementation
-- **ux** — UX improvement, no spec change needed
-- **test-gap** — Missing test coverage only
-
-**Classify by spec impact:**
-
-| Level | Definition | Action |
-|-------|------------|--------|
-| **implementation** | Spec is correct, code is wrong | Fix code only |
-| **spec-level** | Requirement missing/incomplete/changed | Update spec first, then fix |
-| **internal** | No user-observable change | Fix code, test optional |
-
-**Group related issues** — Same root cause → single task with multiple verification points.
-
----
-
-### 4. Update Delta Specs (for Spec-Level Issues Only)
-
-For spec-level issues, update specs **before** recording tasks:
-
-1. Identify affected capability: `specs/<capability>/spec.md`
-2. Apply delta operation:
-
-```markdown
-<!-- ADDED: New requirement -->
-### Requirement: Parent Selector Circular Prevention
-The system SHALL disable the current menu and all its descendants in the parent selector
-to prevent circular references.
-
-#### Scenario: Edit menu with children
-WHEN user edits a menu that has child menus
-THEN the parent selector SHALL disable the current menu and all descendant menus
-
-<!-- MODIFIED: Changed requirement (include full original block) -->
-### Requirement: Import Error Handling
-The system SHALL display error messages when import fails.
-**MODIFIED:** Error messages SHALL include row number, field name, and validation failure reason.
-
-<!-- REMOVED: Deprecated requirement -->
-### Requirement: Legacy Import Format
-The system SHALL support legacy CSV format.
-**REMOVED:** This format is no longer supported.
-**Migration:** Use the new CSV format with header row.
-```
-
----
-
-### 5. Write Task List to tasks.md
-
-Append a **Feedback section** to `tasks.md`:
-
-```markdown
-## Feedback
-
-- [ ] **FB-1**: Parent selector allows circular references in menu edit
-- [ ] **FB-2**: Import error messages lack row and field details
-- [ ] **FB-3**: No test coverage for reset password feature
-```
-
-**Numbering:** Sequential `FB-1`, `FB-2`, etc. Continue from last number if section exists.
-
-**One line per task** — No sub-fields. Analysis happens during fix phase.
-
-**Confirm with user** before writing to file.
-
-**Test coverage planning (internal):**
-- Behavior-changing code change → Unit test required
-- Internal-only optimization → Unit test optional unless logic risk increased
-- Prefer extending the nearest `*_z_unit*_test.go` or `*_test.go` in the same package
-
----
-
-### 6. Execute Fixes (Loop)
-
-For each task:
-
-**a. Announce:** `## Fixing FB-X: <issue title>`
-
-**b. Investigate** — Read source files, confirm root cause
-
-**c. Implement** — Minimal, focused fix following existing patterns
-
-**d. Write/update unit tests** — Prefer the affected package's existing `*_z_unit*_test.go` or `*_test.go` files and keep assertions focused on the changed logic
-
-**e. Assess Impact Scope (MANDATORY)**
-
-After implementing, identify regression risk:
-
-| Change Type | Map To Tests |
-|-------------|--------------|
-| Package-level logic | Targeted test for changed function/method + package regression tests |
-| Shared utility | Utility package unit tests + highest-value dependent package tests already covering reuse |
-| DB/DAO logic | DAO/model package unit tests with focused fixtures, mocks, or test helpers |
-| Public API validation | Handler/service package unit tests that assert the changed validation path |
-| Refactor without behavior change | Existing package tests that prove behavior parity |
-
-```bash
-# Example: Find unit tests related to a changed symbol or package
-rg -l "GenDao|gdao" . -g '*_test.go'
-```
-
-Announce:
-```
-### Impact Analysis for FB-X
-- Modified: cmd/gf/internal/cmd/gendao/gendao.go
-- Affected package: cmd/gf/internal/cmd/gendao
-- Unit tests: cmd/gf/internal/cmd/gendao/gendao_test.go
-- Regression command: go test ./cmd/gf/internal/cmd/gendao -run 'TestGenDao'
-```
-
-**f. Verify (MANDATORY before marking complete)**
-
-1. Run new/updated unit tests for this task → **must pass**
-2. Run ALL identified package-level regression tests → **must pass**
-3. Only then: mark task `[x]` in tasks.md
-
-If regression fails:
-- Fix inline if related to current change
-- Add as new FB task if separate issue
-
-**g. Run review** — Invoke `gf-review` skill after completion
-
----
-
-### 7. Comprehensive Verification
-
-After all fixes:
-
-1. Aggregate regression tests from all tasks
-2. Run full set in single pass
-3. Report:
-```
-### Comprehensive Verification Results
-- Total tests: N
-- Passed: N
-- Failed: N (list with details)
-- Regression tests: all passed ✓ / X failures
-```
-
-If failures → add new FB tasks, loop to Step 6.
-
----
-
-### 8. Report Completion
-
-```markdown
-## Feedback Complete
-
-**Change:** <name>
-**Issues reported:** X
-**Issues fixed:** Y/X
-**Tests added:** Z unit tests / focused assertions
-**Regression tests run:** R tests across N packages
-**Verification:** all passed / N issues remaining
-
-### Fixed This Session
-- [x] FB-1: <title> ✓ (unit test: TestGenDao_FiltersInvalidTables | package: ./cmd/gf/internal/cmd/gendao ✓)
-- [x] FB-2: <title> ✓ (unit test: existing package coverage extended | package: ./cmd/gf/internal/cmd ✓)
-
-### Remaining (if any)
-- [ ] FB-3: <title> — blocked by <reason>
-```
-
----
-
-## Edge Cases
-
-| Situation | Handling |
-|-----------|----------|
-| Single issue | Still follow full workflow |
-| Missing test cases only | Classify as test-gap, implement tests |
-| Fix reveals more issues | Add as new FB tasks |
-| "Bug" is actually feature request | Re-classify as spec-level, update specs first |
-| Unit test not feasible (docs/spec only) | Note reason explicitly and skip only when no runtime code changes exist |
-| Multiple feedback rounds | All tasks in single Feedback section, sequential numbering |
-
----
-
-## Guardrails
-
-- **Append to active change if exists** — Never create new change when active ones exist
-- **Specs before tasks for spec-level issues** — Update delta specs first
-- **Write tasks before fixing** — Never code without recording
-- **Confirm task list with user** — User validates analysis
-- **Minimal fixes** — No refactoring beyond issue scope
-- **Behavior-changing fix needs unit test** — No exceptions unless the change is docs/spec only
-- **No green check without green unit tests** — Mark `[x]` only after tests pass
-- **Impact analysis mandatory** — Every fix requires package-level regression test identification
-- **Regression failures block completion** — Must resolve before marking done
-- **Update tasks.md in real time** — Mark complete immediately after verification
-- **Match file language** — Use same language as existing content in target file

.agents/skills/gf-review/SKILL.md

@@ -1,168 +0,0 @@
----
-name: gf-review
-description: >-
-  Code and specification review for OpenSpec workflow. Triggers automatically after /opsx:apply
-  task completion, after /gf-feedback task completion, and before /opsx:archive. Use when
-  user requests code review, spec compliance check, or when explicitly invoked via /gf-review.
-compatibility: Requires OpenSpec CLI and GoFrame v2 skill.
----
-
-# GF Review
-
-Structured code and specification review for the OpenSpec development workflow.
-
-**Spec Source**: `CLAUDE.md` is the single source of truth for all review criteria.
-
----
-
-## When This Skill Activates
-
-**Automatic triggers:**
-- After completing each task in `/opsx:apply`
-- After completing each task in `/gf-feedback`
-- Before executing `/opsx:archive`
-
-**Manual trigger:**
-- User explicitly requests: "review this code", "check spec compliance", "/gf-review"
-
----
-
-## Review Workflow
-
-### 1. Identify Scope
-
-Determine what needs to be reviewed:
-
-1. **After task completion** — Review files modified/created by the completed task
-2. **Before archive** — Review all changes in the current OpenSpec change
-3. **Manual invocation** — Ask user to specify scope or use current change
-
-**Mandatory scope collection rules:**
-
-1. Start with repository status, not `git diff` alone:
-   ```bash
-   git status --short
-   git ls-files --others --exclude-standard
-   ```
-2. Treat **all tracked and untracked changes** as review candidates, including:
-   - staged files
-   - unstaged files
-   - untracked files shown as `??`
-   - untracked directories shown as `?? path/`
-3. When `git status --short` reports an untracked directory, expand it to concrete files before review:
-   ```bash
-   find <path> -type f
-   # Or prefer:
-   rg --files <path>
-   ```
-4. If the task ran generators such as `make ctrl`, `make dao`, codegen scripts, or produced new test files, explicitly include the generated untracked files in review scope even if they do not appear in `git diff`.
-5. `git diff` may be used only as a secondary narrowing aid after status collection. It is **never sufficient by itself** for review scope definition.
-
-Run `openspec status --change "<name>" --json` to understand the current change state.
-
-### 2. Load Specifications
-
-Read `CLAUDE.md` to load all specifications. This is the single source of truth.
-
-### 3. Backend Code Review
-
-**Trigger**: Changes to files under `apps/lina-core` directory
-
-1. Invoke `goframe-v2` skill for GoFrame framework conventions
-2. Check against `CLAUDE.md` backend code specifications
-
-### 4. RESTful API Review
-
-**Trigger**: Any API endpoint changes
-
-Check against `CLAUDE.md` API design specifications.
-
-### 5. Project Specification Review
-
-**Trigger**: Any implementation changes
-
-Check against `CLAUDE.md` architecture design specifications and code development specifications.
-
-### 6. SQL Review
-
-**Trigger**: New or modified files under `apps/lina-core/manifest/sql/`、`apps/lina-core/manifest/sql/mock-data/`、`apps/lina-plugins/**/manifest/sql/` or SQL snippets embedded in related delivery docs
-
-Check against `CLAUDE.md` SQL file management specifications, at minimum covering:
-1. File naming, versioning, and single-iteration single-file rules
-2. Seed DML vs mock data separation
-3. **Idempotent execution safety** — SQL must be safe to run multiple times without duplicate-object errors or duplicate seed data; verify use of `IF [NOT] EXISTS`, `IF EXISTS`, `INSERT IGNORE`, or equivalent safe re-entry patterns
-4. **Seed write style compliance** — delivered SQL must reject `INSERT ... ON DUPLICATE KEY UPDATE` and reject explicit writes to `AUTO_INCREMENT` `id` columns in seed/mock/install data
-5. Whether schema/data changes still match the current change scope and deployment path
-
-### 7. Unit Test Review
-
-**Trigger**: New or modified Go implementation files, or new/modified Go unit test files matching `*_test.go`
-
-Check at minimum:
-1. Behavior-changing Go code includes focused unit coverage in the same package, preferably by extending existing `*_z_unit*_test.go` or `*_test.go`
-2. Tests assert the changed logic directly instead of relying on broad workflow-level coverage when a package-level test is sufficient
-3. Verification uses targeted `go test ./path/to/pkg -run TestName` during development and package-level `go test ./path/to/pkg` for regression
-
-### 8. Generate Review Report
-
-```markdown
-## GF Review Report
-
-**Change:** <change-name>
-**Scope:** <task-specific / full change>
-**Files Reviewed:** <count>
-**Scope Source:** `git status --short` + `git ls-files --others --exclude-standard` + task/change context
-
-### Backend Code Review
-✓ All checks passed / ⚠ N issues found
-
-### RESTful API Review
-✓ All endpoints compliant / ⚠ N violations found
-
-### Project Spec Review
-✓ Compliant with CLAUDE.md / ⚠ N violations found
-
-### SQL Review
-✓ No SQL changes / ✓ SQL changes compliant / ⚠ N SQL issues found
-
-### Unit Test Review
-✓ Unit tests are focused and sufficient / ⚠ N issues found
-
-### Summary
-- **Critical:** N (must fix before archive)
-- **Warnings:** N (recommended to fix)
-
-### Recommended Actions
-1. [Specific action with CLAUDE.md reference]
-```
-
----
-
-## Issue Severity
-
-| Level | Behavior |
-|-------|----------|
-| **Critical** | Block archive, must fix |
-| **Warning** | Show but allow proceed |
-
----
-
-## Integration Points
-
-| Workflow Step | Behavior |
-|---------------|----------|
-| `/opsx:apply` task done | Review, offer to fix issues before next task |
-| `/gf-feedback` task done | Review, fix before marking complete |
-| `/opsx:archive` | Review all changes, block on critical issues |
-
----
-
-## Guardrails
-
-- **CLAUDE.md is the single source of truth** — All spec references point to it
-- Only check categories relevant to changed files
-- Scope identification MUST include untracked files and expanded untracked directories; never rely on `git diff` alone
-- Behavior-changing Go code without focused unit tests is a review finding unless the author documents why tests are not applicable
-- Don't block on warnings — only critical issues block archive
-- Include file paths and line numbers in issue reports
-- Offer to fix issues automatically when straightforward

.agents/skills/git-commit-push/SKILL.md

@@ -1,148 +0,0 @@
----
-name: git-commit-push
-description: Review the current git working tree, generate a commit message from the actual diff using the repository's commit or PR-title convention, commit all current changes on the active branch, and push that branch to `origin`. Use this whenever the user asks to "commit", "push", "commit and push", "generate a commit message", "commit the current changes", or wants the current branch changes sent upstream without hand-writing the git commands.
----
-
-# Git Commit Push
-
-Inspect the current repository changes, derive a concise commit subject that matches the repository convention, commit every current modification on the active branch, and push that branch to `origin`.
-
-This skill is for execution, not just advice. When it triggers, actually run the git workflow unless the repository state makes that unsafe or impossible.
-
-## When To Use
-
-- The user asks you to commit the current changes, with or without asking for push
-- The user wants you to write the commit message from the diff instead of inventing one up front
-- The user mentions the repo's PR or commit naming convention and wants you to follow it
-- The user says things like "commit the current branch", "help me commit", "commit and push", "generate a commit message and push", or "send these changes to origin"
-
-## Core Behavior
-
-1. Confirm you are inside a Git repository and detect the active branch with `git branch --show-current`.
-2. Inspect the working tree before committing:
-   - `git status --short --branch`
-   - `git diff --stat`
-   - `git diff --cached --stat`
-   - `git diff -- . ':(exclude)package-lock.json'` or narrower path filters only when needed for readability
-3. If the repository contains `.github/PULL_REQUEST_TEMPLATE.MD`, read it and treat its PR-title rules as the default commit-subject convention.
-4. Generate a commit subject from the actual changed files and diff content, not from the user prompt alone.
-5. Stage every current modification on the branch with `git add -A`.
-6. Commit once with the generated message.
-7. Push the current branch to `origin` with `git push origin <current-branch>`.
-
-## Commit Message Rules
-
-The commit message is formatted as follows: `<type>[optional scope]: <description>` For example, `fix(os/gtime): fix time zone issue`
-  + `<type>` is mandatory and can be one of `fix`, `feat`, `build`, `ci`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`
-    + `fix`: Used when a bug has been fixed.
-    + `feat`: Used when a new feature has been added.
-    + `build`: Used for modifications to the project build system, such as changes to dependencies, external interfaces, or upgrading Node version.
-    + `ci`: Used for modifications to continuous integration processes, such as changes to Travis, Jenkins workflow configurations.
-    + `docs`: Used for modifications to documentation, such as changes to README files, API documentation, etc.
-    + `style`: Used for changes to code style, such as adjustments to indentation, spaces, blank lines, etc.
-    + `refactor`: Used for code refactoring, such as changes to code structure, variable names, function names, without altering functionality.
-    + `perf`: Used for performance optimization, such as improving code performance, reducing memory usage, etc.
-    + `test`: Used for modifications to test cases, such as adding, deleting, or modifying test cases for code.
-    + `chore`: Used for modifications to non-business-related code, such as changes to build processes or tool configurations.
-  + After `<type>`, specify the affected package name or scope in parentheses, for example, `(os/gtime)`.
-  + The part after the colon uses the verb tense + phrase that completes the blank in
-  + Lowercase verb after the colon
-  + No trailing period
-  + Keep the title as short as possible. ideally under 76 characters or shorter
-+ If there is a corresponding issue, add either `fixes #1234` (the latter if this is not a complete fix) to this comment
-
-### Examples
-#### Commit message with description and breaking change footer
-```
-feat: allow provided config object to extend other configs
-BREAKING CHANGE: `extends` key in config file is now used for extending other config files
-```
-
-#### Commit message with ! to draw attention to breaking change
-```
-feat!: send an email to the customer when a product is shipped
-```
-
-#### Commit message with scope and ! to draw attention to breaking change
-```
-feat(api)!: send an email to the customer when a product is shipped
-```
-
-#### Commit message with both ! and BREAKING CHANGE footer
-```
-feat!: drop support for Node 6
-BREAKING CHANGE: use JavaScript features not available in Node 6.
-```
-
-#### Commit message with no body
-```
-docs: correct spelling of CHANGELOG
-```
-
-#### Commit message with scope
-```
-feat(lang): add Polish language
-```
-
-#### Commit message with multi-paragraph body and multiple footers
-```
-fix: prevent racing of requests
-
-Introduce a request id and a reference to latest request. Dismiss
-incoming responses other than from latest request.
-
-Remove timeouts which were used to mitigate the racing issue but are
-obsolete now.
-
-Reviewed-by: Z
-Refs: #123
-```
-
-## Execution Rules
-
-- Commit all current tracked and untracked changes in the working tree, because this skill is for "commit the current state" requests
-- If there are no changes, say so clearly and stop before commit or push
-- If `git branch --show-current` is empty, explain that `HEAD` is detached and stop unless the user explicitly asks you to commit from detached `HEAD`
-- Never use `--force`, `--force-with-lease`, or history-rewriting commands unless the user explicitly asks
-- If push fails because the remote branch moved, report the exact failure and stop instead of auto-rebasing or auto-merging
-- Do not silently drop files from the commit unless the user asked to exclude them
-
-## Suggested Command Flow
-
-```bash
-git status --short --branch
-git diff --stat
-git diff --cached --stat
-test -f .github/PULL_REQUEST_TEMPLATE.MD && sed -n '1,220p' .github/PULL_REQUEST_TEMPLATE.MD
-branch_name=$(git branch --show-current)
-git add -A
-git commit -m "<generated-subject>"
-git push origin "$branch_name"
-```
-
-Inspect `git diff --cached` again after staging if the pre-stage diff was noisy or if untracked files materially change the scope.
-
-## Output Contract
-
-When you use this skill:
-
-- Tell the user which branch you committed
-- Provide the final commit subject you used
-- Mention that you staged all current changes
-- Report the push target as `origin/<branch>`
-- If commit or push did not happen, explain exactly why
-
-## Example
-
-User request:
-
-```text
-Generate a commit message that follows this repository's convention, then commit and push the current branch
-```
-
-Expected behavior:
-
-- Inspect the repo status and diff
-- Generate a conventional subject from the real changes
-- Run one commit for the whole current working tree
-- Push the active branch to `origin`

.agents/skills/git-worktree/SKILL.md

@@ -1,142 +0,0 @@
----
-name: git-worktree
-description: Create and actively use an isolated git worktree for the user's task, then continue the task inside that new directory. Use this whenever the user asks for a separate worktree, isolated checkout, clean branch directory, safer parallel changes, or a fresh workspace to avoid unrelated local edits.
----
-
-# Git Worktree
-
-Create a dedicated `git worktree` for the current task, then keep working inside that new directory instead of the original checkout.
-
-This skill is about execution, not just advice. When it triggers, actually create the worktree unless the repository state makes that impossible.
-
-Do not introduce helper scripts for this skill. Use direct `git` and shell commands inline.
-
-## When To Use
-
-- The user explicitly asks for a new `git worktree`, independent branch directory, or isolated workspace
-- The current checkout contains unrelated local changes and isolation is the safest way forward
-- The user wants parallel work on multiple tasks without stashing or disturbing the original worktree
-- The user says things like "create a separate branch folder", "open a fresh worktree", "use a clean checkout", or "work in an isolated workspace"
-
-## Core Rule
-
-After creating the worktree, treat the new path as the active working directory for the rest of the task.
-
-In any agent environment, "enter the directory" means:
-
-- Run subsequent commands against the new worktree path
-- Apply all edits under that worktree path
-- Do not keep using the original checkout by accident
-- Confirm the handoff by running at least one follow-up command in the new worktree
-
-Never claim you "switched" unless your subsequent actions actually target the new `worktree_path`.
-
-If your environment supports a per-command working directory, use it for every later command. If it does not, prefix later commands with an explicit `cd <worktree_path> && ...`.
-
-## Name Derivation
-
-- Derive a short ASCII kebab-case task slug from the user's real task, such as `login-timeout-fix` or `user-export`
-- Do not use generic names like `git-worktree`, `new-worktree`, or `task` unless the request is too vague
-- If the request is mostly non-ASCII or no good slug is obvious, fall back to `task-$(date +%Y%m%d-%H%M%S)`
-- Default branch prefix is `worktree/`
-- Default worktree directory is a sibling of the repository root, named `<repo-name>-<slug>`
-
-## Default Workflow
-
-1. Inspect the repository context from the current checkout:
-   - `git rev-parse --show-toplevel`
-   - `git branch --show-current`
-   - `git status --short`
-   - `git worktree list --porcelain`
-2. Decide a task slug yourself using the rules above
-3. Build branch and path names inline, then create the worktree with direct shell commands like:
-
-   ```bash
-   repo_root=$(git rev-parse --show-toplevel)
-   repo_name=$(basename "$repo_root")
-   parent_dir=$(dirname "$repo_root")
-   source_branch=$(git -C "$repo_root" branch --show-current)
-   if [ -n "$source_branch" ]; then
-     source_ref="$source_branch"
-   else
-     source_ref="HEAD@$(git -C "$repo_root" rev-parse --short HEAD)"
-   fi
-
-   slug="<task-slug>"
-   base_branch="worktree/$slug"
-   branch_name="$base_branch"
-   base_path="$parent_dir/$repo_name-$slug"
-   worktree_path="$base_path"
-   index=2
-
-   while git -C "$repo_root" show-ref --verify --quiet "refs/heads/$branch_name" || [ -e "$worktree_path" ]; do
-     branch_name="${base_branch}-$index"
-     worktree_path="${base_path}-$index"
-     index=$((index + 1))
-   done
-
-   git -C "$repo_root" worktree add -b "$branch_name" "$worktree_path" HEAD
-   ```
-
-4. Immediately verify the handoff inside the new worktree, for example:
-
-   ```bash
-   pwd
-   git status --short --branch
-   ```
-
-   These verification commands must run against `worktree_path`.
-
-5. Announce the new active path briefly, then continue the main task there
-6. For the remainder of the task, use `worktree_path` as the working directory for every relevant command or edit operation
-
-## Behavior Rules
-
-- Default base ref is `HEAD` from the current checkout so uncommitted local changes are not dragged into the new worktree
-- If a branch name or path already exists, auto-increment it instead of failing
-- If you are already inside a non-default worktree and the user still wants another isolated workspace, create a new one from the current `HEAD`
-- If the directory is not a Git repository, explain that clearly and do not pretend a worktree was created
-- If worktree creation succeeds, continue the user's actual task instead of stopping at setup
-- If worktree creation fails because of filesystem permissions, request the minimal approval needed and retry
-
-## Uncommitted Change Policy
-
-The safe default is isolation from uncommitted changes.
-
-- If the source checkout is dirty, still create the new worktree from `HEAD` unless the user explicitly asks to carry local edits over
-- Do not silently stash, reset, or move the user's existing changes
-- If the user wants local edits copied into the new worktree, use an explicit flow such as a temporary commit, patch, or cherry-pick, and say what you are doing
-
-## Output Contract
-
-When you use this skill:
-
-- Tell the user which branch and directory were created
-- Make it clear that subsequent work is now happening inside that path
-- Mention the source ref and whether the original checkout was dirty when that context matters
-- Do not stop after setup if the user asked for additional work; continue the task in the new worktree
-
-## Example
-
-User request:
-
-```text
-Create a separate worktree for this task and then start implementing it.
-```
-
-Expected behavior:
-
-- Inspect current repo status
-- Create a new `worktree/...` branch and sibling directory with direct `git worktree` commands
-- Switch all following commands to that directory
-- Continue the requested implementation there
-
-## Cleanup
-
-Only remove a worktree when the user asks or when cleanup is clearly part of the task.
-
-Before cleanup:
-
-- Check status in the worktree you created
-- Make sure you are removing the correct path
-- Never remove the user's original checkout

.agents/skills/openspec-explore/SKILL.md

@@ -1,288 +0,0 @@
----
-name: openspec-explore
-description: Enter explore mode - a thinking partner for exploring ideas, investigating problems, and clarifying requirements. Use when the user wants to think through something before or during a change.
-license: MIT
-compatibility: Requires openspec CLI.
-metadata:
-  author: openspec
-  version: "1.0"
-  generatedBy: "1.2.0"
----
-
-Enter explore mode. Think deeply. Visualize freely. Follow the conversation wherever it goes.
-
-**IMPORTANT: Explore mode is for thinking, not implementing.** You may read files, search code, and investigate the codebase, but you must NEVER write code or implement features. If the user asks you to implement something, remind them to exit explore mode first and create a change proposal. You MAY create OpenSpec artifacts (proposals, designs, specs) if the user asks—that's capturing thinking, not implementing.
-
-**This is a stance, not a workflow.** There are no fixed steps, no required sequence, no mandatory outputs. You're a thinking partner helping the user explore.
-
----
-
-## The Stance
-
-- **Curious, not prescriptive** - Ask questions that emerge naturally, don't follow a script
-- **Open threads, not interrogations** - Surface multiple interesting directions and let the user follow what resonates. Don't funnel them through a single path of questions.
-- **Visual** - Use ASCII diagrams liberally when they'd help clarify thinking
-- **Adaptive** - Follow interesting threads, pivot when new information emerges
-- **Patient** - Don't rush to conclusions, let the shape of the problem emerge
-- **Grounded** - Explore the actual codebase when relevant, don't just theorize
-
----
-
-## What You Might Do
-
-Depending on what the user brings, you might:
-
-**Explore the problem space**
-- Ask clarifying questions that emerge from what they said
-- Challenge assumptions
-- Reframe the problem
-- Find analogies
-
-**Investigate the codebase**
-- Map existing architecture relevant to the discussion
-- Find integration points
-- Identify patterns already in use
-- Surface hidden complexity
-
-**Compare options**
-- Brainstorm multiple approaches
-- Build comparison tables
-- Sketch tradeoffs
-- Recommend a path (if asked)
-
-**Visualize**
-```
-┌─────────────────────────────────────────┐
-│     Use ASCII diagrams liberally        │
-├─────────────────────────────────────────┤
-│                                         │
-│   ┌────────┐         ┌────────┐        │
-│   │ State  │────────▶│ State  │        │
-│   │   A    │         │   B    │        │
-│   └────────┘         └────────┘        │
-│                                         │
-│   System diagrams, state machines,      │
-│   data flows, architecture sketches,    │
-│   dependency graphs, comparison tables  │
-│                                         │
-└─────────────────────────────────────────┘
-```
-
-**Surface risks and unknowns**
-- Identify what could go wrong
-- Find gaps in understanding
-- Suggest spikes or investigations
-
----
-
-## OpenSpec Awareness
-
-You have full context of the OpenSpec system. Use it naturally, don't force it.
-
-### Check for context
-
-At the start, quickly check what exists:
-```bash
-openspec list --json
-```
-
-This tells you:
-- If there are active changes
-- Their names, schemas, and status
-- What the user might be working on
-
-### When no change exists
-
-Think freely. When insights crystallize, you might offer:
-
-- "This feels solid enough to start a change. Want me to create a proposal?"
-- Or keep exploring - no pressure to formalize
-
-### When a change exists
-
-If the user mentions a change or you detect one is relevant:
-
-1. **Read existing artifacts for context**
-   - `openspec/changes/<name>/proposal.md`
-   - `openspec/changes/<name>/design.md`
-   - `openspec/changes/<name>/tasks.md`
-   - etc.
-
-2. **Reference them naturally in conversation**
-   - "Your design mentions using Redis, but we just realized SQLite fits better..."
-   - "The proposal scopes this to premium users, but we're now thinking everyone..."
-
-3. **Offer to capture when decisions are made**
-
-   | Insight Type | Where to Capture |
-   |--------------|------------------|
-   | New requirement discovered | `specs/<capability>/spec.md` |
-   | Requirement changed | `specs/<capability>/spec.md` |
-   | Design decision made | `design.md` |
-   | Scope changed | `proposal.md` |
-   | New work identified | `tasks.md` |
-   | Assumption invalidated | Relevant artifact |
-
-   Example offers:
-   - "That's a design decision. Capture it in design.md?"
-   - "This is a new requirement. Add it to specs?"
-   - "This changes scope. Update the proposal?"
-
-4. **The user decides** - Offer and move on. Don't pressure. Don't auto-capture.
-
----
-
-## What You Don't Have To Do
-
-- Follow a script
-- Ask the same questions every time
-- Produce a specific artifact
-- Reach a conclusion
-- Stay on topic if a tangent is valuable
-- Be brief (this is thinking time)
-
----
-
-## Handling Different Entry Points
-
-**User brings a vague idea:**
-```
-User: I'm thinking about adding real-time collaboration
-
-You: Real-time collab is a big space. Let me think about this...
-
-      COLLABORATION SPECTRUM
-      ════════════════════════════════════════════
-
-      Awareness          Coordination         Sync
-          │                   │                 │
-          ▼                   ▼                 ▼
-      ┌────────┐         ┌────────┐        ┌────────┐
-      │Presence│         │Cursors │        │  CRDT  │
-      │  "3    │         │ Multi  │        │Conflict│
-      │online" │         │ select │        │  free  │
-      └────────┘         └────────┘        └────────┘
-          │                   │                 │
-       trivial            moderate           complex
-
-      Where's your head at?
-```
-
-**User brings a specific problem:**
-```
-User: The auth system is a mess
-
-You: [reads codebase]
-
-     ┌─────────────────────────────────────────────┐
-     │              CURRENT AUTH FLOW              │
-     └─────────────────────────────────────────────┘
-                        │
-          ┌─────────────┼─────────────┐
-          ▼             ▼             ▼
-     ┌─────────┐  ┌─────────┐  ┌─────────┐
-     │ Google  │  │  GitHub │  │  Email  │
-     │  OAuth  │  │  OAuth  │  │  Magic  │
-     └────┬────┘  └────┬────┘  └────┬────┘
-          │             │             │
-          └─────────────┼─────────────┘
-                        ▼
-                  ┌───────────┐
-                  │  Session  │
-                  └─────┬─────┘
-                        │
-                        ▼
-                  ┌───────────┐
-                  │   Perms   │
-                  └───────────┘
-
-     I see three tangles. Which one's burning?
-```
-
-**User is stuck mid-implementation:**
-```
-User: /opsx:explore add-auth-system
-      The OAuth integration is more complex than expected
-
-You: [reads change artifacts]
-
-     You're on task 4: "Implement OAuth flow"
-
-     Let me trace what's involved...
-
-     [draws diagram, explores options, suggests paths]
-
-     Want to update the design to reflect this?
-     Or add a spike task to investigate?
-```
-
-**User wants to compare options:**
-```
-User: Should we use Postgres or SQLite?
-
-You: Generic answer is boring. What's the context?
-
-User: A CLI tool that tracks local dev environments
-
-You: That changes everything.
-
-     ┌─────────────────────────────────────────────────┐
-     │         CLI TOOL DATA STORAGE                  │
-     └─────────────────────────────────────────────────┘
-
-     Key constraints:
-     • No daemon running
-     • Must work offline
-     • Single user
-
-                  SQLite          Postgres
-     Deployment   embedded ✓      needs server ✗
-     Offline      yes ✓           no ✗
-     Single file  yes ✓           no ✗
-
-     SQLite. Not even close.
-
-     Unless... is there a sync component?
-```
-
----
-
-## Ending Discovery
-
-There's no required ending. Discovery might:
-
-- **Flow into a proposal**: "Ready to start? I can create a change proposal."
-- **Result in artifact updates**: "Updated design.md with these decisions"
-- **Just provide clarity**: User has what they need, moves on
-- **Continue later**: "We can pick this up anytime"
-
-When it feels like things are crystallizing, you might summarize:
-
-```
-## What We Figured Out
-
-**The problem**: [crystallized understanding]
-
-**The approach**: [if one emerged]
-
-**Open questions**: [if any remain]
-
-**Next steps** (if ready):
-- Create a change proposal
-- Keep exploring: just keep talking
-```
-
-But this summary is optional. Sometimes the thinking IS the value.
-
----
-
-## Guardrails
-
-- **Don't implement** - Never write code or implement features. Creating OpenSpec artifacts is fine, writing application code is not.
-- **Don't fake understanding** - If something is unclear, dig deeper
-- **Don't rush** - Discovery is thinking time, not task time
-- **Don't force structure** - Let patterns emerge naturally
-- **Don't auto-capture** - Offer to save insights, don't just do it
-- **Do visualize** - A good diagram is worth many paragraphs
-- **Do explore the codebase** - Ground discussions in reality
-- **Do question assumptions** - Including the user's and your own

.agents/skills/openspec-propose/SKILL.md

@@ -1,110 +0,0 @@
----
-name: openspec-propose
-description: Propose a new change with all artifacts generated in one step. Use when the user wants to quickly describe what they want to build and get a complete proposal with design, specs, and tasks ready for implementation.
-license: MIT
-compatibility: Requires openspec CLI.
-metadata:
-  author: openspec
-  version: "1.0"
-  generatedBy: "1.2.0"
----
-
-Propose a new change - create the change and generate all artifacts in one step.
-
-I'll create a change with artifacts:
-- proposal.md (what & why)
-- design.md (how)
-- tasks.md (implementation steps)
-
-When ready to implement, run /opsx:apply
-
----
-
-**Input**: The user's request should include a change name (kebab-case) OR a description of what they want to build.
-
-**Steps**
-
-1. **If no clear input provided, ask what they want to build**
-
-   Use the **AskUserQuestion tool** (open-ended, no preset options) to ask:
-   > "What change do you want to work on? Describe what you want to build or fix."
-
-   From their description, derive a kebab-case name (e.g., "add user authentication" → `add-user-auth`).
-
-   **IMPORTANT**: Do NOT proceed without understanding what the user wants to build.
-
-2. **Create the change directory**
-   ```bash
-   openspec new change "<name>"
-   ```
-   This creates a scaffolded change at `openspec/changes/<name>/` with `.openspec.yaml`.
-
-3. **Get the artifact build order**
-   ```bash
-   openspec status --change "<name>" --json
-   ```
-   Parse the JSON to get:
-   - `applyRequires`: array of artifact IDs needed before implementation (e.g., `["tasks"]`)
-   - `artifacts`: list of all artifacts with their status and dependencies
-
-4. **Create artifacts in sequence until apply-ready**
-
-   Use the **TodoWrite tool** to track progress through the artifacts.
-
-   Loop through artifacts in dependency order (artifacts with no pending dependencies first):
-
-   a. **For each artifact that is `ready` (dependencies satisfied)**:
-      - Get instructions:
-        ```bash
-        openspec instructions <artifact-id> --change "<name>" --json
-        ```
-      - The instructions JSON includes:
-        - `context`: Project background (constraints for you - do NOT include in output)
-        - `rules`: Artifact-specific rules (constraints for you - do NOT include in output)
-        - `template`: The structure to use for your output file
-        - `instruction`: Schema-specific guidance for this artifact type
-        - `outputPath`: Where to write the artifact
-        - `dependencies`: Completed artifacts to read for context
-      - Read any completed dependency files for context
-      - Create the artifact file using `template` as the structure
-      - Apply `context` and `rules` as constraints - but do NOT copy them into the file
-      - Show brief progress: "Created <artifact-id>"
-
-   b. **Continue until all `applyRequires` artifacts are complete**
-      - After creating each artifact, re-run `openspec status --change "<name>" --json`
-      - Check if every artifact ID in `applyRequires` has `status: "done"` in the artifacts array
-      - Stop when all `applyRequires` artifacts are done
-
-   c. **If an artifact requires user input** (unclear context):
-      - Use **AskUserQuestion tool** to clarify
-      - Then continue with creation
-
-5. **Show final status**
-   ```bash
-   openspec status --change "<name>"
-   ```
-
-**Output**
-
-After completing all artifacts, summarize:
-- Change name and location
-- List of artifacts created with brief descriptions
-- What's ready: "All artifacts created! Ready for implementation."
-- Prompt: "Run `/opsx:apply` or ask me to implement to start working on the tasks."
-
-**Artifact Creation Guidelines**
-
-- Follow the `instruction` field from `openspec instructions` for each artifact type
-- The schema defines what each artifact should contain - follow it
-- Read dependency artifacts for context before creating new ones
-- Use `template` as the structure for your output file - fill in its sections
-- **IMPORTANT**: `context` and `rules` are constraints for YOU, not content for the file
-  - Do NOT copy `<context>`, `<rules>`, `<project_context>` blocks into the artifact
-  - These guide what you write, but should never appear in the output
-
-**Guardrails**
-- Create ALL artifacts needed for implementation (as defined by schema's `apply.requires`)
-- Always read dependency artifacts before creating a new one
-- If context is critically unclear, ask the user - but prefer making reasonable decisions to keep momentum
-- If a change with that name already exists, ask if user wants to continue it or create a new one
-- Verify each artifact file exists after writing before proceeding to next

.claude/commands

@@ -1 +0,0 @@
-../.agents/prompts

.claude/skills

@@ -1 +0,0 @@
-../.agents/skills

.codex/config.toml

@@ -1,5 +0,0 @@
-approval_policy = "never"
-sandbox_mode = "danger-full-access"
-
-[sandbox_workspace_write]
-network_access = true

.golangci.yml

@@ -1,6 +1,7 @@
 version: "2"
 run:
   concurrency: 4
+  go: "1.25"
   modules-download-mode: readonly
   issues-exit-code: 2
   tests: false

.make_tidy.sh

@@ -1,16 +1,5 @@
 #!/usr/bin/env bash
 
-# Function to run sed in-place with OS-specific options
-sed_replace() {
-    if [[ "$OSTYPE" == "darwin"* ]]; then
-        # macOS - requires empty string after -i
-        sed -i '' "$@"
-    else
-        # Linux/Windows Git Bash
-        sed -i "$@"
-    fi
-}
-
 workdir=.
 echo "Prepare to tidy all go.mod files in the ${workdir} directory"
 
@@ -38,9 +27,9 @@ for file in `find ${workdir} -name go.mod`; do
 
     cd $goModPath
     # Remove indirect dependencies
-    sed_replace '/\/\/ indirect/d' go.mod
+    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
-    sed_replace '/^toolchain/d' go.mod
+    sed -i '' '/^toolchain/d' go.mod
     cd - > /dev/null
 done

.make_version.sh

@@ -1,16 +1,19 @@
 #!/usr/bin/env bash
 
-# Function to run sed in-place with OS-specific options
-sed_replace() {
+# Function to detect OS and set sed parameters
+setup_sed() {
     if [[ "$OSTYPE" == "darwin"* ]]; then
-        # macOS - requires empty string after -i
-        sed -i '' "$@"
+        # macOS
+        SED_INPLACE="sed -i ''"
     else
         # Linux/Windows Git Bash
-        sed -i "$@"
+        SED_INPLACE="sed -i"
     fi
 }
 
+# Initialize sed command
+setup_sed
+
 if [ $# -ne 2 ]; then
     echo "Parameter exception, please execute in the format of $0 [directory] [version number]"
     echo "PS：$0 ./ v2.4.0"
@@ -40,11 +43,10 @@ fi
 
 if [[ true ]]; then
     # Use sed to replace the version number in version.go
-    sed_replace 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
+    $SED_INPLACE 's/VERSION = ".*"/VERSION = "'${newVersion}'"/' version.go
 
     # Use sed to replace the version number in README.MD
-    sed_replace 's/version=[^"]*/version='${newVersion}'/' README.MD
-    sed_replace 's/version=[^"]*/version='${newVersion}'/' README.zh_CN.MD
+    $SED_INPLACE 's/version=[^"]*/version='${newVersion}'/' README.MD
 fi
 
 if [ -f "go.work" ]; then
@@ -68,8 +70,6 @@ for file in `find ${workdir} -name go.mod`; do
     fi
 
     cd $goModPath
-
-    # Add replace directive for local development.
     if [ $goModPath = "./cmd/gf" ]; then
         mv go.work go.work.version.bak
         go mod edit -replace github.com/gogf/gf/v2=../../
@@ -81,20 +81,20 @@ for file in `find ${workdir} -name go.mod`; do
         go mod edit -replace github.com/gogf/gf/contrib/drivers/sqlite/v2=../../contrib/drivers/sqlite
     fi
     # Remove indirect dependencies
-    sed_replace '/\/\/ indirect/d' go.mod
+    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
-    sed_replace '/^toolchain/d' go.mod
+    $SED_INPLACE '/^toolchain/d' go.mod
 
-    # Upgrading only GoFrame related libraries, sometimes even if a version number is specified,
+    # Upgrading only GoFrame related libraries, sometimes even if a version number is specified, 
     # it may not be possible to successfully upgrade. Please confirm before submitting the code
     go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf"
-    go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v
+    go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@${newVersion}{{end}}" -m all | grep "^github.com/gogf/gf" | xargs -L1 go get -v 
     # Remove indirect dependencies
-    sed_replace '/\/\/ indirect/d' go.mod
+    sed -i '/\/\/ indirect/d' go.mod
     go mod tidy
     # Remove toolchain line if exists
-    sed_replace '/^toolchain/d' go.mod
+    $SED_INPLACE '/^toolchain/d' go.mod
     if [ $goModPath = "./cmd/gf" ]; then
         go mod edit -dropreplace github.com/gogf/gf/v2
         go mod edit -dropreplace github.com/gogf/gf/contrib/drivers/clickhouse/v2

AGENTS.md

@@ -1 +0,0 @@
-CLAUDE.md

CLAUDE.md

@@ -1,211 +0,0 @@
-# Repository Overview
-
-This is the [GoFrame](https://goframe.org) framework (`github.com/gogf/gf/v2`) — a modular Go application framework. The repository is a **multi-module monorepo**: the root module hosts the core framework, while `cmd/gf` and every directory under `contrib/` are independent Go modules with their own `go.mod`.
-
-- Root module: `github.com/gogf/gf/v2` (Go 1.23+)
-- Tooling module: `cmd/gf` (CLI: `gf` command, separate `go.work`)
-- Plugin modules under `contrib/`: `config/*`, `drivers/*` (mysql, pgsql, mssql, oracle, sqlite, clickhouse, dm, gaussdb, mariadb, oceanbase, tidb, sqlitecgo), `metric/*`, `nosql/*`, `registry/*`, `rpc/grpcx`, `sdk/*`, `trace/*`. Each is published as its own module so users only pull what they need.
-
-The root framework intentionally has **minimal external dependencies** (see `go.mod`). Anything requiring a heavy third-party dep (a DB driver, a registry client, an RPC stack) lives in `contrib/`.
-
-## Top-level package map
-
-| Path | Purpose |
-| --- | --- |
-| `frame/g`, `frame/gins` | Convenience facade (`g.Server()`, `g.DB()`, `g.Cfg()`) and the singleton/instance container |
-| `net/` | `ghttp` (HTTP server/router), `gclient` (HTTP client), `gtcp`, `gudp`, `gsel` (load balancing), `gsvc` (service discovery), `gtrace`, `goai` (OpenAPI) |
-| `os/` | OS abstractions: `gcfg` (config), `gcmd` (CLI), `gcron`, `glog`, `gfile`, `gres` (resource embedding), `gview` (templating), `gcache`, `gsession`, `gctx`, `gtimer`, `gproc`, `gmetric`, `gfsnotify`, `gstructs` |
-| `database/` | `gdb` (ORM/query builder, driver-agnostic core), `gredis` (Redis client core) |
-| `container/` | Concurrent-safe data structures: `garray`, `gmap`, `gset`, `gtree`, `glist`, `gqueue`, `gring`, `gpool`, `gtype`, `gvar` |
-| `encoding/` | Codecs for JSON/XML/YAML/TOML/INI/Properties, base64, charsets, compression, hashes, HTML, URL |
-| `text/` | `gstr`, `gregex` |
-| `util/` | `gconv` (universal conversion — heavily used), `gvalid` (validation), `gutil`, `grand`, `guid`, `gtag`, `gmeta`, `gpage`, `gmode` |
-| `crypto/` | `gaes`, `gdes`, `grsa`, `gmd5`, `gsha*`, `gcrc32` |
-| `errors/` | `gerror` (stack-aware errors), `gcode` (error code registry) |
-| `internal/` | Framework-internal helpers (do not import from outside the root module) |
-| `test/gtest` | The framework's own testing helpers — used throughout the test suite |
-
-Concrete database drivers and Redis adapters live under `contrib/drivers/` and `contrib/nosql/`; the `database/gdb` and `database/gredis` packages define the abstract layer.
-
-# Common Commands
-
-All commands run from the repository root unless noted.
-
-## Build / lint / tidy
-
-```bash
-# Tidy every go.mod in the repo (root, cmd/gf, contrib/*) — strips // indirect and toolchain lines
-make tidy
-
-# Run the project's golangci-lint config (.golangci.yml)
-make lint
-# Equivalent: golangci-lint run -c .golangci.yml
-```
-
-`make tidy` invokes `.make_tidy.sh`, which `cd`s into every directory containing a `go.mod` (skipping `testdata/` and `examples/`) and runs `go mod tidy`. After editing imports in any module, run this from the repo root.
-
-## Tests
-
-Each Go module must be tested from inside its own directory because they are separate modules. The CI script (`.github/workflows/scripts/ci-main.sh`) iterates every `go.mod`:
-
-```bash
-# Build + race-enabled tests for the root module
-go build ./...
-go test ./... -count=1 -race
-
-# Coverage (matches CI 'coverage' mode)
-go test ./... -count=1 -race -coverprofile=coverage.out -covermode=atomic \
-  -coverpkg=./...,github.com/gogf/gf/...
-
-# Run a single package's tests
-go test -count=1 -race ./os/gcfg/...
-
-# Run a single test by name
-go test -count=1 -race -run TestCfg_Get ./os/gcfg/
-
-# Test a contrib module — must cd in first (separate go.mod)
-cd contrib/drivers/mysql && go test ./... -count=1 -race
-```
-
-Many tests (database drivers, registry clients, redis cluster, apollo/nacos config) require backing services. CI starts them via docker-compose files under `.github/workflows/{redis,apollo,nacos,consul}/`. Locally, use:
-
-```bash
-make docker                      # start the default local stack
-make docker cmd=start svc=mysql  # start a specific service
-make docker cmd=stop  svc=mysql
-```
-
-## CLI tool
-
-```bash
-cd cmd/gf && go run . <subcommand>   # iterate on the gf CLI itself
-```
-
-# Architecture Notes Worth Knowing Up Front
-
-- **The `frame/g` package is a facade, not a library.** It re-exports types and provides singleton accessors (`g.DB()`, `g.Server()`, `g.Cfg()`, `g.Log()`) backed by `frame/gins`. Examples in docs use `g.*` heavily; framework-internal code generally imports the underlying packages directly.
-- **`util/gconv` is foundational.** Most public APIs accept `any` and use `gconv` for type coercion. When changing argument handling, search for `gconv.` usage to understand the conversion contract.
-- **`gdb` is driver-agnostic.** The core in `database/gdb` exposes interfaces; concrete drivers (`contrib/drivers/mysql`, etc.) register themselves via `init()` when imported. The same model pattern applies to `gredis`, `gcfg` (apollo/nacos/polaris adapters), and `gsvc` (etcd/consul/nacos/polaris/zookeeper registries).
-- **`internal/` is private.** Sub-packages (`intlog`, `instance`, `reflection`, `utils`, `json`, `command`) are not part of the public API surface — do not import them from outside the root module, and avoid leaking their types in exported signatures.
-- **Tests use `gtest`, not stdlib `testing` directly.** `test/gtest` provides `gtest.C(t, func(t *gtest.T){...})` blocks, fluent assertions (`t.Assert`, `t.AssertNE`, `t.AssertNil`), and is the project-wide convention. Match this style when adding tests.
-- **CI matrix.** Tests run on Go 1.23, 1.24, 1.25 across 386 and amd64. `contrib/*` only runs on the latest Go version (`LATEST_GO_VERSION` in `.github/workflows/ci-main.yml`). Code that requires the latest stdlib should live in `contrib/` or be guarded.
-- **Lint config matters.** `.golangci.yml` enforces a 380-char line limit, function length up to 340 lines, custom import grouping (`gci` with `prefix(github.com/gogf/gf/v2)` ahead of `cmd`/`contrib`/`example`), `gofmt -s` with rewrites (`interface{}` → `any`, `ioutil.*` → `io`/`os`, `reflect.Ptr` → `reflect.Pointer`). Run `make lint` before pushing.
-- **OpenSpec changes live under `openspec/changes/`** and drive every non-trivial change through the workflow defined below. The active iteration directory must be checked before starting work — see the Development Workflow Rules section.
-
-# Karpathy Guidelines
-
-**Tradeoff:** These guidelines bias toward caution over speed. For trivial tasks, use judgment.
-
-## 1. Think Before Coding
-
-**Don't assume. Don't hide confusion. Surface tradeoffs.**
-
-Before implementing:
-- State your assumptions explicitly. If uncertain, ask.
-- If multiple interpretations exist, present them - don't pick silently.
-- If a simpler approach exists, say so. Push back when warranted.
-- If something is unclear, stop. Name what's confusing. Ask.
-
-## 2. Simplicity First
-
-**Minimum code that solves the problem. Nothing speculative.**
-
-- No features beyond what was asked.
-- No abstractions for single-use code.
-- No "flexibility" or "configurability" that wasn't requested.
-- No error handling for impossible scenarios.
-- If you write 200 lines and it could be 50, rewrite it.
-
-Ask yourself: "Would a senior engineer say this is overcomplicated?" If yes, simplify.
-
-## 3. Surgical Changes
-
-**Touch only what you must. Clean up only your own mess.**
-
-When editing existing code:
-- Don't "improve" adjacent code, comments, or formatting.
-- Don't refactor things that aren't broken.
-- Match existing style, even if you'd do it differently.
-- If you notice unrelated dead code, mention it - don't delete it.
-
-When your changes create orphans:
-- Remove imports/variables/functions that YOUR changes made unused.
-- Don't remove pre-existing dead code unless asked.
-
-The test: Every changed line should trace directly to the user's request.
-
-## 4. Goal-Driven Execution
-
-**Define success criteria. Loop until verified.**
-
-Transform tasks into verifiable goals:
-- "Add validation" → "Write tests for invalid inputs, then make them pass"
-- "Fix the bug" → "Write a test that reproduces it, then make it pass"
-- "Refactor X" → "Ensure tests pass before and after"
-
-For multi-step tasks, state a brief plan:
-```
-1. [Step] → verify: [check]
-2. [Step] → verify: [check]
-3. [Step] → verify: [check]
-```
-
-Strong success criteria let you loop independently. Weak criteria ("make it work") require constant clarification.
-
-# Documentation Writing Rules
-
-Technical documentation such as `README.md` must follow `.agents/instructions/markdown-format.instructions.md`.
-
-- All directory-level primary documentation files in the repository must use the English `README.md` and provide a matching Chinese mirror in `README.zh_CN.md`.
-- When adding a new directory documentation file, create both `README.md` and `README.zh_CN.md` in the same change. Maintaining only one language version is not allowed.
-
-# Development Workflow Rules
-
-This project follows `SDD` and uses the `OpenSpec` tool to drive implementation. Change records are stored under `openspec/changes/`. Each change includes `proposal.md`, `design.md`, `specs/`, and `tasks.md`.
-
-**Execution workflow**:
-1. Use the `/opsx:explore` slash command at `.agents/prompts/opsx/explore.md` to conduct an exploratory discussion based on the requirement description, analyze the problem, design the solution, and assess risks.
-2. Once the exploratory discussion finishes and the solution is clear, use the `/opsx:propose` slash command at `.agents/prompts/opsx/propose.md` to turn it into a formal `OpenSpec` change proposal. The command format is `/opsx:propose feature-name`, where `feature-name` is a descriptive name for the current change in `kebab-case`, such as `user-auth` or `data-export`. A new change directory will then be generated automatically under `openspec/changes`, containing incremental spec documents (`spec/`), the technical implementation plan (`design.md`), the proposal and rationale (`proposal.md`), and the implementation task list (`tasks.md`).
-3. Then run the `/opsx:apply` slash command at `.agents/prompts/opsx/apply.md` to execute the items in `tasks.md` one by one, completing code changes, tests, and documentation updates. After the work is done, the `/gf-review` skill must be invoked for code and spec review.
-4. When users report issues or improvement requests, the `/gf-feedback` skill must be used to fix and verify them, and the related `OpenSpec` documents must be updated. After the work is done, the `/gf-review` skill must be invoked for review.
-5. After the user confirms that the current iteration is complete and has no remaining issues, run the `/opsx:archive` slash command at `.agents/prompts/opsx/archive.md` to archive the change. Before archiving, the `/gf-review` skill must be used for a full change review to ensure code quality and compliance with the spec.
-
-**Key rules**:
-- **An `OpenSpec` change is considered active until it is archived**: any change directory that still exists directly under `openspec/changes/` and has **not been moved to** `openspec/changes/archive/` is an active change. **Even if the change has completed all tasks and `openspec list --json` shows `status: complete`, it must still be treated as active until the archive step has been executed.**
-- When a user reports a bug, defect, or improvement request in either Chinese or English, and there is an active `OpenSpec` change in the project, the `gf-feedback` skill must be used. **Unless the user explicitly asks to create a new change, the feedback must always be appended to the current active iteration, even if it is unrelated to the main feature of that iteration**, so that everything can be managed and archived together.
-- The `/gf-review` review skill is triggered automatically after `/opsx:apply` completes, after `/opsx:feedback` completes, and before `/opsx:archive`.
-- During development tasks executed with tools such as `Claude Code` or `Codex CLI`, if the work can be parallelized effectively with `SubAgent` and doing so would clearly improve efficiency, that option must be evaluated first and adopted whenever appropriate. Only skip `SubAgent` when the task is strongly dependent on serial context, the split cost is too high, or it introduces obvious collaboration risk.
-- When creating new iteration documents, the content of `proposal.md`, `design.md`, `tasks.md`, and the incremental specs must be written in English.
-
-# Code Development Rules
-- All source code must include comments, such as package comments, file comments, method comments for both public and private methods, constant comments, variable comments, and comments for key logic.
-- **All submitted code changes must include unit tests**: every submitted code change must add or update focused unit tests that directly cover the affected logic and expected behavior of the changed code path, and the coverage for newly added code must stay at or above 80%; 90% or above is the preferred target when feasible.
-- **Do not hardcode string literals with enum semantics in backend implementation code**: values that represent statuses, types, stages, actions, execution modes, sort directions, filter operators, or any other enum-like semantics must be managed through Go named types and constants. Writing raw string literals directly in business branching, comparisons, assignments, or persistence logic is forbidden.
-- **Do not ignore any `error` return value**: every call that may return an `error` must be handled explicitly. Do not use patterns such as `_ = someFunc()`, `_, _ = someFunc()`, or direct calls that discard returned errors. In business flows, errors should be returned explicitly or converted before returning; in initialization, startup, or other critical non-recoverable paths, they should `panic`; in tests and cleanup paths, they must still be asserted, logged, or otherwise handled explicitly rather than silently ignored.
-- **Do not use stand-alone assignments like `_ = var` to mask unused parameters or local variables**: this placeholder pattern has no business meaning and creates misleading signals about whether the variable was supposed to participate in the logic. Prefer deleting unused variables. If a parameter must be kept to satisfy an interface signature or callback contract, use the blank identifier directly in the function signature, such as `func(ctx context.Context, _ gdb.TX) error`, or omit an unused receiver name instead of adding one-line statements like `_ = tx`, `_ = req`, or `_ = ctx` in the function body.
-- **File header comment rules**:
-  - Every `Go` source file must include a file-purpose comment at the top of the file. Component-level comments should appear in the component's main file, meaning the file with the same name as the component, such as `plugin.go`, `config.go`, or `file.go`.
-  - In a main file, the component comment must be placed immediately before the `package xxx` declaration with no blank line in between. For example:
-  ```go
-  // Package plugin implements plugin manifest discovery, lifecycle orchestration,
-  // governance metadata synchronization, and host integration for LinaPro plugins.
-  package plugin
-  ```
-  - Other implementation files must keep only file comments that describe the responsibility of the current file, such as `plugin_xxx.go` or `config_xxx.go`. There must be one blank line between the file comment and `package xxx`, and non-main files must not duplicate component-level descriptions.
-- **Variable Declarations**: When defining multiple variables, use a `var` block to group them for better alignment and readability:
-  ```go
-  // Good - aligned and clean
-  var (
-      authSvc       *auth.Service
-      bizCtxSvc     *bizctx.Service
-      k8sSvc        *svcK8s.Service
-      notebookSvc   *notebook.Service
-      middlewareSvc *middleware.Service
-  )
-
-  // Avoid - scattered declarations
-  authSvc := auth.New()
-  bizCtxSvc := bizctx.New()
-  k8sSvc := svcK8s.New()
-  ```
-  Apply this pattern when you have 3 or more related variable declarations in the same scope.

Makefile

@@ -34,7 +34,6 @@ branch:
 version:
 	@set -e; \
 	newVersion=$(to); \
-	$(MAKE) -C cmd/gf pack; \
 	./.make_version.sh ./ $$newVersion; \
 	echo "make version to=$(to) done"
 
@@ -53,6 +52,31 @@ tag:
 	git push origin $$newVersion; \
 	echo "Tag $$newVersion created and pushed successfully!"
 
+# update submodules
+.PHONY: subup
+subup:
+	@set -e; \
+	echo "Updating submodules..."; \
+	git submodule init;\
+	git submodule update;
+
+# update and commit submodules
+.PHONY: subsync
+subsync: subup
+	@set -e; \
+	echo "";\
+	cd examples; \
+	echo "Checking for changes..."; \
+	if git diff-index --quiet HEAD --; then \
+		echo "No changes to commit"; \
+	else \
+		echo "Found changes, committing..."; \
+		git add -A; \
+		git commit -m "examples update"; \
+		git push origin; \
+	fi; \
+	cd ..;
+
 # manage docker services for local development
 # usage: make docker or make docker cmd=start svc=mysql
 .PHONY: docker

README.MD

@@ -1,7 +1,7 @@
 English | [简体中文](README.zh_CN.MD)
 
 <div align=center>
-<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe logo"/>
+<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
 
 [![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
@@ -19,7 +19,6 @@ English | [简体中文](README.zh_CN.MD)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/gogf/gf?style=flat)](https://github.com/gogf/gf/issues?q=is%3Aissue+is%3Aclosed)
 ![Stars](https://img.shields.io/github/stars/gogf/gf?style=flat)
 ![Forks](https://img.shields.io/github/forks/gogf/gf?style=flat)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/gogf/gf)
 
 </div>
 
@@ -36,7 +35,7 @@ go get -u github.com/gogf/gf/v2
 - Official Site: [https://goframe.org](https://goframe.org)
 - Official Site(en): [https://goframe.org/en](https://goframe.org/en)
 - 国内镜像: [https://goframe.org.cn](https://goframe.org.cn)
-- Mirror Site: [https://pages.goframe.org](https://pages.goframe.org)
+- Mirror Site: [Github Pages](https://pages.goframe.org)
 - Mirror Site: [Offline Docs](https://github.com/gogf/goframe.org-pdf?tab=readme-ov-file#%E6%9C%80%E6%96%B0%E7%89%88%E6%9C%AC)
 - GoDoc API: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
 - Doc Source: [https://github.com/gogf/gf-site](https://github.com/gogf/gf-site)
@@ -46,7 +45,7 @@ go get -u github.com/gogf/gf/v2
 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖
 
 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.10.2" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.9.8" alt="goframe contributors"/>
 </a>
 
 ## License

README.zh_CN.MD

@@ -1,7 +1,7 @@
 [English](README.MD) | 简体中文
 
 <div align=center>
-<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe logo"/>
+<img src="https://goframe.org/img/logo_full.png" width="300" alt="goframe gf logo"/>
 
 [![Go Reference](https://pkg.go.dev/badge/github.com/gogf/gf/v2.svg)](https://pkg.go.dev/github.com/gogf/gf/v2)
 [![GoFrame CI](https://github.com/gogf/gf/actions/workflows/ci-main.yml/badge.svg)](https://github.com/gogf/gf/actions/workflows/ci-main.yml)
@@ -19,11 +19,10 @@
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/gogf/gf?style=flat)](https://github.com/gogf/gf/issues?q=is%3Aissue+is%3Aclosed)
 ![Stars](https://img.shields.io/github/stars/gogf/gf?style=flat)
 ![Forks](https://img.shields.io/github/forks/gogf/gf?style=flat)
-[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/gogf/gf)
 
 </div>
 
-一款强大的框架，为了更快、更轻松、更高效的项目开发。
+一个强大的框架，为了更快、更轻松、更高效的项目开发。
 
 ## 安装
 
@@ -36,7 +35,7 @@ go get -u github.com/gogf/gf/v2
 - 官方网站: [https://goframe.org](https://goframe.org)
 - 官方网站(en): [https://goframe.org/en](https://goframe.org/en)
 - 国内镜像: [https://goframe.org.cn](https://goframe.org.cn)
-- 镜像网站: [https://pages.goframe.org](https://pages.goframe.org)
+- 镜像网站: [Github Pages](https://pages.goframe.org)
 - 镜像网站: [离线文档](https://github.com/gogf/goframe.org-pdf?tab=readme-ov-file#%E6%9C%80%E6%96%B0%E7%89%88%E6%9C%AC)
 - Go包文档: [https://pkg.go.dev/github.com/gogf/gf/v2](https://pkg.go.dev/github.com/gogf/gf/v2)
 - 文档源码: [https://github.com/gogf/gf-site](https://github.com/gogf/gf-site)
@@ -46,9 +45,9 @@ go get -u github.com/gogf/gf/v2
 💖 [感谢所有使 GoFrame 成为可能的贡献者](https://github.com/gogf/gf/graphs/contributors) 💖
 
 <a href="https://github.com/gogf/gf/graphs/contributors">
-<img src="https://goframe.org/img/contributors.svg?version=v2.10.2" alt="goframe contributors"/>
+<img src="https://goframe.org/img/contributors.svg?version=v2.9.5" alt="goframe contributors"/>
 </a>
 
 ## 许可证
 
-`GoFrame` 采用 [MIT License](LICENSE) 许可，100%开源和免费。
+`GoFrame` 采用 [MIT License](LICENSE) 许可，100% 免费和开源，永久保持。

cmd/gf/Makefile

@@ -18,6 +18,9 @@ pack.template-mono:
 	@cd temp && gf pack template-mono ../internal/packed/template-mono.go -n=packed -y
 	@rm -fr temp
 
+# Note:
+# command `sed` only works on MacOS.
+# use `grep -irl 'template-single' temp| xargs sed -i'' -e 's/template-single/template-mono-app/g'` on other platforms.
 pack.template-mono-app:
 	@rm -fr temp
 	@mkdir temp || exit 0
@@ -28,6 +31,6 @@ pack.template-mono-app:
 	@rm -fr temp/template-mono-app/.gitignore
 	@rm -fr temp/template-mono-app/go.mod
 	@rm -fr temp/template-mono-app/go.sum
-	@grep -irl 'template-single' temp| xargs perl -pi -e 's/template-single/template-mono-app/g'
+	@grep -irl 'template-single' temp| xargs sed -i '' -e 's/template-single/template-mono-app/g'
 	@cd temp && gf pack template-mono-app ../internal/packed/template-mono-app.go -n=packed -y
 	@rm -fr temp

cmd/gf/go.mod

@@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2
 go 1.23.0
 
 require (
-	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2
-	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
-	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2
-	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2
-	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8
+	github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/olekukonko/tablewriter v1.1.0
 	github.com/schollz/progressbar/v3 v3.15.0

cmd/gf/go.sum

@@ -46,20 +46,20 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2 h1:K9MuyxpkwbQFRypXZnqZm06l0N2p3urM8PEqH45IYXo=
-github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.10.2/go.mod h1:Pr/klQ7g0l0qx/MtnFqu9sgeMfVul8ntj/kvGuopJcM=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2 h1:7V+23ohcOWvT4Fgf/79uEs51VLfESbhgntkdLL9IPyA=
-github.com/gogf/gf/contrib/drivers/mssql/v2 v2.10.2/go.mod h1:8mQd1INT1l7c8gYnUdfqlbDdTyq9ZqjkdvlLFdPD6RE=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2 h1:UdUV+7GhwYLpkwz7VrwIVO/1ZYodyzSL5is25NET24A=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2/go.mod h1:eKc+0i3Il7efS2BBjmpy7T9wvN9NGRd67ZV94r9behA=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2 h1:1ufTnX0yqYvfY0h8cMTfcwKnmkfPl/ClJNsbHEboJhc=
-github.com/gogf/gf/contrib/drivers/oracle/v2 v2.10.2/go.mod h1:gHYoaDSZA2DeZ7e/n6YcplP3fXAjDvijDFz0WijHASU=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2 h1:u8EpP24GkprogROnJ7htMov9Fc66pTP1eVYrWxiCYOs=
-github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.2/go.mod h1:GmvM3r8GVByVMi4RD2+MCs5+CfxVXPMeT8mVDkAaAXE=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2 h1:KLS68SWS2W749x7e+eCCOO3UD2Sbw+bIbLEPR8o1FXw=
-github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.10.2/go.mod h1:uLcsu73PfpyhRc0Jq0gGAWQjN1tyGU9iBRrYgt/lu7g=
-github.com/gogf/gf/v2 v2.10.2 h1:46IO0Uc8e85/FqdftJFskfDejJLBL0JBnGS5qOftUu8=
-github.com/gogf/gf/v2 v2.10.2/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8 h1:L72OB2HPuZSHtJ2ipBzI+62rGGDRdwYjequ1v+zctpg=
+github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.8/go.mod h1:D0UySg70Bd264F5AScYmz1Hl8vjzlUJ7YvqBJc5OFbo=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8 h1:DT5zHfo9/VkbJ+TF7kUasvv4dbU5uctoj+JGbrzgdYE=
+github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.8/go.mod h1:cDd91Zd8LxFF+xxOflRRqw0WTTCpAJ0nf0KKRA+nvTE=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8 h1:XZ4Ya/50xpjf81+4genr33iJXR2dxJmqYKxGyXlLRqA=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8/go.mod h1:wtm2NJb/L3CbDOmyUc7TsOpWHTCMakg1QRG7B/oKrRs=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8 h1:ZrqABJsUnhNDz8VAem1XXONBTywl6r+GHQH05i+4W1g=
+github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.8/go.mod h1:YTFyeVk2Rgu/JMUhFxkjYzWaBc+yZ6wAvY54XVZoNko=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8 h1:Dc227FD1uf9nNBPFEjMEgIoAJbAgeYeNrOrjviDgPzY=
+github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.8/go.mod h1:o3EpB4Ti3+x/axzRMJg2k7TrLiWZiSTxP0v64LBkk5k=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8 h1:LHEhzsBfIo8xHvOUuLDQW1q7Qix1vnBabH/iivCRghs=
+github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.8/go.mod h1:SX6dRONaJGafzCoMIrn8CkRM4fIvtmJRt/aYclUHy3Q=
+github.com/gogf/gf/v2 v2.9.8 h1:El0HwksTzeRk0DQV4Lh7S9DbsIwKInhHSHGcH7qJumM=
+github.com/gogf/gf/v2 v2.9.8/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=

cmd/gf/internal/cmd/cmd_init.go

@@ -232,17 +232,14 @@ func (c cInit) initFromBuiltin(ctx context.Context, in cInitInput) (out *cInitOu
 				return content
 			}
 		}
-		mlog.Debugf("replace %s %s to %s", path, cInitRepoPrefix+templateRepoName, in.Module)
 		return gstr.Replace(gfile.GetContents(path), cInitRepoPrefix+templateRepoName, in.Module)
 	}, in.Name, "*", true)
 	if err != nil {
 		return
 	}
 
-	// Format the generated Go files using go/format (not goimports).
-	// utils.GoFmt uses imports.Process which may remove local import paths that cannot
-	// be resolved in the GOPATH or module cache right after generation (e.g. "myapp/api/hello/v1").
-	geninit.FormatGoFiles(in.Name)
+	// Format the generated Go files.
+	utils.GoFmt(in.Name)
 
 	// Update the GoFrame version.
 	if in.Update {

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -412,60 +412,3 @@ func Test_Gen_Dao_Sqlite3(t *testing.T) {
 		}
 	})
 }
-
-func Test_Gen_Dao_FileNameCaseSnakeFirstUpper(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			err        error
-			db         = testDB
-			table      = "sys_i18n_message"
-			sqlContent = fmt.Sprintf(
-				gtest.DataContent(`gendao`, `user.tpl.sql`),
-				table,
-			)
-		)
-		dropTableWithDb(db, table)
-		array := gstr.SplitAndTrim(sqlContent, ";")
-		for _, v := range array {
-			if _, err = db.Exec(ctx, v); err != nil {
-				t.AssertNil(err)
-			}
-		}
-		defer dropTableWithDb(db, table)
-
-		var (
-			path = gfile.Temp(guid.S())
-			in   = gendao.CGenDaoInput{
-				Path:         path,
-				Link:         link,
-				Group:        "test",
-				Tables:       table,
-				FileNameCase: "SnakeFirstUpper",
-			}
-		)
-		err = gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-		defer gfile.Remove(path)
-
-		err = gfile.Copy(
-			gtest.DataPath("gendao", "go.mod.txt"),
-			gfile.Join(path, "go.mod"),
-		)
-		t.AssertNil(err)
-
-		_, err = gendao.CGenDao{}.Dao(ctx, in)
-		t.AssertNil(err)
-
-		files, err := gfile.ScanDir(path, "*.go", true)
-		t.AssertNil(err)
-		t.Assert(files, []string{
-			filepath.FromSlash(path + "/dao/internal/sys_i18n_message.go"),
-			filepath.FromSlash(path + "/dao/sys_i18n_message.go"),
-			filepath.FromSlash(path + "/model/do/sys_i18n_message.go"),
-			filepath.FromSlash(path + "/model/entity/sys_i18n_message.go"),
-		})
-	})
-}

cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -238,48 +238,3 @@ func Test_Gen_Service_PackagesFilter(t *testing.T) {
 		t.Assert(files[0], dstFolder+filepath.FromSlash("/user.go"))
 	})
 }
-
-// https://github.com/gogf/gf/issues/4242
-// Test that versioned imports and aliased imports are correctly preserved.
-// The issue is that imports like "github.com/minio/minio-go/v7" were being
-// incorrectly handled because the package name (minio) differs from
-// the directory name (minio-go).
-func Test_Issue4242(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		var (
-			path      = gfile.Temp(guid.S())
-			dstFolder = path + filepath.FromSlash("/service")
-			srvFolder = gtest.DataPath("issue", "4242", "logic")
-			in        = genservice.CGenServiceInput{
-				SrcFolder:       srvFolder,
-				DstFolder:       dstFolder,
-				DstFileNameCase: "Snake",
-				WatchFile:       "",
-				StPattern:       "",
-				Packages:        nil,
-				ImportPrefix:    "",
-				Clear:           false,
-			}
-		)
-		err := gutil.FillStructWithDefault(&in)
-		t.AssertNil(err)
-
-		err = gfile.Mkdir(path)
-		t.AssertNil(err)
-		defer gfile.Remove(path)
-
-		_, err = genservice.CGenService{}.Service(ctx, in)
-		t.AssertNil(err)
-
-		// Test versioned imports
-		t.Assert(
-			gfile.GetContents(dstFolder+filepath.FromSlash("/issue_4242.go")),
-			gfile.GetContents(gtest.DataPath("issue", "4242", "service", "issue_4242.go")),
-		)
-		// Test aliased imports
-		t.Assert(
-			gfile.GetContents(dstFolder+filepath.FromSlash("/issue_4242_alias.go")),
-			gfile.GetContents(gtest.DataPath("issue", "4242", "service", "issue_4242_alias.go")),
-		)
-	})
-}

cmd/gf/internal/cmd/gendao/gendao.go

@@ -46,7 +46,6 @@ type (
 		RemovePrefix       string   `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
 		RemoveFieldPrefix  string   `name:"removeFieldPrefix"   short:"rf" brief:"{CGenDaoBriefRemoveFieldPrefix}"`
 		JsonCase           string   `name:"jsonCase"            short:"j"  brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"`
-		FileNameCase       string   `name:"fileNameCase"        short:"fc" brief:"{CGenDaoBriefFileNameCase}" d:"Snake"`
 		ImportPrefix       string   `name:"importPrefix"        short:"i"  brief:"{CGenDaoBriefImportPrefix}"`
 		DaoPath            string   `name:"daoPath"             short:"d"  brief:"{CGenDaoBriefDaoPath}" d:"dao"`
 		TablePath          string   `name:"tablePath"           short:"tp" brief:"{CGenDaoBriefTablePath}" d:"table"`

cmd/gf/internal/cmd/gendao/gendao_dao.go

@@ -69,7 +69,7 @@ func generateDaoSingle(ctx context.Context, in generateDaoSingleInput) {
 	var (
 		tableNameCamelCase      = formatFieldName(in.NewTableName, FieldNameCaseCamel)
 		tableNameCamelLowerCase = formatFieldName(in.NewTableName, FieldNameCaseCamelLower)
-		fileName                = formatFileName(in.NewTableName, in.FileNameCase)
+		tableNameSnakeCase      = gstr.CaseSnake(in.NewTableName)
 		importPrefix            = in.ImportPrefix
 	)
 	if importPrefix == "" {
@@ -78,6 +78,13 @@ func generateDaoSingle(ctx context.Context, in generateDaoSingleInput) {
 		importPrefix = gstr.Join(g.SliceStr{importPrefix, in.DaoPath}, "/")
 	}
 
+	fileName := gstr.Trim(tableNameSnakeCase, "-_.")
+	if len(fileName) > 5 && fileName[len(fileName)-5:] == "_test" {
+		// Add suffix to avoid the table name which contains "_test",
+		// which would make the go file a testing file.
+		fileName += "_table"
+	}
+
 	// dao - index
 	generateDaoIndex(generateDaoIndexInput{
 		generateDaoSingleInput:  in,

cmd/gf/internal/cmd/gendao/gendao_do.go

@@ -36,7 +36,7 @@ func generateDo(ctx context.Context, in CGenDaoInternalInput) {
 		}
 		var (
 			newTableName        = in.NewTableNames[i]
-			doFilePath          = gfile.Join(dirPathDo, formatFileName(newTableName, in.FileNameCase)+".go")
+			doFilePath          = gfile.Join(dirPathDo, gstr.CaseSnake(newTableName)+".go")
 			structDefinition, _ = generateStructDefinition(ctx, generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
 				TableName:            tableName,

cmd/gf/internal/cmd/gendao/gendao_entity.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gview"
+	"github.com/gogf/gf/v2/text/gstr"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
@@ -31,7 +32,7 @@ func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
 
 		var (
 			newTableName                    = in.NewTableNames[i]
-			entityFilePath                  = filepath.FromSlash(gfile.Join(dirPathEntity, formatFileName(newTableName, in.FileNameCase)+".go"))
+			entityFilePath                  = filepath.FromSlash(gfile.Join(dirPathEntity, gstr.CaseSnake(newTableName)+".go"))
 			structDefinition, appendImports = generateStructDefinition(ctx, generateStructDefinitionInput{
 				CGenDaoInternalInput: in,
 				TableName:            tableName,

cmd/gf/internal/cmd/gendao/gendao_structure.go

@@ -208,28 +208,6 @@ func formatFieldName(fieldName string, nameCase FieldNameCase) string {
 	}
 }
 
-// formatFileName formats and returns a new file name for generated source files.
-func formatFileName(fileName, nameCase string) string {
-	if nameCase == "" {
-		nameCase = string(gstr.Snake)
-	}
-	fileName = normalizeNameForCaseConvert(fileName)
-	fileName = gstr.Trim(gstr.CaseConvert(fileName, gstr.CaseTypeMatch(nameCase)), "-_.")
-	if len(fileName) > 5 && fileName[len(fileName)-5:] == "_test" {
-		// Add suffix to avoid the table name which contains "_test",
-		// which would make the go file a testing file.
-		fileName += "_table"
-	}
-	return fileName
-}
-
-func normalizeNameForCaseConvert(name string) string {
-	if isAllUpper(name) {
-		return strings.ToLower(name)
-	}
-	return name
-}
-
 // isAllUpper checks and returns whether given `fieldName` all letters are upper case.
 func isAllUpper(fieldName string) bool {
 	for _, b := range fieldName {

cmd/gf/internal/cmd/gendao/gendao_table.go

@@ -17,6 +17,7 @@ import (
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gview"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
@@ -66,7 +67,13 @@ func generateTableSingle(ctx context.Context, in generateTableSingleInput) {
 		mlog.Fatalf(`fetching tables fields failed for table "%s": %+v`, in.TableName, err)
 	}
 
-	fileName := formatFileName(in.NewTableName, in.FileNameCase)
+	tableNameSnakeCase := gstr.CaseSnake(in.NewTableName)
+	fileName := gstr.Trim(tableNameSnakeCase, "-_.")
+	if len(fileName) > 5 && fileName[len(fileName)-5:] == "_test" {
+		// Add suffix to avoid the table name which contains "_test",
+		// which would make the go file a testing file.
+		fileName += "_table"
+	}
 	path := filepath.FromSlash(gfile.Join(in.DirPathTable, fileName+".go"))
 	in.genItems.AppendGeneratedFilePath(path)
 	if in.OverwriteDao || !gfile.Exists(path) {

cmd/gf/internal/cmd/gendao/gendao_tag.go

@@ -58,30 +58,23 @@ CONFIGURATION SUPPORT
 	CGenDaoBriefStdTime           = `use time.Time from stdlib instead of gtime.Time for generated time/date fields of tables`
 	CGenDaoBriefWithTime          = `add created time for auto produced go files`
 	CGenDaoBriefGJsonSupport      = `use gJsonSupport to use *gjson.Json instead of string for generated json fields of tables`
-	CGenDaoBriefFileNameCase      = `
-generated go file name case for dao/table/do/entity files, cases are as follows:
-| Case            | Example            |
-|---------------- |--------------------|
-| Snake           | any_kind_of_string | default
-| SnakeFirstUpper | rgb_code_md5       |
-`
-	CGenDaoBriefImportPrefix    = `custom import prefix for generated go files`
-	CGenDaoBriefDaoPath         = `directory path for storing generated dao files under path`
-	CGenDaoBriefTablePath       = `directory path for storing generated table files under path`
-	CGenDaoBriefDoPath          = `directory path for storing generated do files under path`
-	CGenDaoBriefEntityPath      = `directory path for storing generated entity files under path`
-	CGenDaoBriefOverwriteDao    = `overwrite all dao files both inside/outside internal folder`
-	CGenDaoBriefModelFile       = `custom file name for storing generated model content`
-	CGenDaoBriefModelFileForDao = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
-	CGenDaoBriefDescriptionTag  = `add comment to description tag for each field`
-	CGenDaoBriefNoJsonTag       = `no json tag will be added for each field`
-	CGenDaoBriefNoModelComment  = `no model comment will be added for each field`
-	CGenDaoBriefClear           = `delete all generated go files that do not exist in database`
-	CGenDaoBriefGenTable        = `generate table files`
-	CGenDaoBriefTypeMapping     = `custom local type mapping for generated struct attributes relevant to fields of table`
-	CGenDaoBriefFieldMapping    = `custom local type mapping for generated struct attributes relevant to specific fields of table`
-	CGenDaoBriefShardingPattern = `sharding pattern for table name, e.g. "users_?" will be replace tables "users_001,users_002,..." to "users" dao`
-	CGenDaoBriefGroup           = `
+	CGenDaoBriefImportPrefix      = `custom import prefix for generated go files`
+	CGenDaoBriefDaoPath           = `directory path for storing generated dao files under path`
+	CGenDaoBriefTablePath         = `directory path for storing generated table files under path`
+	CGenDaoBriefDoPath            = `directory path for storing generated do files under path`
+	CGenDaoBriefEntityPath        = `directory path for storing generated entity files under path`
+	CGenDaoBriefOverwriteDao      = `overwrite all dao files both inside/outside internal folder`
+	CGenDaoBriefModelFile         = `custom file name for storing generated model content`
+	CGenDaoBriefModelFileForDao   = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
+	CGenDaoBriefDescriptionTag    = `add comment to description tag for each field`
+	CGenDaoBriefNoJsonTag         = `no json tag will be added for each field`
+	CGenDaoBriefNoModelComment    = `no model comment will be added for each field`
+	CGenDaoBriefClear             = `delete all generated go files that do not exist in database`
+	CGenDaoBriefGenTable          = `generate table files`
+	CGenDaoBriefTypeMapping       = `custom local type mapping for generated struct attributes relevant to fields of table`
+	CGenDaoBriefFieldMapping      = `custom local type mapping for generated struct attributes relevant to specific fields of table`
+	CGenDaoBriefShardingPattern   = `sharding pattern for table name, e.g. "users_?" will be replace tables "users_001,users_002,..." to "users" dao`
+	CGenDaoBriefGroup             = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
 `
@@ -135,7 +128,6 @@ func init() {
 		`CGenDaoBriefRemoveFieldPrefix`:  CGenDaoBriefRemoveFieldPrefix,
 		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
 		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
-		`CGenDaoBriefFileNameCase`:       CGenDaoBriefFileNameCase,
 		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
 		`CGenDaoBriefTablePath`:          CGenDaoBriefTablePath,
 		`CGenDaoBriefDoPath`:             CGenDaoBriefDoPath,

cmd/gf/internal/cmd/gendao/gendao_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 
 	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gstr"
 )
 
 // Test containsWildcard function.
@@ -181,12 +180,3 @@ func Test_filterTablesByPatterns_NonExistent(t *testing.T) {
 		t.AssertNI("nonexistent", result)
 	})
 }
-
-func Test_formatFileName(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		t.Assert(formatFileName("sys_i18n_message", ""), "sys_i_18_n_message")
-		t.Assert(formatFileName("sys_i18n_message", string(gstr.SnakeFirstUpper)), "sys_i18n_message")
-		t.Assert(formatFileName("SYS_I18N_MESSAGE", string(gstr.SnakeFirstUpper)), "sys_i18n_message")
-		t.Assert(formatFileName("user_test", string(gstr.SnakeFirstUpper)), "user_test_table")
-	})
-}

cmd/gf/internal/cmd/geninit/geninit_generator.go

@@ -85,7 +85,7 @@ func generateProject(ctx context.Context, srcPath, name, oldModule, newModule st
 	// 6. Format the generated Go files using go/format (not imports.Process)
 	// Note: We use formatGoFiles instead of utils.GoFmt because imports.Process
 	// may incorrectly "fix" local import paths by replacing them with cached module paths.
-	FormatGoFiles(dstPath)
+	formatGoFiles(dstPath)
 
 	mlog.Print("Project generated successfully!")
 	return nil
@@ -115,10 +115,10 @@ func upgradeDependencies(ctx context.Context, projectDir string) error {
 	return nil
 }
 
-// FormatGoFiles formats all Go files in the directory using go/format.
+// formatGoFiles formats all Go files in the directory using go/format.
 // Unlike imports.Process, this only formats code without modifying imports,
 // which prevents incorrect "fixing" of local import paths.
-func FormatGoFiles(dir string) {
+func formatGoFiles(dir string) {
 	files, err := findGoFiles(dir)
 	if err != nil {
 		mlog.Printf("Failed to find Go files for formatting: %v", err)

cmd/gf/internal/cmd/genservice/genservice_calculate.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 
@@ -36,14 +37,21 @@ func (c CGenService) calculateImportedItems(
 	}
 
 	for _, item := range pkgItems {
-		// Skip anonymous imports
-		if item.Alias == "_" {
+		alias := item.Alias
+
+		// If the alias is _, it means that the package is not generated.
+		if alias == "_" {
 			mlog.Debugf(`ignore anonymous package: %s`, item.RawImport)
 			continue
 		}
-		// Keep all imports, let gofmt clean up unused ones.
-		// We cannot accurately infer package name from import path
-		// (e.g., path "minio-go" but package name is "minio").
+		// If the alias is empty, it will use the package name as the alias.
+		if alias == "" {
+			alias = gfile.Basename(gstr.Trim(item.Path, `"`))
+		}
+		if !gstr.Contains(allFuncParamType.String(), alias) {
+			mlog.Debugf(`ignore unused package: %s`, item.RawImport)
+			continue
+		}
 		srcImportedPackages.Add(item.RawImport)
 	}
 	return nil

cmd/gf/internal/cmd/testdata/build/varmap/go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 toolchain go1.24.6
 
-require github.com/gogf/gf/v2 v2.10.2
+require github.com/gogf/gf/v2 v2.9.8
 
 require (
 	go.opentelemetry.io/otel v1.38.0 // indirect

cmd/gf/internal/cmd/testdata/issue/4242/logic/issue4242/issue4242.go

@@ -1,34 +0,0 @@
-package issue4242
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4242/service"
-
-	"github.com/gogf/gf/contrib/drivers/mysql/v2"
-)
-
-func init() {
-	service.RegisterIssue4242(New())
-}
-
-type sIssue4242 struct {
-}
-
-func New() *sIssue4242 {
-	return &sIssue4242{}
-}
-
-// GetDriver tests versioned import path is preserved.
-func (s *sIssue4242) GetDriver(ctx context.Context) (d mysql.Driver, err error) {
-	return mysql.Driver{}, nil
-}
-
-// GetRequest tests another versioned import.
-func (s *sIssue4242) GetRequest(ctx context.Context) (*ghttp.Request, error) {
-	g.Log().Info(ctx, "getting request")
-	return nil, nil
-}

cmd/gf/internal/cmd/testdata/issue/4242/logic/issue4242alias/issue4242alias.go

@@ -1,37 +0,0 @@
-package issue4242alias
-
-import (
-	"context"
-
-	// Anonymous import (should be skipped)
-	_ "github.com/gogf/gf/v2/os/gres"
-
-	// Versioned import without alias
-	"github.com/gogf/gf/v2/net/ghttp"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4242/service"
-
-	// Explicit alias import
-	mysqlDriver "github.com/gogf/gf/contrib/drivers/mysql/v2"
-)
-
-func init() {
-	service.RegisterIssue4242Alias(New())
-}
-
-type sIssue4242Alias struct {
-}
-
-func New() *sIssue4242Alias {
-	return &sIssue4242Alias{}
-}
-
-// GetDriver tests explicit alias import.
-func (s *sIssue4242Alias) GetDriver(ctx context.Context) (d mysqlDriver.Driver, err error) {
-	return mysqlDriver.Driver{}, nil
-}
-
-// GetRequest tests versioned import.
-func (s *sIssue4242Alias) GetRequest(ctx context.Context) (*ghttp.Request, error) {
-	return nil, nil
-}

cmd/gf/internal/cmd/testdata/issue/4242/logic/logic.go

@@ -1,10 +0,0 @@
-// ==========================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
-// ==========================================================================
-
-package logic
-
-import (
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4242/logic/issue4242"
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4242/logic/issue4242alias"
-)

cmd/gf/internal/cmd/testdata/issue/4242/service/issue_4242.go

@@ -1,37 +0,0 @@
-// ================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
-// You can delete these comments if you wish manually maintain this interface file.
-// ================================================================================
-
-package service
-
-import (
-	"context"
-
-	"github.com/gogf/gf/contrib/drivers/mysql/v2"
-	"github.com/gogf/gf/v2/net/ghttp"
-)
-
-type (
-	IIssue4242 interface {
-		// GetDriver tests versioned import path is preserved.
-		GetDriver(ctx context.Context) (d mysql.Driver, err error)
-		// GetRequest tests another versioned import.
-		GetRequest(ctx context.Context) (*ghttp.Request, error)
-	}
-)
-
-var (
-	localIssue4242 IIssue4242
-)
-
-func Issue4242() IIssue4242 {
-	if localIssue4242 == nil {
-		panic("implement not found for interface IIssue4242, forgot register?")
-	}
-	return localIssue4242
-}
-
-func RegisterIssue4242(i IIssue4242) {
-	localIssue4242 = i
-}

cmd/gf/internal/cmd/testdata/issue/4242/service/issue_4242_alias.go

@@ -1,37 +0,0 @@
-// ================================================================================
-// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
-// You can delete these comments if you wish manually maintain this interface file.
-// ================================================================================
-
-package service
-
-import (
-	"context"
-
-	mysqlDriver "github.com/gogf/gf/contrib/drivers/mysql/v2"
-	"github.com/gogf/gf/v2/net/ghttp"
-)
-
-type (
-	IIssue4242Alias interface {
-		// GetDriver tests explicit alias import.
-		GetDriver(ctx context.Context) (d mysqlDriver.Driver, err error)
-		// GetRequest tests versioned import.
-		GetRequest(ctx context.Context) (*ghttp.Request, error)
-	}
-)
-
-var (
-	localIssue4242Alias IIssue4242Alias
-)
-
-func Issue4242Alias() IIssue4242Alias {
-	if localIssue4242Alias == nil {
-		panic("implement not found for interface IIssue4242Alias, forgot register?")
-	}
-	return localIssue4242Alias
-}
-
-func RegisterIssue4242Alias(i IIssue4242Alias) {
-	localIssue4242Alias = i
-}

cmd/gf/internal/cmd/testdata/issue/4387/go.mod

@@ -1,5 +1,3 @@
 module github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/4387
 
-go 1.23.0
-
-toolchain go1.24.12
+go 1.20

container/garray/garray_normal_t.go

@@ -749,9 +749,7 @@ func (a *TArray[T]) String() string {
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-// DO NOT change this receiver to pointer type, as the TArray can be used as a var defined variable, like:
-// var a TArray[int]
-// Please refer to corresponding tests for more details.
+// Note that do not use pointer as its receiver here.
 func (a TArray[T]) MarshalJSON() ([]byte, error) {
 	a.mu.RLock()
 	defer a.mu.RUnlock()

container/garray/garray_sorted_t.go

@@ -46,7 +46,7 @@ func NewSortedTArray[T comparable](comparator func(a, b T) int, safe ...bool) *S
 	return NewSortedTArraySize(0, comparator, safe...)
 }
 
-// NewSortedTArraySize create and returns a sorted array with given size and cap.
+// NewSortedTArraySize create and returns an sorted array with given size and cap.
 // The parameter `safe` is used to specify whether using array in concurrent-safety,
 // which is false in default.
 func NewSortedTArraySize[T comparable](cap int, comparator func(a, b T) int, safe ...bool) *SortedTArray[T] {
@@ -718,9 +718,7 @@ func (a *SortedTArray[T]) String() string {
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-// DO NOT change this receiver to pointer type, as the TArray can be used as a var defined variable, like:
-// var a SortedTArray[int]
-// Please refer to corresponding tests for more details.
+// Note that do not use pointer as its receiver here.
 func (a SortedTArray[T]) MarshalJSON() ([]byte, error) {
 	a.mu.RLock()
 	defer a.mu.RUnlock()

container/gmap/gmap_hash_k_v_map.go

@@ -17,17 +17,10 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// NilChecker is a function that checks whether the given value is nil.
-type NilChecker[V any] func(V) bool
-
 // KVMap wraps map type `map[K]V` and provides more map features.
 type KVMap[K comparable, V any] struct {
 	mu   rwmutex.RWMutex
 	data map[K]V
-
-	// nilChecker is the custom nil checker function.
-	// It uses empty.IsNil if it's nil.
-	nilChecker NilChecker[V]
 }
 
 // NewKVMap creates and returns an empty hash map.
@@ -36,13 +29,6 @@ func NewKVMap[K comparable, V any](safe ...bool) *KVMap[K, V] {
 	return NewKVMapFrom(make(map[K]V), safe...)
 }
 
-// NewKVMapWithChecker creates and returns an empty hash map with a custom nil checker.
-// The parameter `checker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether to use the map in concurrent-safety mode, which is false by default.
-func NewKVMapWithChecker[K comparable, V any](checker NilChecker[V], safe ...bool) *KVMap[K, V] {
-	return NewKVMapWithCheckerFrom(make(map[K]V), checker, safe...)
-}
-
 // NewKVMapFrom creates and returns a hash map from given map `data`.
 // Note that, the param `data` map will be set as the underlying data map (no deep copy),
 // there might be some concurrent-safe issues when changing the map outside.
@@ -54,37 +40,6 @@ func NewKVMapFrom[K comparable, V any](data map[K]V, safe ...bool) *KVMap[K, V]
 	return m
 }
 
-// NewKVMapWithCheckerFrom creates and returns a hash map from given map `data` with a custom nil checker.
-// Note that, the param `data` map will be set as the underlying data map (no deep copy),
-// and there might be some concurrent-safe issues when changing the map outside.
-// The parameter `checker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether to use the map in concurrent-safety mode, which is false by default.
-func NewKVMapWithCheckerFrom[K comparable, V any](data map[K]V, checker NilChecker[V], safe ...bool) *KVMap[K, V] {
-	m := NewKVMapFrom[K, V](data, safe...)
-	m.SetNilChecker(checker)
-	return m
-}
-
-// SetNilChecker registers a custom nil checker function for the map values.
-// This function is used to determine if a value should be considered as nil.
-// The nil checker function takes a value of type V and returns a boolean indicating
-// whether the value should be treated as nil.
-func (m *KVMap[K, V]) SetNilChecker(nilChecker NilChecker[V]) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (m *KVMap[K, V]) isNil(v V) bool {
-	if m.nilChecker != nil {
-		return m.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // Iterator iterates the hash map readonly with custom callback function `f`.
 // If `f` returns true, then it continues iterating; or false to stop.
 func (m *KVMap[K, V]) Iterator(f func(k K, v V) bool) {
@@ -245,12 +200,11 @@ func (m *KVMap[K, V]) Pops(size int) map[K]V {
 	return newMap
 }
 
-// doSetWithLockCheck sets value with given `value` if it does not exist,
-// and then returns this value and whether it exists.
+// doSetWithLockCheck checks whether value of the key exists with mutex.Lock,
+// if not exists, set value to the map with given `key`,
+// or else just return the existing value.
 //
-// It is a helper function for GetOrSet* functions.
-//
-// Note that, it does not add the value to the map if the given `value` is nil.
+// It returns value with given `key`.
 func (m *KVMap[K, V]) doSetWithLockCheck(key K, value V) (val V, ok bool) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -262,9 +216,7 @@ func (m *KVMap[K, V]) doSetWithLockCheck(key K, value V) (val V, ok bool) {
 	if v, ok := m.data[key]; ok {
 		return v, true
 	}
-	if !m.isNil(value) {
-		m.data[key] = value
-	}
+	m.data[key] = value
 	return value, false
 }
 
@@ -278,8 +230,6 @@ func (m *KVMap[K, V]) GetOrSet(key K, value V) V {
 // GetOrSetFunc returns the value by key,
 // or sets value with returned value of callback function `f` if it does not exist
 // and then returns this value.
-//
-// Note that, it does not add the value to the map if the returned value of `f` is nil.
 func (m *KVMap[K, V]) GetOrSetFunc(key K, f func() V) V {
 	v, _ := m.doSetWithLockCheck(key, f())
 	return v
@@ -291,8 +241,6 @@ func (m *KVMap[K, V]) GetOrSetFunc(key K, f func() V) V {
 //
 // GetOrSetFuncLock differs with GetOrSetFunc function is that it executes function `f`
 // with mutex.Lock of the hash map.
-//
-// Note that, it does not add the value to the map if the returned value of `f` is nil.
 func (m *KVMap[K, V]) GetOrSetFuncLock(key K, f func() V) V {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -303,9 +251,7 @@ func (m *KVMap[K, V]) GetOrSetFuncLock(key K, f func() V) V {
 		return v
 	}
 	value := f()
-	if !m.isNil(value) {
-		m.data[key] = value
-	}
+	m.data[key] = value
 	return value
 }
 
@@ -532,9 +478,6 @@ func (m *KVMap[K, V]) String() string {
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-// DO NOT change this receiver to pointer type, as the KVMap can be used as a var defined variable, like:
-// var m gmap.KVMap[int, string]
-// Please refer to corresponding tests for more details.
 func (m KVMap[K, V]) MarshalJSON() ([]byte, error) {
 	return json.Marshal(gconv.Map(m.Map()))
 }

container/gmap/gmap_list_k_v_map.go

@@ -27,10 +27,9 @@ import (
 //
 // Reference: http://en.wikipedia.org/wiki/Associative_array
 type ListKVMap[K comparable, V any] struct {
-	mu         rwmutex.RWMutex
-	data       map[K]*glist.TElement[*gListKVMapNode[K, V]]
-	list       *glist.TList[*gListKVMapNode[K, V]]
-	nilChecker NilChecker[V]
+	mu   rwmutex.RWMutex
+	data map[K]*glist.TElement[*gListKVMapNode[K, V]]
+	list *glist.TList[*gListKVMapNode[K, V]]
 }
 
 type gListKVMapNode[K comparable, V any] struct {
@@ -50,16 +49,6 @@ func NewListKVMap[K comparable, V any](safe ...bool) *ListKVMap[K, V] {
 	}
 }
 
-// NewListKVMapWithChecker creates and returns a new ListKVMap instance with a custom nil checker.
-// The parameter `checker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether using map in concurrent-safety,
-// which is false by default.
-func NewListKVMapWithChecker[K comparable, V any](checker NilChecker[V], safe ...bool) *ListKVMap[K, V] {
-	m := NewListKVMap[K, V](safe...)
-	m.SetNilChecker(checker)
-	return m
-}
-
 // NewListKVMapFrom returns a link map from given map `data`.
 // Note that, the param `data` map will be copied to the underlying data structure,
 // so changes to the original map will not affect the link map.
@@ -69,38 +58,6 @@ func NewListKVMapFrom[K comparable, V any](data map[K]V, safe ...bool) *ListKVMa
 	return m
 }
 
-// NewListKVMapWithCheckerFrom returns a link map from given map `data` with a custom nil checker.
-// Note that, the param `data` map will be copied to the underlying data structure,
-// so changes to the original map will not affect the link map.
-// The parameter `checker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether using map in concurrent-safety,
-// which is false by default.
-func NewListKVMapWithCheckerFrom[K comparable, V any](data map[K]V, nilChecker NilChecker[V], safe ...bool) *ListKVMap[K, V] {
-	m := NewListKVMapWithChecker[K, V](nilChecker, safe...)
-	m.Sets(data)
-	return m
-}
-
-// SetNilChecker registers a custom nil checker function for the map values.
-// This function is used to determine if a value should be considered as nil.
-// The nil checker function takes a value of type V and returns a boolean indicating
-// whether the value should be treated as nil.
-func (m *ListKVMap[K, V]) SetNilChecker(nilChecker NilChecker[V]) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (m *ListKVMap[K, V]) isNil(v V) bool {
-	if m.nilChecker != nil {
-		return m.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // Iterator is alias of IteratorAsc.
 func (m *ListKVMap[K, V]) Iterator(f func(key K, value V) bool) {
 	m.IteratorAsc(f)
@@ -325,9 +282,7 @@ func (m *ListKVMap[K, V]) doSetWithLockCheckWithoutLock(key K, value V) V {
 	if e, ok := m.data[key]; ok {
 		return e.Value.value
 	}
-	if !m.isNil(value) {
-		m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
-	}
+	m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
 	return value
 }
 
@@ -370,9 +325,7 @@ func (m *ListKVMap[K, V]) GetOrSetFuncLock(key K, f func() V) V {
 		return e.Value.value
 	}
 	value := f()
-	if !m.isNil(value) {
-		m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
-	}
+	m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
 	return value
 }
 
@@ -402,8 +355,6 @@ func (m *ListKVMap[K, V]) GetVarOrSetFuncLock(key K, f func() V) *gvar.Var {
 
 // SetIfNotExist sets `value` to the map if the `key` does not exist, and then returns true.
 // It returns false if `key` exists, and `value` would be ignored.
-//
-// Note that it does not add the value to the map if `value` is nil.
 func (m *ListKVMap[K, V]) SetIfNotExist(key K, value V) bool {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -415,16 +366,12 @@ func (m *ListKVMap[K, V]) SetIfNotExist(key K, value V) bool {
 	if _, ok := m.data[key]; ok {
 		return false
 	}
-	if !m.isNil(value) {
-		m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
-	}
+	m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
 	return true
 }
 
 // SetIfNotExistFunc sets value with return value of callback function `f`, and then returns true.
 // It returns false if `key` exists, and `value` would be ignored.
-//
-// Note that, it does not add the value to the map if the returned value of `f` is nil.
 func (m *ListKVMap[K, V]) SetIfNotExistFunc(key K, f func() V) bool {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -437,9 +384,7 @@ func (m *ListKVMap[K, V]) SetIfNotExistFunc(key K, f func() V) bool {
 		return false
 	}
 	value := f()
-	if !m.isNil(value) {
-		m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
-	}
+	m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
 	return true
 }
 
@@ -448,8 +393,6 @@ func (m *ListKVMap[K, V]) SetIfNotExistFunc(key K, f func() V) bool {
 //
 // SetIfNotExistFuncLock differs with SetIfNotExistFunc function is that
 // it executes function `f` with mutex.Lock of the map.
-//
-// Note that, it does not add the value to the map if the returned value of `f` is nil.
 func (m *ListKVMap[K, V]) SetIfNotExistFuncLock(key K, f func() V) bool {
 	m.mu.Lock()
 	defer m.mu.Unlock()
@@ -462,9 +405,7 @@ func (m *ListKVMap[K, V]) SetIfNotExistFuncLock(key K, f func() V) bool {
 		return false
 	}
 	value := f()
-	if !m.isNil(value) {
-		m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
-	}
+	m.data[key] = m.list.PushBack(&gListKVMapNode[K, V]{key, value})
 	return true
 }
 
@@ -615,9 +556,6 @@ func (m *ListKVMap[K, V]) String() string {
 }
 
 // MarshalJSON implements the interface MarshalJSON for json.Marshal.
-// DO NOT change this receiver to pointer type, as the ListKVMap can be used as a var defined variable, like:
-// var m gmap.ListKVMap[string]string
-// Please refer to corresponding tests for more details.
 func (m ListKVMap[K, V]) MarshalJSON() (jsonBytes []byte, err error) {
 	if m.data == nil {
 		return []byte("{}"), nil

container/gmap/gmap_z_unit_k_v_map_test.go

@@ -898,7 +898,7 @@ func Test_KVMap_GetOrSet_NilValue(t *testing.T) {
 		v := m.GetOrSet("a", nil)
 		t.Assert(v, nil)
 		// nil interface value should not be stored
-		t.Assert(m.Contains("a"), false)
+		t.Assert(m.Contains("a"), true)
 	})
 }
 
@@ -910,7 +910,7 @@ func Test_KVMap_GetOrSetFunc_NilValue(t *testing.T) {
 		v := m.GetOrSetFunc("a", func() any { return nil })
 		t.Assert(v, nil)
 		// nil interface value should not be stored
-		t.Assert(m.Contains("a"), false)
+		t.Assert(m.Contains("a"), true)
 	})
 }
 
@@ -929,7 +929,7 @@ func Test_KVMap_GetOrSetFuncLock_NilData(t *testing.T) {
 		v := m.GetOrSetFuncLock("a", func() any { return nil })
 		t.Assert(v, nil)
 		// nil interface value should not be stored
-		t.Assert(m.Contains("a"), false)
+		t.Assert(m.Contains("a"), true)
 	})
 }
 
@@ -1637,69 +1637,3 @@ func Test_KVMap_Flip_String(t *testing.T) {
 		t.Assert(m.Get("val2"), "key2")
 	})
 }
-
-// Test TypedNil with custom nil checker for pointers
-func Test_KVMap_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		m1 := gmap.NewKVMap[int, *Student](true)
-		for i := 0; i < 10; i++ {
-			m1.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m1.Size(), 5)
-
-		m2 := gmap.NewKVMap[int, *Student](true)
-		m2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		for i := 0; i < 10; i++ {
-			m2.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m2.Size(), 5)
-	})
-}
-
-func Test_NewKVMapWithChecker_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		m1 := gmap.NewKVMap[int, *Student](true)
-		for i := 0; i < 10; i++ {
-			m1.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m1.Size(), 5)
-
-		m2 := gmap.NewKVMapWithChecker[int, *Student](func(student *Student) bool {
-			return student == nil
-		}, true)
-		for i := 0; i < 10; i++ {
-			m2.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m2.Size(), 5)
-	})
-}

container/gmap/gmap_z_unit_list_k_v_map_race_test.go

@@ -183,6 +183,77 @@ func Test_ListKVMap_SetIfNotExistFuncLock_MultipleKeys(t *testing.T) {
 	})
 }
 
+// Test_ListKVMap_GetOrSetFuncLock_NilValue tests that nil values are handled correctly.
+func Test_ListKVMap_GetOrSetFuncLock_NilValue(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		m := gmap.NewListKVMap[string, *int](true)
+		key := "nilKey"
+		callCount := int32(0)
+
+		var wg sync.WaitGroup
+		goroutines := 50
+		wg.Add(goroutines)
+
+		for i := 0; i < goroutines; i++ {
+			go func() {
+				defer wg.Done()
+				m.GetOrSetFuncLock(key, func() *int {
+					atomic.AddInt32(&callCount, 1)
+					return nil
+				})
+			}()
+		}
+
+		wg.Wait()
+
+		// Callback should be called once
+		t.Assert(atomic.LoadInt32(&callCount), 1)
+		// Typed nil pointer (*int)(nil) is stored because any(value) != nil for typed nil
+		// This is a Go language feature: typed nil is not the same as interface nil
+		t.Assert(m.Contains(key), true)
+		t.Assert(m.Get(key), (*int)(nil))
+		t.Assert(m.Size(), 1)
+	})
+}
+
+// Test_ListKVMap_SetIfNotExistFuncLock_NilValue tests that nil values are handled correctly.
+func Test_ListKVMap_SetIfNotExistFuncLock_NilValue(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		m := gmap.NewListKVMap[string, *string](true)
+		key := "nilKey"
+		callCount := int32(0)
+		successCount := int32(0)
+
+		var wg sync.WaitGroup
+		goroutines := 50
+		wg.Add(goroutines)
+
+		for i := 0; i < goroutines; i++ {
+			go func() {
+				defer wg.Done()
+				success := m.SetIfNotExistFuncLock(key, func() *string {
+					atomic.AddInt32(&callCount, 1)
+					return nil
+				})
+				if success {
+					atomic.AddInt32(&successCount, 1)
+				}
+			}()
+		}
+
+		wg.Wait()
+
+		// Callback should be called once
+		t.Assert(atomic.LoadInt32(&callCount), 1)
+		// Should report success once
+		t.Assert(atomic.LoadInt32(&successCount), 1)
+		// Typed nil pointer (*string)(nil) is stored because any(value) != nil for typed nil
+		t.Assert(m.Contains(key), true)
+		t.Assert(m.Get(key), (*string)(nil))
+		t.Assert(m.Size(), 1)
+	})
+}
+
 // Test_ListKVMap_GetOrSetFuncLock_ExistingKey tests behavior when key already exists.
 func Test_ListKVMap_GetOrSetFuncLock_ExistingKey(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {

container/gmap/gmap_z_unit_list_k_v_map_test.go

@@ -817,7 +817,7 @@ func Test_ListKVMap_GetOrSet_NilValue(t *testing.T) {
 		v := m.GetOrSet("a", nil)
 		t.Assert(v, nil)
 		// nil interface value should not be stored
-		t.Assert(m.Contains("a"), false)
+		t.Assert(m.Contains("a"), true)
 	})
 }
 
@@ -1159,13 +1159,6 @@ func Test_ListKVMap_MarshalJSON_Error(t *testing.T) {
 		t.AssertNil(err)
 		t.Assert(string(b), `{"a":"1"}`)
 	})
-	gtest.C(t, func(t *gtest.T) {
-		var m gmap.ListKVMap[int, int]
-		m.Set(1, 10)
-		b, err := json.Marshal(m)
-		t.AssertNil(err)
-		t.Assert(string(b), `{"1":10}`)
-	})
 }
 
 // Test empty map operations
@@ -1299,7 +1292,7 @@ func Test_ListKVMap_GetOrSetFuncLock_NilData(t *testing.T) {
 		v := m.GetOrSetFuncLock("a", func() any { return nil })
 		t.Assert(v, nil)
 		// nil interface value should not be stored
-		t.Assert(m.Contains("a"), false)
+		t.Assert(m.Contains("a"), true)
 	})
 }
 
@@ -1348,69 +1341,3 @@ func Test_ListKVMap_UnmarshalValue_NilData(t *testing.T) {
 		t.Assert(m.Get("b"), "2")
 	})
 }
-
-// Test typed nil values
-func Test_ListKVMap_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		m1 := gmap.NewListKVMap[int, *Student](true)
-		for i := 0; i < 10; i++ {
-			m1.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m1.Size(), 5)
-
-		m2 := gmap.NewListKVMap[int, *Student](true)
-		m2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		for i := 0; i < 10; i++ {
-			m2.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m2.Size(), 5)
-	})
-}
-
-func Test_NewListKVMapWithChecker_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		m1 := gmap.NewListKVMap[int, *Student](true)
-		for i := 0; i < 10; i++ {
-			m1.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m1.Size(), 5)
-
-		m2 := gmap.NewListKVMapWithChecker[int, *Student](func(student *Student) bool {
-			return student == nil
-		}, true)
-		for i := 0; i < 10; i++ {
-			m2.GetOrSetFuncLock(i, func() *Student {
-				if i%2 == 0 {
-					return &Student{}
-				}
-				return nil
-			})
-		}
-		t.Assert(m2.Size(), 5)
-	})
-}

container/gset/gset_any_set.go

@@ -86,7 +86,7 @@ func (set *Set) AddIfNotExistFunc(item any, f func() bool) bool {
 }
 
 // AddIfNotExistFuncLock checks whether item exists in the set,
-// it adds the item to set and returns true if it does not exists in the set and
+// it adds the item to set and returns true if it does not exist in the set and
 // function `f` returns true, or else it does nothing and returns false.
 //
 // Note that, if `item` is nil, it does nothing and returns false. The function `f`

container/gset/gset_t_set.go

@@ -9,21 +9,16 @@ package gset
 import (
 	"bytes"
 
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// NilChecker is a function that checks whether the given value is nil.
-type NilChecker[T any] func(T) bool
-
-// TSet[T] is consisted of any items.
+// TSet is a generic set implementation that holds unique items of type T.
 type TSet[T comparable] struct {
-	mu         rwmutex.RWMutex
-	data       map[T]struct{}
-	nilChecker NilChecker[T]
+	mu   rwmutex.RWMutex
+	data map[T]struct{}
 }
 
 // NewTSet creates and returns a new set, which contains un-repeated items.
@@ -35,15 +30,6 @@ func NewTSet[T comparable](safe ...bool) *TSet[T] {
 	}
 }
 
-// NewTSetWithChecker creates and returns a new set with a custom nil checker.
-// The parameter `nilChecker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether using set in concurrent-safety mode.
-func NewTSetWithChecker[T comparable](checker NilChecker[T], safe ...bool) *TSet[T] {
-	s := NewTSet[T](safe...)
-	s.SetNilChecker(checker)
-	return s
-}
-
 // NewTSetFrom returns a new set from `items`.
 // `items` - A slice of type T.
 func NewTSetFrom[T comparable](items []T, safe ...bool) *TSet[T] {
@@ -57,36 +43,6 @@ func NewTSetFrom[T comparable](items []T, safe ...bool) *TSet[T] {
 	}
 }
 
-// NewTSetWithCheckerFrom returns a new set from `items` with a custom nil checker.
-// The parameter `items` is a slice of elements to be added to the set.
-// The parameter `checker` is a function used to determine if a value is nil.
-// The parameter `safe` is used to specify whether using set in concurrent-safety mode.
-func NewTSetWithCheckerFrom[T comparable](items []T, checker NilChecker[T], safe ...bool) *TSet[T] {
-	set := NewTSetWithChecker[T](checker, safe...)
-	set.Add(items...)
-	return set
-}
-
-// SetNilChecker registers a custom nil checker function for the set elements.
-// This function is used to determine if an element should be considered as nil.
-// The nil checker function takes an element of type T and returns a boolean indicating
-// whether the element should be treated as nil.
-func (set *TSet[T]) SetNilChecker(nilChecker NilChecker[T]) {
-	set.mu.Lock()
-	defer set.mu.Unlock()
-	set.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (set *TSet[T]) isNil(v T) bool {
-	if set.nilChecker != nil {
-		return set.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // Iterator iterates the set readonly with given callback function `f`,
 // if `f` returns true then continue iterating; or false to stop.
 func (set *TSet[T]) Iterator(f func(v T) bool) {
@@ -110,14 +66,11 @@ func (set *TSet[T]) Add(items ...T) {
 }
 
 // AddIfNotExist checks whether item exists in the set,
-// it adds the item to set and returns true if it does not exist in the set,
+// it adds the item to set and returns true if it does not exists in the set,
 // or else it does nothing and returns false.
 //
 // Note that, if `item` is nil, it does nothing and returns false.
 func (set *TSet[T]) AddIfNotExist(item T) bool {
-	if set.isNil(item) {
-		return false
-	}
 	if !set.Contains(item) {
 		set.mu.Lock()
 		defer set.mu.Unlock()
@@ -139,9 +92,6 @@ func (set *TSet[T]) AddIfNotExist(item T) bool {
 // Note that, if `item` is nil, it does nothing and returns false. The function `f`
 // is executed without writing lock.
 func (set *TSet[T]) AddIfNotExistFunc(item T, f func() bool) bool {
-	if set.isNil(item) {
-		return false
-	}
 	if !set.Contains(item) {
 		if f() {
 			set.mu.Lock()
@@ -159,15 +109,12 @@ func (set *TSet[T]) AddIfNotExistFunc(item T, f func() bool) bool {
 }
 
 // AddIfNotExistFuncLock checks whether item exists in the set,
-// it adds the item to set and returns true if it does not exists in the set and
+// it adds the item to set and returns true if it does not exist in the set and
 // function `f` returns true, or else it does nothing and returns false.
 //
 // Note that, if `item` is nil, it does nothing and returns false. The function `f`
 // is executed within writing lock.
 func (set *TSet[T]) AddIfNotExistFuncLock(item T, f func() bool) bool {
-	if set.isNil(item) {
-		return false
-	}
 	if !set.Contains(item) {
 		set.mu.Lock()
 		defer set.mu.Unlock()

container/gset/gset_z_unit_any_test.go

@@ -419,6 +419,7 @@ func TestSet_AddIfNotExist(t *testing.T) {
 		t.Assert(s.AddIfNotExist(2), true)
 		t.Assert(s.Contains(2), true)
 		t.Assert(s.AddIfNotExist(2), false)
+		t.Assert(s.AddIfNotExist(nil), true)
 		t.Assert(s.AddIfNotExist(nil), false)
 		t.Assert(s.Contains(2), true)
 	})
@@ -497,7 +498,18 @@ func TestSet_AddIfNotExistFuncLock(t *testing.T) {
 	})
 	gtest.C(t, func(t *gtest.T) {
 		s := gset.New(true)
-		t.Assert(s.AddIfNotExistFuncLock(nil, func() bool { return true }), false)
+		t.Assert(
+			s.AddIfNotExistFuncLock(nil, func() bool {
+				return true
+			}),
+			true,
+		)
+		t.Assert(
+			s.AddIfNotExistFuncLock(nil, func() bool {
+				return true
+			}),
+			false,
+		)
 		s1 := gset.Set{}
 		t.Assert(s1.AddIfNotExistFuncLock(1, func() bool { return true }), true)
 	})

container/gset/gset_z_unit_t_set_test.go

@@ -591,42 +591,3 @@ func TestTSet_RLockFunc(t *testing.T) {
 		t.Assert(sum, 6)
 	})
 }
-
-func Test_TSet_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		set := gset.NewTSet[*Student](true)
-		var s *Student = nil
-		exist := set.AddIfNotExist(s)
-		t.Assert(exist, false)
-
-		set2 := gset.NewTSet[*Student](true)
-		set2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		exist2 := set2.AddIfNotExist(s)
-		t.Assert(exist2, false)
-	})
-}
-
-func Test_NewTSetWithChecker_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		set := gset.NewTSet[*Student](true)
-		var s *Student = nil
-		exist := set.AddIfNotExist(s)
-		t.Assert(exist, false)
-
-		set2 := gset.NewTSetWithChecker[*Student](func(student *Student) bool {
-			return student == nil
-		}, true)
-		exist2 := set2.AddIfNotExist(s)
-		t.Assert(exist2, false)
-	})
-}

container/gtree/gtree_k_v_avltree.go

@@ -12,22 +12,17 @@ import (
 	"github.com/emirpasic/gods/v2/trees/avltree"
 
 	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-// NilChecker is a function that checks whether the given value is nil.
-type NilChecker[V any] func(V) bool
-
 // AVLKVTree holds elements of the AVL tree.
 type AVLKVTree[K comparable, V any] struct {
 	mu         rwmutex.RWMutex
 	comparator func(v1, v2 K) int
 	tree       *avltree.Tree[K, V]
-	nilChecker NilChecker[V]
 }
 
 // AVLKVTreeNode is a single element within the tree.
@@ -48,15 +43,6 @@ func NewAVLKVTree[K comparable, V any](comparator func(v1, v2 K) int, safe ...bo
 	}
 }
 
-// NewAVLKVTreeWithChecker instantiates an AVL tree with the custom key comparator and nil checker.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewAVLKVTreeWithChecker[K comparable, V any](comparator func(v1, v2 K) int, checker NilChecker[V], safe ...bool) *AVLKVTree[K, V] {
-	t := NewAVLKVTree[K, V](comparator, safe...)
-	t.SetNilChecker(checker)
-	return t
-}
-
 // NewAVLKVTreeFrom instantiates an AVL tree with the custom key comparator and data map.
 //
 // The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
@@ -68,37 +54,6 @@ func NewAVLKVTreeFrom[K comparable, V any](comparator func(v1, v2 K) int, data m
 	return tree
 }
 
-// NewAVLKVTreeWithCheckerFrom instantiates an AVL tree with the custom key comparator, nil checker and data map.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewAVLKVTreeWithCheckerFrom[K comparable, V any](comparator func(v1, v2 K) int, data map[K]V, checker NilChecker[V], safe ...bool) *AVLKVTree[K, V] {
-	tree := NewAVLKVTreeWithChecker[K, V](comparator, checker, safe...)
-	for k, v := range data {
-		tree.doSet(k, v)
-	}
-	return tree
-}
-
-// SetNilChecker registers a custom nil checker function for the map values.
-// This function is used to determine if a value should be considered as nil.
-// The nil checker function takes a value of type V and returns a boolean indicating
-// whether the value should be treated as nil.
-func (tree *AVLKVTree[K, V]) SetNilChecker(nilChecker NilChecker[V]) {
-	tree.mu.Lock()
-	defer tree.mu.Unlock()
-	tree.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (tree *AVLKVTree[K, V]) isNil(v V) bool {
-	if tree.nilChecker != nil {
-		return tree.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // Clone clones and returns a new tree from current tree.
 func (tree *AVLKVTree[K, V]) Clone() *AVLKVTree[K, V] {
 	if tree == nil {
@@ -563,9 +518,6 @@ func (tree *AVLKVTree[K, V]) Flip(comparator ...func(v1, v2 K) int) {
 //
 // It returns value with given `key`.
 func (tree *AVLKVTree[K, V]) doSet(key K, value V) V {
-	if tree.isNil(value) {
-		return value
-	}
 	tree.tree.Put(key, value)
 	return value
 }

container/gtree/gtree_k_v_btree.go

@@ -12,7 +12,6 @@ import (
 	"github.com/emirpasic/gods/v2/trees/btree"
 
 	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"
@@ -25,7 +24,6 @@ type BKVTree[K comparable, V any] struct {
 	comparator func(v1, v2 K) int
 	m          int // order (maximum number of children)
 	tree       *btree.Tree[K, V]
-	nilChecker NilChecker[V]
 }
 
 // BKVTreeEntry represents the key-value pair contained within nodes.
@@ -47,15 +45,6 @@ func NewBKVTree[K comparable, V any](m int, comparator func(v1, v2 K) int, safe
 	}
 }
 
-// NewBKVTreeWithChecker instantiates a B-tree with `m` (maximum number of children), a custom key comparator and nil checker.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewBKVTreeWithChecker[K comparable, V any](m int, comparator func(v1, v2 K) int, checker NilChecker[V], safe ...bool) *BKVTree[K, V] {
-	t := NewBKVTree[K, V](m, comparator, safe...)
-	t.SetNilChecker(checker)
-	return t
-}
-
 // NewBKVTreeFrom instantiates a B-tree with `m` (maximum number of children), a custom key comparator and data map.
 // The parameter `safe` is used to specify whether using tree in concurrent-safety,
 // which is false in default.
@@ -67,37 +56,6 @@ func NewBKVTreeFrom[K comparable, V any](m int, comparator func(v1, v2 K) int, d
 	return tree
 }
 
-// NewBKVTreeWithCheckerFrom instantiates a B-tree with `m` (maximum number of children), a custom key comparator, nil checker and data map.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewBKVTreeWithCheckerFrom[K comparable, V any](m int, comparator func(v1, v2 K) int, data map[K]V, checker NilChecker[V], safe ...bool) *BKVTree[K, V] {
-	tree := NewBKVTreeWithChecker[K, V](m, comparator, checker, safe...)
-	for k, v := range data {
-		tree.doSet(k, v)
-	}
-	return tree
-}
-
-// SetNilChecker registers a custom nil checker function for the map values.
-// This function is used to determine if a value should be considered as nil.
-// The nil checker function takes a value of type V and returns a boolean indicating
-// whether the value should be treated as nil.
-func (tree *BKVTree[K, V]) SetNilChecker(nilChecker NilChecker[V]) {
-	tree.mu.Lock()
-	defer tree.mu.Unlock()
-	tree.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (tree *BKVTree[K, V]) isNil(v V) bool {
-	if tree.nilChecker != nil {
-		return tree.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // Clone clones and returns a new tree from current tree.
 func (tree *BKVTree[K, V]) Clone() *BKVTree[K, V] {
 	if tree == nil {
@@ -495,9 +453,6 @@ func (tree *BKVTree[K, V]) Right() *BKVTreeEntry[K, V] {
 //
 // It returns value with given `key`.
 func (tree *BKVTree[K, V]) doSet(key K, value V) V {
-	if tree.isNil(value) {
-		return value
-	}
 	tree.tree.Put(key, value)
 	return value
 }

container/gtree/gtree_k_v_redblacktree.go

@@ -12,7 +12,6 @@ import (
 	"github.com/emirpasic/gods/v2/trees/redblacktree"
 
 	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"
@@ -25,7 +24,6 @@ type RedBlackKVTree[K comparable, V any] struct {
 	mu         rwmutex.RWMutex
 	comparator func(v1, v2 K) int
 	tree       *redblacktree.Tree[K, V]
-	nilChecker NilChecker[V]
 }
 
 // RedBlackKVTreeNode is a single element within the tree.
@@ -43,15 +41,6 @@ func NewRedBlackKVTree[K comparable, V any](comparator func(v1, v2 K) int, safe
 	return &tree
 }
 
-// NewRedBlackKVTreeWithChecker instantiates a red-black tree with the custom key comparator and `nilChecker`.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewRedBlackKVTreeWithChecker[K comparable, V any](comparator func(v1, v2 K) int, checker NilChecker[V], safe ...bool) *RedBlackKVTree[K, V] {
-	t := NewRedBlackKVTree[K, V](comparator, safe...)
-	t.SetNilChecker(checker)
-	return t
-}
-
 // NewRedBlackKVTreeFrom instantiates a red-black tree with the custom key comparator and `data` map.
 // The parameter `safe` is used to specify whether using tree in concurrent-safety,
 // which is false in default.
@@ -61,17 +50,6 @@ func NewRedBlackKVTreeFrom[K comparable, V any](comparator func(v1, v2 K) int, d
 	return &tree
 }
 
-// NewRedBlackKVTreeWithCheckerFrom instantiates a red-black tree with the custom key comparator, `data` map and `nilChecker`.
-// The parameter `safe` is used to specify whether using tree in concurrent-safety, which is false in default.
-// The parameter `checker` is used to specify whether the given value is nil.
-func NewRedBlackKVTreeWithCheckerFrom[K comparable, V any](comparator func(v1, v2 K) int, data map[K]V, checker NilChecker[V], safe ...bool) *RedBlackKVTree[K, V] {
-	t := NewRedBlackKVTreeWithChecker[K, V](comparator, checker, safe...)
-	for k, v := range data {
-		t.doSet(k, v)
-	}
-	return t
-}
-
 // RedBlackKVTreeInit instantiates a red-black tree with the custom key comparator.
 // The parameter `safe` is used to specify whether using tree in concurrent-safety,
 // which is false in default.
@@ -97,26 +75,6 @@ func RedBlackKVTreeInitFrom[K comparable, V any](tree *RedBlackKVTree[K, V], com
 	}
 }
 
-// SetNilChecker registers a custom nil checker function for the map values.
-// This function is used to determine if a value should be considered as nil.
-// The nil checker function takes a value of type V and returns a boolean indicating
-// whether the value should be treated as nil.
-func (tree *RedBlackKVTree[K, V]) SetNilChecker(nilChecker NilChecker[V]) {
-	tree.mu.Lock()
-	defer tree.mu.Unlock()
-	tree.nilChecker = nilChecker
-}
-
-// isNil checks whether the given value is nil.
-// It first checks if a custom nil checker function is registered and uses it if available,
-// otherwise it falls back to the default empty.IsNil function.
-func (tree *RedBlackKVTree[K, V]) isNil(v V) bool {
-	if tree.nilChecker != nil {
-		return tree.nilChecker(v)
-	}
-	return empty.IsNil(v)
-}
-
 // SetComparator sets/changes the comparator for sorting.
 func (tree *RedBlackKVTree[K, V]) SetComparator(comparator func(a, b K) int) {
 	tree.comparator = comparator
@@ -634,9 +592,6 @@ func (tree *RedBlackKVTree[K, V]) UnmarshalValue(value any) (err error) {
 //
 // It returns value with given `key`.
 func (tree *RedBlackKVTree[K, V]) doSet(key K, value V) (ret V) {
-	if tree.isNil(value) {
-		return
-	}
 	tree.tree.Put(key, value)
 	return value
 }

container/gtree/gtree_z_k_v_tree_test.go

@@ -1,215 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gtree_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/container/gtree"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gutil"
-)
-
-func Test_KVAVLTree_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		avlTree := gtree.NewAVLKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				avlTree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				avlTree.Set(i, s)
-			}
-		}
-		t.Assert(avlTree.Size(), 5)
-
-		avlTree2 := gtree.NewAVLKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		avlTree2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				avlTree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				avlTree2.Set(i, s)
-			}
-		}
-		t.Assert(avlTree2.Size(), 5)
-
-	})
-}
-
-func Test_KVBTree_TypedNil(t *testing.T) {
-	type Student struct {
-		Name string
-		Age  int
-	}
-	gtest.C(t, func(t *gtest.T) {
-		btree := gtree.NewBKVTree[int, *Student](100, gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				btree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				btree.Set(i, s)
-			}
-		}
-		t.Assert(btree.Size(), 5)
-
-		btree2 := gtree.NewBKVTree[int, *Student](100, gutil.ComparatorTStr[int], true)
-		btree2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				btree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				btree2.Set(i, s)
-			}
-		}
-		t.Assert(btree2.Size(), 5)
-	})
-
-}
-
-func Test_KVRedBlackTree_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		redBlackTree := gtree.NewRedBlackKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				redBlackTree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				redBlackTree.Set(i, s)
-			}
-		}
-		t.Assert(redBlackTree.Size(), 5)
-
-		redBlackTree2 := gtree.NewRedBlackKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		redBlackTree2.SetNilChecker(func(student *Student) bool {
-			return student == nil
-		})
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				redBlackTree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				redBlackTree2.Set(i, s)
-			}
-		}
-		t.Assert(redBlackTree2.Size(), 5)
-	})
-}
-
-func Test_NewKVAVLTreeWithChecker_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		avlTree := gtree.NewAVLKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				avlTree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				avlTree.Set(i, s)
-			}
-		}
-		t.Assert(avlTree.Size(), 5)
-
-		avlTree2 := gtree.NewAVLKVTreeWithChecker[int, *Student](gutil.ComparatorTStr[int], func(student *Student) bool {
-			return student == nil
-		}, true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				avlTree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				avlTree2.Set(i, s)
-			}
-		}
-		t.Assert(avlTree2.Size(), 5)
-
-	})
-}
-
-func Test_NewKVBTreeWithChecker_TypedNil(t *testing.T) {
-	type Student struct {
-		Name string
-		Age  int
-	}
-	gtest.C(t, func(t *gtest.T) {
-		btree := gtree.NewBKVTree[int, *Student](100, gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				btree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				btree.Set(i, s)
-			}
-		}
-		t.Assert(btree.Size(), 5)
-
-		btree2 := gtree.NewBKVTreeWithChecker[int, *Student](100, gutil.ComparatorTStr[int], func(student *Student) bool {
-			return student == nil
-		}, true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				btree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				btree2.Set(i, s)
-			}
-		}
-		t.Assert(btree2.Size(), 5)
-	})
-
-}
-
-func Test_NewRedBlackKVTreeWithChecker_TypedNil(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		type Student struct {
-			Name string
-			Age  int
-		}
-		redBlackTree := gtree.NewRedBlackKVTree[int, *Student](gutil.ComparatorTStr[int], true)
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				redBlackTree.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				redBlackTree.Set(i, s)
-			}
-		}
-		t.Assert(redBlackTree.Size(), 5)
-
-		redBlackTree2 := gtree.NewRedBlackKVTreeWithChecker[int, *Student](gutil.ComparatorTStr[int], func(student *Student) bool {
-			return student == nil
-		}, true)
-
-		for i := 0; i < 10; i++ {
-			if i%2 == 0 {
-				redBlackTree2.Set(i, &Student{})
-			} else {
-				var s *Student = nil
-				redBlackTree2.Set(i, s)
-			}
-		}
-		t.Assert(redBlackTree2.Size(), 5)
-	})
-}

contrib/config/apollo/go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/apolloconfig/agollo/v4 v4.3.1
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 )
 
 require (

contrib/config/consul/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2
 go 1.23.0
 
 require (
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/hashicorp/consul/api v1.24.0
 	github.com/hashicorp/go-cleanhttp v0.5.2
 )

contrib/config/kubecm/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2
 go 1.24.0
 
 require (
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	k8s.io/api v0.33.4
 	k8s.io/apimachinery v0.33.4
 	k8s.io/client-go v0.33.4

contrib/config/nacos/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2
 go 1.23.0
 
 require (
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/nacos-group/nacos-sdk-go/v2 v2.3.3
 )
 

contrib/config/polaris/go.mod

@@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2
 go 1.23.0
 
 require (
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/polarismesh/polaris-go v1.6.1
 )
 

contrib/drivers/clickhouse/go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.0.15
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/google/uuid v1.6.0
 	github.com/shopspring/decimal v1.3.1
 )

contrib/drivers/dm/go.mod

@@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../
 
 require (
 	gitee.com/chunanyong/dm v1.8.12
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 )
 
 require (

contrib/drivers/gaussdb/gaussdb_z_unit_feature_ctx_test.go

@@ -1,102 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Ctx(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		db, err := gdb.Instance()
-		t.AssertNil(err)
-
-		err1 := db.PingMaster()
-		err2 := db.PingSlave()
-		t.Assert(err1, nil)
-		t.Assert(err2, nil)
-
-		newDb := db.Ctx(context.Background())
-		t.AssertNE(newDb, nil)
-	})
-}
-
-func Test_Ctx_Query(t *testing.T) {
-	db.GetLogger().(*glog.Logger).SetCtxKeys("SpanId", "TraceId")
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		ctx := context.WithValue(context.Background(), "TraceId", "12345678")
-		ctx = context.WithValue(ctx, "SpanId", "0.1")
-		db.Query(ctx, "select 1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		db.Query(ctx, "select 2")
-	})
-}
-
-func Test_Ctx_Model(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	db.GetLogger().(*glog.Logger).SetCtxKeys("SpanId", "TraceId")
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		ctx := context.WithValue(context.Background(), "TraceId", "12345678")
-		ctx = context.WithValue(ctx, "SpanId", "0.1")
-		db.Model(table).Ctx(ctx).All()
-	})
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		db.Model(table).All()
-	})
-}
-
-func Test_Ctx_Transaction(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	db.GetLogger().(*glog.Logger).SetCtxKeys("SpanId", "TraceId")
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		ctx := context.WithValue(context.Background(), "TraceId", "tx_trace_123")
-		ctx = context.WithValue(ctx, "SpanId", "0.2")
-
-		err := db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			_, err := tx.Model(table).Ctx(ctx).Where("id", 1).One()
-			return err
-		})
-		t.AssertNil(err)
-	})
-}
-
-func Test_Ctx_Timeout(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*10)
-		defer cancel()
-
-		// Wait for the context to expire
-		time.Sleep(time.Millisecond * 50)
-
-		// Query with expired context should return error
-		_, err := db.Model(table).Ctx(ctx).All()
-		t.AssertNE(err, nil)
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_hook_test.go

@@ -1,216 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"context"
-	"database/sql"
-	"fmt"
-	"testing"
-
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Model_Hook_Select(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Select: func(ctx context.Context, in *gdb.HookSelectInput) (result gdb.Result, err error) {
-				result, err = in.Next(ctx)
-				if err != nil {
-					return
-				}
-				for i, record := range result {
-					record["test"] = gvar.New(100 + record["id"].Int())
-					result[i] = record
-				}
-				return
-			},
-		})
-		all, err := m.Where("id > ?", 6).OrderAsc("id").All()
-		t.AssertNil(err)
-		t.Assert(len(all), 4)
-		t.Assert(all[0]["id"].Int(), 7)
-		t.Assert(all[0]["test"].Int(), 107)
-		t.Assert(all[1]["test"].Int(), 108)
-		t.Assert(all[2]["test"].Int(), 109)
-		t.Assert(all[3]["test"].Int(), 110)
-	})
-}
-
-func Test_Model_Hook_Insert(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Insert: func(ctx context.Context, in *gdb.HookInsertInput) (result sql.Result, err error) {
-				for i, item := range in.Data {
-					item["passport"] = fmt.Sprintf(`test_port_%d`, item["id"])
-					item["nickname"] = fmt.Sprintf(`test_name_%d`, item["id"])
-					item["password"] = fmt.Sprintf(`test_pass_%d`, item["id"])
-					item["create_time"] = CreateTime
-					in.Data[i] = item
-				}
-				return in.Next(ctx)
-			},
-		})
-		_, err := m.Insert(g.Map{
-			"id":       1,
-			"nickname": "name_1",
-		})
-		t.AssertNil(err)
-		one, err := m.One()
-		t.AssertNil(err)
-		t.Assert(one["id"].Int(), 1)
-		t.Assert(one["passport"], `test_port_1`)
-		t.Assert(one["nickname"], `test_name_1`)
-	})
-}
-
-func Test_Model_Hook_Update(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Update: func(ctx context.Context, in *gdb.HookUpdateInput) (result sql.Result, err error) {
-				switch value := in.Data.(type) {
-				case gdb.List:
-					for i, data := range value {
-						data["passport"] = `port`
-						data["nickname"] = `name`
-						value[i] = data
-					}
-					in.Data = value
-
-				case gdb.Map:
-					value["passport"] = `port`
-					value["nickname"] = `name`
-					in.Data = value
-				}
-				return in.Next(ctx)
-			},
-		})
-		_, err := m.Data(g.Map{
-			"nickname": "name_1",
-		}).WherePri(1).Update()
-		t.AssertNil(err)
-
-		one, err := m.One()
-		t.AssertNil(err)
-		t.Assert(one["id"].Int(), 1)
-		t.Assert(one["passport"], `port`)
-		t.Assert(one["nickname"], `name`)
-	})
-}
-
-func Test_Model_Hook_Delete(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Delete: func(ctx context.Context, in *gdb.HookDeleteInput) (result sql.Result, err error) {
-				return db.Model(table).Data(g.Map{
-					"nickname": `deleted`,
-				}).Where(in.Condition).Update()
-			},
-		})
-		_, err := m.Where("1=1").Delete()
-		t.AssertNil(err)
-
-		all, err := m.All()
-		t.AssertNil(err)
-		for _, item := range all {
-			t.Assert(item["nickname"].String(), `deleted`)
-		}
-	})
-}
-
-func Test_Model_Hook_Select_Count(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Select: func(ctx context.Context, in *gdb.HookSelectInput) (result gdb.Result, err error) {
-				result, err = in.Next(ctx)
-				if err != nil {
-					return
-				}
-				// Adding extra fields should not affect Count operations
-				for i, record := range result {
-					record["extra"] = gvar.New("extra_value")
-					result[i] = record
-				}
-				return
-			},
-		})
-		count, err := m.Count()
-		t.AssertNil(err)
-		t.Assert(count, TableSize)
-	})
-}
-
-func Test_Model_Hook_Chain(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	// Normal chain: two hooks both modify data
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Select: func(ctx context.Context, in *gdb.HookSelectInput) (result gdb.Result, err error) {
-				result, err = in.Next(ctx)
-				if err != nil {
-					return
-				}
-				for i, record := range result {
-					record["hook1"] = gvar.New("value1")
-					result[i] = record
-				}
-				return
-			},
-		}).Hook(gdb.HookHandler{
-			Select: func(ctx context.Context, in *gdb.HookSelectInput) (result gdb.Result, err error) {
-				result, err = in.Next(ctx)
-				if err != nil {
-					return
-				}
-				for i, record := range result {
-					record["hook2"] = gvar.New("value2")
-					result[i] = record
-				}
-				return
-			},
-		})
-		all, err := m.Where("id", 1).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 1)
-		t.Assert(all[0]["id"].Int(), 1)
-		// The last Hook should take effect (Hook replaces previous one)
-		t.Assert(all[0]["hook2"].String(), "value2")
-	})
-
-	// Error chain: hook returns error
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table).Hook(gdb.HookHandler{
-			Select: func(ctx context.Context, in *gdb.HookSelectInput) (result gdb.Result, err error) {
-				return nil, gerror.New("hook error")
-			},
-		})
-		_, err := m.Where("id", 1).All()
-		t.AssertNE(err, nil)
-		t.Assert(err.Error(), "hook error")
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_model_builder_test.go

@@ -1,141 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gmeta"
-)
-
-func Test_Model_Builder(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		all, err := m.Where(
-			b.Where("id", g.Slice{1, 2, 3}).WhereOr("id", g.Slice{4, 5, 6}),
-		).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 6)
-	})
-
-	// Where And
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		all, err := m.Where(
-			b.Where("id", g.Slice{1, 2, 3}).WhereOr("id", g.Slice{4, 5, 6}),
-		).Where(
-			b.Where("id", g.Slice{2, 3}).WhereOr("id", g.Slice{5, 6}),
-		).Where(
-			b.Where("id", g.Slice{3}).Where("id", g.Slice{1, 2, 3}),
-		).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 1)
-	})
-
-	// Where Or
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		all, err := m.WhereOr(
-			b.Where("id", g.Slice{1, 2, 3}).WhereOr("id", g.Slice{4, 5, 6}),
-		).WhereOr(
-			b.Where("id", g.Slice{2, 3}).WhereOr("id", g.Slice{5, 6}),
-		).WhereOr(
-			b.Where("id", g.Slice{3}).Where("id", g.Slice{1, 2, 3}),
-		).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 6)
-	})
-
-	// Where with struct which has a field type of *gtime.Time
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		type Query struct {
-			Id       any
-			Nickname *gtime.Time
-		}
-
-		where, args := b.Where(&Query{Id: 1}).Build()
-		t.Assert(where, `"id"=? AND "nickname" IS NULL`)
-		t.Assert(args, []any{1})
-	})
-
-	// Where with struct which has a field type of *gjson.Json
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		type Query struct {
-			Id       any
-			Nickname *gjson.Json
-		}
-
-		where, args := b.Where(&Query{Id: 1}).Build()
-		t.Assert(where, `"id"=? AND "nickname" IS NULL`)
-		t.Assert(args, []any{1})
-	})
-
-	// Where with do struct which has a field type of *gtime.Time and generated by gf cli
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		type Query struct {
-			gmeta.Meta `orm:"do:true"`
-			Id         any
-			Nickname   *gtime.Time
-		}
-
-		where, args := b.Where(&Query{Id: 1}).Build()
-		t.Assert(where, `"id"=?`)
-		t.Assert(args, []any{1})
-	})
-
-	// Where with do struct which has a field type of *gjson.Json and generated by gf cli
-	gtest.C(t, func(t *gtest.T) {
-		m := db.Model(table)
-		b := m.Builder()
-
-		type Query struct {
-			gmeta.Meta `orm:"do:true"`
-			Id         any
-			Nickname   *gjson.Json
-		}
-
-		where, args := b.Where(&Query{Id: 1}).Build()
-		t.Assert(where, `"id"=?`)
-		t.Assert(args, []any{1})
-	})
-}
-
-func Test_Safe_Builder(t *testing.T) {
-	// test whether m.Builder() is chain safe
-	gtest.C(t, func(t *gtest.T) {
-		b := db.Model().Builder()
-		b.Where("id", 1)
-		_, args := b.Build()
-		t.AssertNil(args)
-
-		b = b.Where("id", 1)
-		_, args = b.Build()
-		t.Assert(args, g.Slice{1})
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_model_do_test.go

@@ -1,410 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-// createTableDO creates a table with nullable columns (no NOT NULL constraints)
-// suitable for DO (Data Object) partial insert tests.
-func createTableDO(table ...string) (name string) {
-	if len(table) > 0 {
-		name = table[0]
-	} else {
-		name = fmt.Sprintf(`%s_%d`, TablePrefix+"do_test", gtime.TimestampNano())
-	}
-	dropTable(name)
-	if _, err := db.Exec(ctx, fmt.Sprintf(`
-		CREATE TABLE %s (
-			id bigserial NOT NULL,
-			passport varchar(45) DEFAULT '',
-			password varchar(32) DEFAULT '',
-			nickname varchar(45) DEFAULT '',
-			create_time timestamp DEFAULT NULL,
-			PRIMARY KEY (id)
-		);`, name,
-	)); err != nil {
-		gtest.Fatal(err)
-	}
-	return
-}
-
-func Test_Model_Insert_Data_DO(t *testing.T) {
-	table := createTableDO()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type User struct {
-			g.Meta     `orm:"do:true"`
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := User{
-			Id:       1,
-			Passport: "user_1",
-			Password: "pass_1",
-		}
-		result, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 1)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], ``)
-	})
-}
-
-func Test_Model_Insert_Data_List_DO(t *testing.T) {
-	table := createTableDO()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type User struct {
-			g.Meta     `orm:"do:true"`
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := g.Slice{
-			User{
-				Id:       1,
-				Passport: "user_1",
-				Password: "pass_1",
-			},
-			User{
-				Id:       2,
-				Passport: "user_2",
-				Password: "pass_2",
-			},
-		}
-		result, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 2)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], ``)
-
-		one, err = db.Model(table).WherePri(2).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 2)
-		t.Assert(one[`passport`], `user_2`)
-		t.Assert(one[`password`], `pass_2`)
-		t.Assert(one[`nickname`], ``)
-	})
-}
-
-func Test_Model_Update_Data_DO(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type User struct {
-			g.Meta     `orm:"do:true"`
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := User{
-			Id:       1,
-			Passport: "user_100",
-			Password: "pass_100",
-		}
-		_, err := db.Model(table).Data(data).WherePri(1).Update()
-		t.AssertNil(err)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_100`)
-		t.Assert(one[`password`], `pass_100`)
-		t.Assert(one[`nickname`], `name_1`)
-	})
-}
-
-func Test_Model_Update_Pointer_Data_DO(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type NN string
-		type Req struct {
-			Id       int
-			Passport *string
-			Password *string
-			Nickname *NN
-		}
-		type UserDo struct {
-			g.Meta     `orm:"do:true"`
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		var (
-			nickname = NN("nickname_111")
-			req      = Req{
-				Password: gconv.PtrString("12345678"),
-				Nickname: &nickname,
-			}
-			data = UserDo{
-				Passport: req.Passport,
-				Password: req.Password,
-				Nickname: req.Nickname,
-			}
-		)
-
-		_, err := db.Model(table).Data(data).WherePri(1).Update()
-		t.AssertNil(err)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`password`], `12345678`)
-		t.Assert(one[`nickname`], `nickname_111`)
-	})
-}
-
-func Test_Model_Where_DO(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type User struct {
-			g.Meta     `orm:"do:true"`
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		where := User{
-			Id:       1,
-			Passport: "user_1",
-			Password: "pass_1",
-		}
-		one, err := db.Model(table).Where(where).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], `name_1`)
-	})
-}
-
-func Test_Model_Insert_Data_ForDao(t *testing.T) {
-	table := createTableDO()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type UserForDao struct {
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := UserForDao{
-			Id:       1,
-			Passport: "user_1",
-			Password: "pass_1",
-		}
-		result, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 1)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], ``)
-	})
-}
-
-func Test_Model_Insert_Data_List_ForDao(t *testing.T) {
-	table := createTableDO()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type UserForDao struct {
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := g.Slice{
-			UserForDao{
-				Id:       1,
-				Passport: "user_1",
-				Password: "pass_1",
-			},
-			UserForDao{
-				Id:       2,
-				Passport: "user_2",
-				Password: "pass_2",
-			},
-		}
-		result, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 2)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], ``)
-
-		one, err = db.Model(table).WherePri(2).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 2)
-		t.Assert(one[`passport`], `user_2`)
-		t.Assert(one[`password`], `pass_2`)
-		t.Assert(one[`nickname`], ``)
-	})
-}
-
-func Test_Model_Update_Data_ForDao(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type UserForDao struct {
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		data := UserForDao{
-			Id:       1,
-			Passport: "user_100",
-			Password: "pass_100",
-		}
-		_, err := db.Model(table).Data(data).WherePri(1).Update()
-		t.AssertNil(err)
-
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_100`)
-		t.Assert(one[`password`], `pass_100`)
-		t.Assert(one[`nickname`], `name_1`)
-	})
-}
-
-func Test_Model_Where_ForDao(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type UserForDao struct {
-			Id         any
-			Passport   any
-			Password   any
-			Nickname   any
-			CreateTime any
-		}
-		where := UserForDao{
-			Id:       1,
-			Passport: "user_1",
-			Password: "pass_1",
-		}
-		one, err := db.Model(table).Where(where).One()
-		t.AssertNil(err)
-		t.Assert(one[`id`], 1)
-		t.Assert(one[`passport`], `user_1`)
-		t.Assert(one[`password`], `pass_1`)
-		t.Assert(one[`nickname`], `name_1`)
-	})
-}
-
-func Test_Model_Where_FieldPrefix(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		array := gstr.SplitAndTrim(gtest.DataContent(`table_with_prefix.sql`), ";")
-		for _, v := range array {
-			if _, err := db.Exec(ctx, v); err != nil {
-				gtest.Error(err)
-			}
-		}
-		defer dropTable("instance")
-
-		type Instance struct {
-			ID   int `orm:"f_id"`
-			Name string
-		}
-
-		type InstanceDo struct {
-			g.Meta `orm:"table:instance, do:true"`
-			ID     any `orm:"f_id"`
-		}
-		var instance *Instance
-		err := db.Model("instance").Where(InstanceDo{
-			ID: 1,
-		}).Scan(&instance)
-		t.AssertNil(err)
-		t.AssertNE(instance, nil)
-		t.Assert(instance.ID, 1)
-		t.Assert(instance.Name, "john")
-	})
-	// With omitempty.
-	gtest.C(t, func(t *gtest.T) {
-		array := gstr.SplitAndTrim(gtest.DataContent(`table_with_prefix.sql`), ";")
-		for _, v := range array {
-			if _, err := db.Exec(ctx, v); err != nil {
-				gtest.Error(err)
-			}
-		}
-		defer dropTable("instance")
-
-		type Instance struct {
-			ID   int `orm:"f_id,omitempty"`
-			Name string
-		}
-
-		type InstanceDo struct {
-			g.Meta `orm:"table:instance, do:true"`
-			ID     any `orm:"f_id,omitempty"`
-		}
-		var instance *Instance
-		err := db.Model("instance").Where(InstanceDo{
-			ID: 1,
-		}).Scan(&instance)
-		t.AssertNil(err)
-		t.AssertNE(instance, nil)
-		t.Assert(instance.ID, 1)
-		t.Assert(instance.Name, "john")
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_model_join_test.go

@@ -1,177 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Model_LeftJoinOnField(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			LeftJoinOnField(table2, "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_RightJoinOnField(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			RightJoinOnField(table2, "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_InnerJoinOnField(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			InnerJoinOnField(table2, "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_LeftJoinOnFields(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			LeftJoinOnFields(table2, "id", "=", "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_RightJoinOnFields(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			RightJoinOnFields(table2, "id", "=", "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_InnerJoinOnFields(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "*").
-			InnerJoinOnFields(table2, "id", "=", "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 2)
-	})
-}
-
-func Test_Model_FieldsPrefix(t *testing.T) {
-	var (
-		table1 = "t_" + gtime.TimestampNanoStr() + "_table1"
-		table2 = "t_" + gtime.TimestampNanoStr() + "_table2"
-	)
-	createInitTable(table1)
-	defer dropTable(table1)
-	createInitTable(table2)
-	defer dropTable(table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table1).
-			FieldsPrefix(table1, "id").
-			FieldsPrefix(table2, "nickname").
-			LeftJoinOnField(table2, "id").
-			WhereIn("id", g.Slice{1, 2}).
-			Order("id asc").All()
-		t.AssertNil(err)
-		t.Assert(len(r), 2)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[0]["nickname"], "name_1")
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_model_struct_test.go

@@ -1,477 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"database/sql"
-	"reflect"
-	"testing"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-func Test_Model_Embedded_Insert(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type Base struct {
-			Id         int    `json:"id"`
-			CreateTime string `json:"create_time"`
-		}
-		type User struct {
-			Base
-			Passport string `json:"passport"`
-			Password string `json:"password"`
-			Nickname string `json:"nickname"`
-		}
-		result, err := db.Model(table).Data(User{
-			Passport: "john-test",
-			Password: "123456",
-			Nickname: "John",
-			Base: Base{
-				Id:         100,
-				CreateTime: gtime.Now().String(),
-			},
-		}).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 1)
-		value, err := db.Model(table).Fields("passport").Where("id=100").Value()
-		t.AssertNil(err)
-		t.Assert(value.String(), "john-test")
-	})
-}
-
-func Test_Model_Embedded_MapToStruct(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		type Ids struct {
-			Id int `json:"id"`
-		}
-		type Base struct {
-			Ids
-			CreateTime string `json:"create_time"`
-		}
-		type User struct {
-			Base
-			Passport string `json:"passport"`
-			Password string `json:"password"`
-			Nickname string `json:"nickname"`
-		}
-		data := g.Map{
-			"id":          100,
-			"passport":    "t1",
-			"password":    "123456",
-			"nickname":    "T1",
-			"create_time": gtime.Now().String(),
-		}
-		result, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 1)
-
-		one, err := db.Model(table).Where("id=100").One()
-		t.AssertNil(err)
-
-		user := new(User)
-
-		t.Assert(one.Struct(user), nil)
-		t.Assert(user.Id, data["id"])
-		t.Assert(user.Passport, data["passport"])
-		t.Assert(user.Password, data["password"])
-		t.Assert(user.Nickname, data["nickname"])
-		t.Assert(user.CreateTime, data["create_time"])
-	})
-}
-
-func Test_Struct_Pointer_Attribute(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	type User struct {
-		Id       *int
-		Passport *string
-		Password *string
-		Nickname string
-	}
-
-	gtest.C(t, func(t *gtest.T) {
-		one, err := db.Model(table).WherePri(1).One()
-		t.AssertNil(err)
-		user := new(User)
-		err = one.Struct(user)
-		t.AssertNil(err)
-		t.Assert(*user.Id, 1)
-		t.Assert(*user.Passport, "user_1")
-		t.Assert(*user.Password, "pass_1")
-		t.Assert(user.Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		user := new(User)
-		err := db.Model(table).Scan(user, "id=1")
-		t.AssertNil(err)
-		t.Assert(*user.Id, 1)
-		t.Assert(*user.Passport, "user_1")
-		t.Assert(*user.Password, "pass_1")
-		t.Assert(user.Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var user *User
-		err := db.Model(table).Scan(&user, "id=1")
-		t.AssertNil(err)
-		t.Assert(*user.Id, 1)
-		t.Assert(*user.Passport, "user_1")
-		t.Assert(*user.Password, "pass_1")
-		t.Assert(user.Nickname, "name_1")
-	})
-}
-
-func Test_Structs_Pointer_Attribute(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	type User struct {
-		Id       *int
-		Passport *string
-		Password *string
-		Nickname string
-	}
-	// All
-	gtest.C(t, func(t *gtest.T) {
-		one, err := db.Model(table).All("id < 3")
-		t.AssertNil(err)
-		users := make([]User, 0)
-		err = one.Structs(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		one, err := db.Model(table).All("id < 3")
-		t.AssertNil(err)
-		users := make([]*User, 0)
-		err = one.Structs(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var users []User
-		one, err := db.Model(table).All("id < 3")
-		t.AssertNil(err)
-		err = one.Structs(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var users []*User
-		one, err := db.Model(table).All("id < 3")
-		t.AssertNil(err)
-		err = one.Structs(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	// Structs
-	gtest.C(t, func(t *gtest.T) {
-		users := make([]User, 0)
-		err := db.Model(table).Scan(&users, "id < 3")
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		users := make([]*User, 0)
-		err := db.Model(table).Scan(&users, "id < 3")
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var users []User
-		err := db.Model(table).Scan(&users, "id < 3")
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var users []*User
-		err := db.Model(table).Scan(&users, "id < 3")
-		t.AssertNil(err)
-		t.Assert(len(users), 2)
-		t.Assert(*users[0].Id, 1)
-		t.Assert(*users[0].Passport, "user_1")
-		t.Assert(*users[0].Password, "pass_1")
-		t.Assert(users[0].Nickname, "name_1")
-	})
-}
-
-func Test_Struct_Empty(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	type User struct {
-		Id       int
-		Passport string
-		Password string
-		Nickname string
-	}
-
-	gtest.C(t, func(t *gtest.T) {
-		user := new(User)
-		err := db.Model(table).Where("id=100").Scan(user)
-		t.Assert(err, sql.ErrNoRows)
-		t.AssertNE(user, nil)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		one, err := db.Model(table).Where("id=100").One()
-		t.AssertNil(err)
-		var user *User
-		t.Assert(one.Struct(&user), nil)
-		t.Assert(user, nil)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		var user *User
-		err := db.Model(table).Where("id=100").Scan(&user)
-		t.AssertNil(err)
-		t.Assert(user, nil)
-	})
-}
-
-func Test_Structs_Empty(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	type User struct {
-		Id       int
-		Passport string
-		Password string
-		Nickname string
-	}
-
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		users := make([]User, 0)
-		t.Assert(all.Structs(&users), nil)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		users := make([]User, 10)
-		t.Assert(all.Structs(&users), sql.ErrNoRows)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		var users []User
-		t.Assert(all.Structs(&users), nil)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		users := make([]*User, 0)
-		t.Assert(all.Structs(&users), nil)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		users := make([]*User, 10)
-		t.Assert(all.Structs(&users), sql.ErrNoRows)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		all, err := db.Model(table).Where("id>100").All()
-		t.AssertNil(err)
-		var users []*User
-		t.Assert(all.Structs(&users), nil)
-	})
-}
-
-type MyTime struct {
-	gtime.Time
-}
-
-type MyTimeSt struct {
-	CreateTime MyTime
-}
-
-func (st *MyTimeSt) UnmarshalValue(v any) error {
-	m := gconv.Map(v)
-	t, err := gtime.StrToTime(gconv.String(m["create_time"]))
-	if err != nil {
-		return err
-	}
-	st.CreateTime = MyTime{*t}
-	return nil
-}
-
-func Test_Model_Scan_CustomType_Time(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	gtest.C(t, func(t *gtest.T) {
-		st := new(MyTimeSt)
-		err := db.Model(table).Fields("create_time").Scan(st)
-		t.AssertNil(err)
-		t.Assert(st.CreateTime.String(), "2018-10-24 10:00:00")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var stSlice []*MyTimeSt
-		err := db.Model(table).Fields("create_time").Scan(&stSlice)
-		t.AssertNil(err)
-		t.Assert(len(stSlice), TableSize)
-		t.Assert(stSlice[0].CreateTime.String(), "2018-10-24 10:00:00")
-		t.Assert(stSlice[9].CreateTime.String(), "2018-10-24 10:00:00")
-	})
-}
-
-func Test_Model_Scan_CustomType_String(t *testing.T) {
-	type MyString string
-
-	type MyStringSt struct {
-		Passport MyString
-	}
-
-	table := createInitTable()
-	defer dropTable(table)
-	gtest.C(t, func(t *gtest.T) {
-		st := new(MyStringSt)
-		err := db.Model(table).Fields("Passport").WherePri(1).Scan(st)
-		t.AssertNil(err)
-		t.Assert(st.Passport, "user_1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var sts []MyStringSt
-		err := db.Model(table).Fields("Passport").Order("id asc").Scan(&sts)
-		t.AssertNil(err)
-		t.Assert(len(sts), TableSize)
-		t.Assert(sts[0].Passport, "user_1")
-	})
-}
-
-type User struct {
-	Id         int
-	Passport   string
-	Password   string
-	Nickname   string
-	CreateTime *gtime.Time
-}
-
-func (user *User) UnmarshalValue(value any) error {
-	if record, ok := value.(gdb.Record); ok {
-		*user = User{
-			Id:         record["id"].Int(),
-			Passport:   record["passport"].String(),
-			Password:   "",
-			Nickname:   record["nickname"].String(),
-			CreateTime: record["create_time"].GTime(),
-		}
-		return nil
-	}
-	return gerror.NewCodef(gcode.CodeInvalidParameter, `unsupported value type for UnmarshalValue: %v`, reflect.TypeOf(value))
-}
-
-func Test_Model_Scan_UnmarshalValue(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	gtest.C(t, func(t *gtest.T) {
-		var users []*User
-		err := db.Model(table).Order("id asc").Scan(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), TableSize)
-		t.Assert(users[0].Id, 1)
-		t.Assert(users[0].Passport, "user_1")
-		t.Assert(users[0].Password, "")
-		t.Assert(users[0].Nickname, "name_1")
-		t.Assert(users[0].CreateTime.String(), CreateTime)
-
-		t.Assert(users[9].Id, 10)
-		t.Assert(users[9].Passport, "user_10")
-		t.Assert(users[9].Password, "")
-		t.Assert(users[9].Nickname, "name_10")
-		t.Assert(users[9].CreateTime.String(), CreateTime)
-	})
-}
-
-func Test_Model_Scan_Map(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var users []*User
-		err := db.Model(table).Order("id asc").Scan(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), TableSize)
-		t.Assert(users[0].Id, 1)
-		t.Assert(users[0].Passport, "user_1")
-		t.Assert(users[0].Password, "")
-		t.Assert(users[0].Nickname, "name_1")
-		t.Assert(users[0].CreateTime.String(), CreateTime)
-
-		t.Assert(users[9].Id, 10)
-		t.Assert(users[9].Passport, "user_10")
-		t.Assert(users[9].Password, "")
-		t.Assert(users[9].Nickname, "name_10")
-		t.Assert(users[9].CreateTime.String(), CreateTime)
-	})
-}
-
-func Test_Scan_AutoFilteringByStructAttributes(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	type User struct {
-		Id       int
-		Passport string
-	}
-	gtest.C(t, func(t *gtest.T) {
-		var user *User
-		err := db.Model(table).OrderAsc("id").Scan(&user)
-		t.AssertNil(err)
-		t.Assert(user.Id, 1)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		var users []User
-		err := db.Model(table).OrderAsc("id").Scan(&users)
-		t.AssertNil(err)
-		t.Assert(len(users), TableSize)
-		t.Assert(users[0].Id, 1)
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_model_subquery_test.go

@@ -1,66 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Model_SubQuery_Where(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).Where(
-			"id in ?",
-			db.Model(table).Fields("id").Where("id", g.Slice{1, 3, 5}),
-		).OrderAsc("id").All()
-		t.AssertNil(err)
-
-		t.Assert(len(r), 3)
-		t.Assert(r[0]["id"], 1)
-		t.Assert(r[1]["id"], 3)
-		t.Assert(r[2]["id"], 5)
-	})
-}
-
-func Test_Model_SubQuery_Having(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).Where(
-			"id in ?",
-			db.Model(table).Fields("id").Where("id", g.Slice{1, 3, 5}),
-		).Group("id").Having(
-			"id > ?",
-			db.Model(table).Fields("MAX(id)").Where("id", g.Slice{1, 3}),
-		).OrderAsc("id").All()
-		t.AssertNil(err)
-
-		t.Assert(len(r), 1)
-		t.Assert(r[0]["id"], 5)
-	})
-}
-
-func Test_Model_SubQuery_Model(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		subQuery1 := db.Model(table).Where("id", g.Slice{1, 3, 5})
-		subQuery2 := db.Model(table).Where("id", g.Slice{5, 7, 9})
-		r, err := db.Model("? AS a, ? AS b", subQuery1, subQuery2).Fields("a.id").Where("a.id=b.id").OrderAsc("id").All()
-		t.AssertNil(err)
-
-		t.Assert(len(r), 1)
-		t.Assert(r[0]["id"], 5)
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_feature_union_test.go

@@ -1,146 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package gaussdb_test
-
-import (
-	"testing"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Union(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Union(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").All()
-
-		t.AssertNil(err)
-
-		t.Assert(len(r), 3)
-		t.Assert(r[0]["id"], 3)
-		t.Assert(r[1]["id"], 2)
-		t.Assert(r[2]["id"], 1)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Union(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").One()
-
-		t.AssertNil(err)
-
-		t.Assert(r["id"], 3)
-	})
-}
-
-func Test_UnionAll(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.UnionAll(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").All()
-
-		t.AssertNil(err)
-
-		t.Assert(len(r), 5)
-		t.Assert(r[0]["id"], 3)
-		t.Assert(r[1]["id"], 2)
-		t.Assert(r[2]["id"], 2)
-		t.Assert(r[3]["id"], 1)
-		t.Assert(r[4]["id"], 1)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.UnionAll(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").One()
-
-		t.AssertNil(err)
-
-		t.Assert(r["id"], 3)
-	})
-}
-
-func Test_Model_Union(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).Union(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").All()
-
-		t.AssertNil(err)
-
-		t.Assert(len(r), 3)
-		t.Assert(r[0]["id"], 3)
-		t.Assert(r[1]["id"], 2)
-		t.Assert(r[2]["id"], 1)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).Union(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").One()
-
-		t.AssertNil(err)
-
-		t.Assert(r["id"], 3)
-	})
-}
-
-func Test_Model_UnionAll(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).UnionAll(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").All()
-
-		t.AssertNil(err)
-
-		t.Assert(len(r), 5)
-		t.Assert(r[0]["id"], 3)
-		t.Assert(r[1]["id"], 2)
-		t.Assert(r[2]["id"], 2)
-		t.Assert(r[3]["id"], 1)
-		t.Assert(r[4]["id"], 1)
-	})
-
-	gtest.C(t, func(t *gtest.T) {
-		r, err := db.Model(table).UnionAll(
-			db.Model(table).Where("id", 1),
-			db.Model(table).Where("id", 2),
-			db.Model(table).WhereIn("id", g.Slice{1, 2, 3}).OrderDesc("id"),
-		).OrderDesc("id").One()
-
-		t.AssertNil(err)
-
-		t.Assert(r["id"], 3)
-	})
-}

contrib/drivers/gaussdb/gaussdb_z_unit_model_test.go

@@ -239,6 +239,37 @@ func Test_Model_Exist(t *testing.T) {
 	})
 }
 
+func Test_Model_Where(t *testing.T) {
+	table := createInitTable()
+	defer dropTable(table)
+
+	// map + slice parameter
+	gtest.C(t, func(t *gtest.T) {
+		result, err := db.Model(table).Where(g.Map{
+			"id":       g.Slice{1, 2, 3},
+			"passport": g.Slice{"user_2", "user_3"},
+		}).Where("id=? and nickname=?", g.Slice{3, "name_3"}).One()
+		t.AssertNil(err)
+		t.AssertGT(len(result), 0)
+		t.Assert(result["id"].Int(), 3)
+	})
+
+	// struct, automatic mapping and filtering.
+	gtest.C(t, func(t *gtest.T) {
+		type User struct {
+			Id       int
+			Nickname string
+		}
+		result, err := db.Model(table).Where(User{3, "name_3"}).One()
+		t.AssertNil(err)
+		t.Assert(result["id"].Int(), 3)
+
+		result, err = db.Model(table).Where(&User{3, "name_3"}).One()
+		t.AssertNil(err)
+		t.Assert(result["id"].Int(), 3)
+	})
+}
+
 func Test_Model_Save(t *testing.T) {
 	table := createTable()
 	defer dropTable(table)

contrib/drivers/gaussdb/gaussdb_z_unit_raw_test.go

@@ -7,7 +7,6 @@
 package gaussdb_test
 
 import (
-	"context"
 	"testing"
 
 	"github.com/gogf/gf/v2/database/gdb"
@@ -98,45 +97,3 @@ func Test_Raw_Update(t *testing.T) {
 		t.Assert(n, int64(1))
 	})
 }
-
-func Test_Raw_Where(t *testing.T) {
-	table1 := createTable("test_raw_where_table1")
-	table2 := createTable("test_raw_where_table2")
-	defer dropTable(table1)
-	defer dropTable(table2)
-
-	// https://github.com/gogf/gf/issues/3922
-	gtest.C(t, func(t *gtest.T) {
-		expectSql := `SELECT * FROM "test_raw_where_table1" AS A WHERE NOT EXISTS (SELECT B.id FROM "test_raw_where_table2" AS B WHERE "B"."id"=A.id) LIMIT 1`
-		sql, err := gdb.ToSQL(ctx, func(ctx context.Context) error {
-			s := db.Model(table2).As("B").Ctx(ctx).Fields("B.id").Where("B.id", gdb.Raw("A.id"))
-			m := db.Model(table1).As("A").Ctx(ctx).Where("NOT EXISTS ?", s).Limit(1)
-			_, err := m.All()
-			return err
-		})
-		t.AssertNil(err)
-		t.Assert(expectSql, sql)
-	})
-	gtest.C(t, func(t *gtest.T) {
-		expectSql := `SELECT * FROM "test_raw_where_table1" AS A WHERE NOT EXISTS (SELECT B.id FROM "test_raw_where_table2" AS B WHERE B.id=A.id) LIMIT 1`
-		sql, err := gdb.ToSQL(ctx, func(ctx context.Context) error {
-			s := db.Model(table2).As("B").Ctx(ctx).Fields("B.id").Where(gdb.Raw("B.id=A.id"))
-			m := db.Model(table1).As("A").Ctx(ctx).Where("NOT EXISTS ?", s).Limit(1)
-			_, err := m.All()
-			return err
-		})
-		t.AssertNil(err)
-		t.Assert(expectSql, sql)
-	})
-	// https://github.com/gogf/gf/issues/3915
-	gtest.C(t, func(t *gtest.T) {
-		expectSql := `SELECT * FROM "test_raw_where_table1" WHERE "passport" < "nickname"`
-		sql, err := gdb.ToSQL(ctx, func(ctx context.Context) error {
-			m := db.Model(table1).Ctx(ctx).WhereLT("passport", gdb.Raw(`"nickname"`))
-			_, err := m.All()
-			return err
-		})
-		t.AssertNil(err)
-		t.Assert(expectSql, sql)
-	})
-}

contrib/drivers/gaussdb/go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	gitee.com/opengauss/openGauss-connector-go-pq v1.0.7
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/v2 v2.9.8
 	github.com/google/uuid v1.6.0
 )
 

contrib/drivers/gaussdb/testdata/table_with_prefix.sql

@@ -1,6 +0,0 @@
-DROP TABLE IF EXISTS instance;
-CREATE TABLE instance (
-    f_id SERIAL NOT NULL PRIMARY KEY,
-    name varchar(255) DEFAULT ''
-);
-INSERT INTO instance VALUES (1, 'john');

contrib/drivers/gaussdb/testdata/with_multiple_depends.sql

@@ -1,30 +0,0 @@
-
-CREATE TABLE table_a (
-    id SERIAL PRIMARY KEY,
-    alias varchar(255) DEFAULT ''
-);
-
-INSERT INTO table_a VALUES (1, 'table_a_test1');
-INSERT INTO table_a VALUES (2, 'table_a_test2');
-
-CREATE TABLE table_b (
-    id SERIAL PRIMARY KEY,
-    table_a_id integer NOT NULL,
-    alias varchar(255) DEFAULT ''
-);
-
-INSERT INTO table_b VALUES (10, 1, 'table_b_test1');
-INSERT INTO table_b VALUES (20, 2, 'table_b_test2');
-INSERT INTO table_b VALUES (30, 1, 'table_b_test3');
-INSERT INTO table_b VALUES (40, 2, 'table_b_test4');
-
-CREATE TABLE table_c (
-    id SERIAL PRIMARY KEY,
-    table_b_id integer NOT NULL,
-    alias varchar(255) DEFAULT ''
-);
-
-INSERT INTO table_c VALUES (100, 10, 'table_c_test1');
-INSERT INTO table_c VALUES (200, 10, 'table_c_test2');
-INSERT INTO table_c VALUES (300, 20, 'table_c_test3');
-INSERT INTO table_c VALUES (400, 30, 'table_c_test4');

contrib/drivers/gaussdb/testdata/with_tpl_user.sql

@@ -1,4 +0,0 @@
-CREATE TABLE IF NOT EXISTS %s (
-    id SERIAL PRIMARY KEY,
-    name varchar(45) NOT NULL
-);

contrib/drivers/gaussdb/testdata/with_tpl_user_detail.sql

@@ -1,4 +0,0 @@
-CREATE TABLE IF NOT EXISTS %s (
-    uid SERIAL PRIMARY KEY,
-    address varchar(45) NOT NULL
-);

contrib/drivers/gaussdb/testdata/with_tpl_user_scores.sql

@@ -1,5 +0,0 @@
-CREATE TABLE IF NOT EXISTS %s (
-    id SERIAL PRIMARY KEY,
-    uid integer NOT NULL,
-    score integer NOT NULL
-);

contrib/drivers/mariadb/go.mod

@@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/drivers/mariadb/v2
 go 1.23.0
 
 require (
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.2
-	github.com/gogf/gf/v2 v2.10.2
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.8
+	github.com/gogf/gf/v2 v2.9.8
 )
 
 require (

contrib/drivers/mariadb/mariadb_unit_init_test.go

@@ -9,7 +9,6 @@ package mariadb_test
 import (
 	"context"
 	"fmt"
-	"testing"
 	"time"
 
 	_ "github.com/gogf/gf/contrib/drivers/mariadb/v2"
@@ -22,24 +21,18 @@ import (
 )
 
 const (
-	TableSize        = 10
-	TableName        = "user"
-	TestSchema1      = "test1"
-	TestSchema2      = "test2"
-	TestPartitionDB  = "test3"
-	TableNamePrefix1 = "gf_"
-	TestDbUser       = "root"
-	TestDbPass       = "12345678"
-	CreateTime       = "2018-10-24 10:00:00"
+	TableSize   = 10
+	TableName   = "user"
+	TestSchema1 = "test1"
+	TestSchema2 = "test2"
+	TestDbPass  = "12345678"
+	CreateTime  = "2018-10-24 10:00:00"
 )
 
 var (
-	db        gdb.DB
-	db2       gdb.DB
-	db3       gdb.DB
-	dbPrefix  gdb.DB
-	dbInvalid gdb.DB
-	ctx       = context.TODO()
+	db  gdb.DB
+	db2 gdb.DB
+	ctx = context.TODO()
 )
 
 func init() {
@@ -48,26 +41,10 @@ func init() {
 		Link:        fmt.Sprintf("mariadb:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
 		TranTimeout: time.Second * 3,
 	}
-	partitionDefault := gdb.ConfigNode{
-		Link:        fmt.Sprintf("mariadb:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
-		Debug:       true,
-		TranTimeout: time.Second * 3,
+	err := gdb.AddConfigNode(gdb.DefaultGroupName, nodeDefault)
+	if err != nil {
+		panic(err)
 	}
-	nodePrefix := gdb.ConfigNode{
-		Link:        fmt.Sprintf("mariadb:root:%s@tcp(127.0.0.1:3307)/?loc=Local&parseTime=true", TestDbPass),
-		TranTimeout: time.Second * 3,
-	}
-	nodePrefix.Prefix = TableNamePrefix1
-
-	nodeInvalid := gdb.ConfigNode{
-		Link:        fmt.Sprintf("mariadb:root:%s@tcp(127.0.0.1:3317)/?loc=Local&parseTime=true", TestDbPass),
-		TranTimeout: time.Second * 3,
-	}
-	gdb.AddConfigNode("test", nodeDefault)
-	gdb.AddConfigNode("prefix", nodePrefix)
-	gdb.AddConfigNode("nodeinvalid", nodeInvalid)
-	gdb.AddConfigNode("partition", partitionDefault)
-	gdb.AddConfigNode(gdb.DefaultGroupName, nodeDefault)
 
 	// Default db.
 	if r, err := gdb.NewByGroup(); err != nil {
@@ -82,33 +59,8 @@ func init() {
 	if _, err := db.Exec(ctx, fmt.Sprintf(schemaTemplate, TestSchema2)); err != nil {
 		gtest.Error(err)
 	}
-	if _, err := db.Exec(ctx, fmt.Sprintf(schemaTemplate, TestPartitionDB)); err != nil {
-		gtest.Error(err)
-	}
 	db = db.Schema(TestSchema1)
 	db2 = db.Schema(TestSchema2)
-	db3 = db.Schema(TestPartitionDB)
-	// Prefix db.
-	if r, err := gdb.NewByGroup("prefix"); err != nil {
-		gtest.Error(err)
-	} else {
-		dbPrefix = r
-	}
-	if _, err := dbPrefix.Exec(ctx, fmt.Sprintf(schemaTemplate, TestSchema1)); err != nil {
-		gtest.Error(err)
-	}
-	if _, err := dbPrefix.Exec(ctx, fmt.Sprintf(schemaTemplate, TestSchema2)); err != nil {
-		gtest.Error(err)
-	}
-	dbPrefix = dbPrefix.Schema(TestSchema1)
-
-	// Invalid db.
-	if r, err := gdb.NewByGroup("nodeinvalid"); err != nil {
-		gtest.Error(err)
-	} else {
-		dbInvalid = r
-	}
-	dbInvalid = dbInvalid.Schema(TestSchema1)
 }
 
 func createTable(table ...string) string {
@@ -174,61 +126,3 @@ func dropTableWithDb(db gdb.DB, table string) {
 		gtest.Error(err)
 	}
 }
-
-func Test_PartitionTable(t *testing.T) {
-	dropShopDBTable()
-	createShopDBTable()
-	insertShopDBData()
-
-	// defer dropShopDBTable()
-	gtest.C(t, func(t *gtest.T) {
-		data, err := db3.Ctx(ctx).Model("dbx_order").Partition("p3", "p4").All()
-		t.AssertNil(err)
-		dataLen := len(data)
-		t.Assert(dataLen, 5)
-		data, err = db3.Ctx(ctx).Model("dbx_order").Partition("p3").All()
-		t.AssertNil(err)
-		dataLen = len(data)
-		t.Assert(dataLen, 5)
-	})
-}
-
-func createShopDBTable() {
-	sql := `CREATE TABLE dbx_order (
-  id int(11) NOT NULL,
-  sales_date date DEFAULT NULL,
-  amount decimal(10,2) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4
-PARTITION BY RANGE (YEAR(sales_date))
-(PARTITION p1 VALUES LESS THAN (2020) ENGINE = InnoDB,
- PARTITION p2 VALUES LESS THAN (2021) ENGINE = InnoDB,
- PARTITION p3 VALUES LESS THAN (2022) ENGINE = InnoDB,
- PARTITION p4 VALUES LESS THAN MAXVALUE ENGINE = InnoDB);`
-	_, err := db3.Exec(ctx, sql)
-	if err != nil {
-		gtest.Fatal(err.Error())
-	}
-}
-
-func insertShopDBData() {
-	data := g.Slice{}
-	year := 2020
-	for i := 1; i <= 5; i++ {
-		year++
-		data = append(data, g.Map{
-			"id":         i,
-			"sales_date": fmt.Sprintf("%d-09-21", year),
-			"amount":     fmt.Sprintf("1%d.21", i),
-		})
-	}
-	_, err := db3.Model("dbx_order").Ctx(ctx).Data(data).Insert()
-	if err != nil {
-		gtest.Error(err)
-	}
-}
-
-func dropShopDBTable() {
-	if _, err := db3.Exec(ctx, "DROP TABLE IF EXISTS `dbx_order`"); err != nil {
-		gtest.Error(err)
-	}
-}

contrib/drivers/mariadb/mariadb_z_unit_basic_test.go

@@ -1,83 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package mariadb_test
-
-import (
-	"context"
-	"testing"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Instance(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		_, err := gdb.Instance("none")
-		t.AssertNE(err, nil)
-
-		db, err := gdb.Instance()
-		t.AssertNil(err)
-
-		err1 := db.PingMaster()
-		err2 := db.PingSlave()
-		t.Assert(err1, nil)
-		t.Assert(err2, nil)
-	})
-}
-
-func Test_Func_FormatSqlWithArgs(t *testing.T) {
-	// mysql
-	gtest.C(t, func(t *gtest.T) {
-		var s string
-		s = gdb.FormatSqlWithArgs("select * from table where id>=? and sex=?", []any{100, 1})
-		t.Assert(s, "select * from table where id>=100 and sex=1")
-	})
-	// mssql
-	gtest.C(t, func(t *gtest.T) {
-		var s string
-		s = gdb.FormatSqlWithArgs("select * from table where id>=@p1 and sex=@p2", []any{100, 1})
-		t.Assert(s, "select * from table where id>=100 and sex=1")
-	})
-	// pgsql
-	gtest.C(t, func(t *gtest.T) {
-		var s string
-		s = gdb.FormatSqlWithArgs("select * from table where id>=$1 and sex=$2", []any{100, 1})
-		t.Assert(s, "select * from table where id>=100 and sex=1")
-	})
-	// oracle
-	gtest.C(t, func(t *gtest.T) {
-		var s string
-		s = gdb.FormatSqlWithArgs("select * from table where id>=:v1 and sex=:v2", []any{100, 1})
-		t.Assert(s, "select * from table where id>=100 and sex=1")
-	})
-}
-
-func Test_Func_ToSQL(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		sql, err := gdb.ToSQL(ctx, func(ctx context.Context) error {
-			value, err := db.Ctx(ctx).Model(TableName).Fields("nickname").Where("id", 1).Value()
-			t.Assert(value, nil)
-			return err
-		})
-		t.AssertNil(err)
-		t.Assert(sql, "SELECT `nickname` FROM `user` WHERE `id`=1 LIMIT 1")
-	})
-}
-
-func Test_Func_CatchSQL(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	gtest.C(t, func(t *gtest.T) {
-		array, err := gdb.CatchSQL(ctx, func(ctx context.Context) error {
-			value, err := db.Ctx(ctx).Model(table).Fields("nickname").Where("id", 1).Value()
-			t.Assert(value, "name_1")
-			return err
-		})
-		t.AssertNil(err)
-		t.AssertGE(len(array), 1)
-	})
-}

contrib/drivers/mariadb/mariadb_z_unit_feature_batch_test.go

@@ -1,337 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package mariadb_test
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-// Test_Model_Batch_Insert tests batch insert with different batch sizes
-func Test_Model_Batch_Insert(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Prepare data for batch insert
-		data := g.Slice{}
-		for i := 1; i <= 10; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("batch_user_%d", i),
-				"password": fmt.Sprintf("batch_pass_%d", i),
-				"nickname": fmt.Sprintf("batch_name_%d", i),
-			})
-		}
-
-		// Batch insert with batch size 3
-		result, err := db.Model(table).Batch(3).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 10)
-
-		// Verify all records were inserted
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 10)
-
-		// Verify specific records
-		one, err := db.Model(table).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "batch_user_1")
-
-		one, err = db.Model(table).Where("id", 10).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "batch_user_10")
-	})
-}
-
-// Test_Model_Batch_Replace tests batch replace operation
-func Test_Model_Batch_Replace(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Initial insert
-		data := g.Slice{}
-		for i := 1; i <= 5; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("original_%d", i),
-			})
-		}
-		_, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-
-		// Batch replace with overlapping ids
-		replaceData := g.Slice{}
-		for i := 3; i <= 8; i++ {
-			replaceData = append(replaceData, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("replaced_%d", i),
-				"nickname": fmt.Sprintf("new_name_%d", i),
-			})
-		}
-		result, err := db.Model(table).Batch(2).Data(replaceData).Replace()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.AssertGT(n, 0)
-
-		// Verify replaced records
-		one, err := db.Model(table).Where("id", 3).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "replaced_3")
-		t.Assert(one["nickname"], "new_name_3")
-
-		// Verify new records
-		one, err = db.Model(table).Where("id", 8).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "replaced_8")
-
-		// Verify total count
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 8) // ids 1-8
-	})
-}
-
-// Test_Model_Batch_Save tests batch save operation
-func Test_Model_Batch_Save(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Initial data
-		data := g.Slice{}
-		for i := 1; i <= 5; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("save_user_%d", i),
-			})
-		}
-		_, err := db.Model(table).Data(data).Insert()
-		t.AssertNil(err)
-
-		// Batch save with overlapping and new ids
-		saveData := g.Slice{}
-		for i := 3; i <= 8; i++ {
-			saveData = append(saveData, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("saved_%d", i),
-				"nickname": fmt.Sprintf("save_name_%d", i),
-			})
-		}
-		result, err := db.Model(table).Batch(3).Data(saveData).Save()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.AssertGT(n, 0)
-
-		// Verify updated records
-		one, err := db.Model(table).Where("id", 3).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "saved_3")
-
-		// Verify inserted records
-		one, err = db.Model(table).Where("id", 8).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "saved_8")
-
-		// Verify total count
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 8)
-	})
-}
-
-// Test_Model_Batch_LargeBatch tests batch operation with large dataset
-func Test_Model_Batch_LargeBatch(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Prepare 1000+ records
-		data := g.Slice{}
-		totalRecords := 1500
-		for i := 1; i <= totalRecords; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("large_user_%d", i),
-				"nickname": fmt.Sprintf("large_name_%d", i),
-			})
-		}
-
-		// Batch insert with batch size 100
-		result, err := db.Model(table).Batch(100).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, totalRecords)
-
-		// Verify count
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, totalRecords)
-
-		// Verify first and last records
-		one, err := db.Model(table).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "large_user_1")
-
-		one, err = db.Model(table).Where("id", totalRecords).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], fmt.Sprintf("large_user_%d", totalRecords))
-	})
-}
-
-// Test_Model_Batch_EmptyBatch tests batch operation with empty data
-func Test_Model_Batch_EmptyBatch(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Empty slice
-		data := g.Slice{}
-
-		// Batch insert with empty data should return error
-		_, err := db.Model(table).Batch(10).Data(data).Insert()
-		t.AssertNE(err, nil)
-		t.AssertIN(err.Error(), "data list cannot be empty")
-
-		// Verify no records inserted
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 0)
-	})
-}
-
-// Test_Model_Batch_SingleRecord tests batch operation with single record
-func Test_Model_Batch_SingleRecord(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Single record batch insert
-		data := g.Slice{
-			g.Map{
-				"id":       1,
-				"passport": "single_user",
-				"nickname": "single_name",
-			},
-		}
-
-		result, err := db.Model(table).Batch(10).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 1)
-
-		// Verify the record
-		one, err := db.Model(table).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "single_user")
-		t.Assert(one["nickname"], "single_name")
-	})
-}
-
-// Test_Model_Batch_VsBatch tests performance comparison between different batch sizes
-func Test_Model_Batch_VsBatch(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Prepare data
-		data := g.Slice{}
-		for i := 1; i <= 100; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("perf_user_%d", i),
-			})
-		}
-
-		// Test with batch size 1
-		result, err := db.Model(table).Batch(1).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ := result.RowsAffected()
-		t.Assert(n, 100)
-
-		// Clean up
-		_, err = db.Model(table).Where("1=1").Delete()
-		t.AssertNil(err)
-
-		// Test with batch size 10
-		result, err = db.Model(table).Batch(10).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ = result.RowsAffected()
-		t.Assert(n, 100)
-
-		// Clean up
-		_, err = db.Model(table).Where("1=1").Delete()
-		t.AssertNil(err)
-
-		// Test with batch size 50
-		result, err = db.Model(table).Batch(50).Data(data).Insert()
-		t.AssertNil(err)
-		n, _ = result.RowsAffected()
-		t.Assert(n, 100)
-
-		// All batch sizes should produce same result
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 100)
-	})
-}
-
-// Test_Model_Batch_WithTransaction tests batch operation within transaction
-func Test_Model_Batch_WithTransaction(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		data := g.Slice{}
-		for i := 1; i <= 50; i++ {
-			data = append(data, g.Map{
-				"id":       i,
-				"passport": fmt.Sprintf("tx_batch_%d", i),
-			})
-		}
-
-		// Test commit
-		err := db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			result, err := tx.Model(table).Batch(10).Data(data).Insert()
-			t.AssertNil(err)
-			n, _ := result.RowsAffected()
-			t.Assert(n, 50)
-			return nil
-		})
-		t.AssertNil(err)
-
-		// Verify commit
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 50)
-
-		// Clean up
-		_, err = db.Model(table).Where("1=1").Delete()
-		t.AssertNil(err)
-
-		// Test rollback
-		err = db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			_, err := tx.Model(table).Batch(10).Data(data).Insert()
-			t.AssertNil(err)
-			return fmt.Errorf("rollback test")
-		})
-		t.AssertNE(err, nil)
-
-		// Verify rollback - no records should exist
-		count, err = db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 0)
-	})
-}

contrib/drivers/mariadb/mariadb_z_unit_feature_cache_test.go

@@ -1,300 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package mariadb_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-// Test_Model_Cache_Basic tests basic cache functionality
-func Test_Model_Cache_Basic(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// First query - cache miss, result from DB
-		one, err := db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "test_cache_basic",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["id"], 1)
-		t.Assert(one["passport"], "user_1")
-
-		// Update the record in DB
-		_, err = db.Model(table).Data(g.Map{"passport": "updated_user"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Second query - cache hit, still returns old cached value
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "test_cache_basic",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1") // cached value, not "updated_user"
-
-		// Query without cache - returns updated value from DB
-		one, err = db.Model(table).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "updated_user")
-	})
-}
-
-// Test_Model_Cache_TTL tests cache TTL expiration
-func Test_Model_Cache_TTL(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Cache with short TTL
-		one, err := db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Millisecond * 100, // 100ms TTL
-			Name:     "test_cache_ttl",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1")
-
-		// Update record
-		_, err = db.Model(table).Data(g.Map{"passport": "ttl_test"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Immediate query - cache still valid
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Millisecond * 100,
-			Name:     "test_cache_ttl",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1") // cached value
-
-		// Wait for cache to expire
-		time.Sleep(time.Millisecond * 150)
-
-		// Query after expiration - should get fresh data
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Millisecond * 100,
-			Name:     "test_cache_ttl",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "ttl_test") // fresh value from DB
-	})
-}
-
-// Test_Model_Cache_Clear tests clearing cache with negative duration
-func Test_Model_Cache_Clear(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Set cache
-		one, err := db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 60,
-			Name:     "test_cache_clear",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1")
-
-		// Update record and clear cache
-		_, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: -1,
-			Name:     "test_cache_clear",
-		}).Data(g.Map{"passport": "cleared"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Query again - should get fresh data since cache was cleared
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 60,
-			Name:     "test_cache_clear",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "cleared")
-	})
-}
-
-// Test_Model_Cache_NoExpire tests cache with no expiration (Duration=0)
-func Test_Model_Cache_NoExpire(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Cache with no expiration
-		one, err := db.Model(table).Cache(gdb.CacheOption{
-			Duration: 0, // never expires
-			Name:     "test_cache_no_expire",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1")
-
-		// Update record
-		_, err = db.Model(table).Data(g.Map{"passport": "no_expire_test"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Wait a bit
-		time.Sleep(time.Millisecond * 100)
-
-		// Query - cache should still be valid
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: 0,
-			Name:     "test_cache_no_expire",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1") // cached value persists
-
-		// Clear the cache with update operation
-		_, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: -1,
-			Name:     "test_cache_no_expire",
-		}).Data(g.Map{"nickname": "cleared"}).Where("id", 1).Update()
-		t.AssertNil(err)
-	})
-}
-
-// Test_Model_Cache_Force tests Force option to cache nil results
-func Test_Model_Cache_Force(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	// Note: Removed Force cache test due to cache invalidation on INSERT
-	// The test logic was flawed - INSERT operations clear cache, so cached nil
-	// results would be invalidated before the second query
-}
-
-// Test_Model_Cache_DisabledInTransaction tests cache is disabled in transactions
-func Test_Model_Cache_DisabledInTransaction(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		err := db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			// First query in transaction
-			one, err := tx.Model(table).Cache(gdb.CacheOption{
-				Duration: time.Second * 10,
-				Name:     "test_tx_cache",
-			}).Where("id", 1).One()
-			t.AssertNil(err)
-			t.Assert(one["passport"], "user_1")
-
-			// Update in transaction
-			_, err = tx.Model(table).Data(g.Map{"passport": "tx_update"}).Where("id", 1).Update()
-			t.AssertNil(err)
-
-			// Second query - should see updated value (cache disabled in tx)
-			one, err = tx.Model(table).Cache(gdb.CacheOption{
-				Duration: time.Second * 10,
-				Name:     "test_tx_cache",
-			}).Where("id", 1).One()
-			t.AssertNil(err)
-			t.Assert(one["passport"], "tx_update") // not cached, fresh from DB
-
-			return nil
-		})
-		t.AssertNil(err)
-	})
-}
-
-// Test_Model_PageCache tests pagination cache
-func Test_Model_PageCache(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// First page query with cache
-		all, err := db.Model(table).PageCache(
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_count"},
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_data"},
-		).Page(1, 3).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 3)
-
-		// Insert new record
-		_, err = db.Model(table).Data(g.Map{
-			"id":       11,
-			"passport": "user_11",
-		}).Insert()
-		t.AssertNil(err)
-
-		// Query again - should return cached results
-		all, err = db.Model(table).PageCache(
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_count"},
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_data"},
-		).Page(1, 3).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 3) // cached results
-
-		// Clear page cache by updating with Duration=-1
-		_, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: -1,
-			Name:     "test_page_count",
-		}).Data(g.Map{"nickname": "page_test"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Query with fresh cache - should return updated count
-		all, err = db.Model(table).PageCache(
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_count"},
-			gdb.CacheOption{Duration: time.Second * 10, Name: "test_page_data"},
-		).Page(1, 3).All()
-		t.AssertNil(err)
-		t.Assert(len(all), 3) // still 3 items per page
-
-		// Verify total count increased
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, 11)
-	})
-}
-
-// Test_Model_Cache_DifferentNames tests different cache names for same query
-func Test_Model_Cache_DifferentNames(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Cache with name1
-		one, err := db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "cache_name1",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1")
-
-		// Cache same query with name2
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "cache_name2",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1")
-
-		// Update record and clear only cache_name1
-		_, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: -1,
-			Name:     "cache_name1",
-		}).Data(g.Map{"passport": "diff_name"}).Where("id", 1).Update()
-		t.AssertNil(err)
-
-		// Query with cache_name1 - should get fresh data
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "cache_name1",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "diff_name")
-
-		// Query with cache_name2 - should still have cached old value
-		one, err = db.Model(table).Cache(gdb.CacheOption{
-			Duration: time.Second * 10,
-			Name:     "cache_name2",
-		}).Where("id", 1).One()
-		t.AssertNil(err)
-		t.Assert(one["passport"], "user_1") // still cached
-	})
-}

contrib/drivers/mariadb/mariadb_z_unit_feature_concurrent_test.go

@@ -1,338 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package mariadb_test
-
-import (
-	"fmt"
-	"sync"
-	"testing"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-// Test_Concurrent_Insert tests concurrent Insert operations
-func Test_Concurrent_Insert(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 10
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				_, err := db.Model(table).Insert(g.Map{
-					"passport": fmt.Sprintf("user_%d", id),
-					"password": fmt.Sprintf("pass_%d", id),
-					"nickname": fmt.Sprintf("name_%d", id),
-				})
-				t.AssertNil(err)
-			}(i + 1)
-		}
-		wg.Wait()
-
-		// Verify all records inserted
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, concurrency)
-	})
-}
-
-// Test_Concurrent_Update tests concurrent Update operations
-func Test_Concurrent_Update(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 5
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				_, err := db.Model(table).Data(g.Map{
-					"nickname": fmt.Sprintf("updated_%d", id),
-				}).Where("id", id+1).Update()
-				t.AssertNil(err)
-			}(i)
-		}
-		wg.Wait()
-
-		// Verify updates
-		for i := 0; i < concurrency; i++ {
-			one, err := db.Model(table).Where("id", i+1).One()
-			t.AssertNil(err)
-			t.Assert(one["nickname"].String(), fmt.Sprintf("updated_%d", i))
-		}
-	})
-}
-
-// Test_Concurrent_Delete tests concurrent Delete operations
-func Test_Concurrent_Delete(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 5
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				_, err := db.Model(table).Where("id", id+1).Delete()
-				t.AssertNil(err)
-			}(i)
-		}
-		wg.Wait()
-
-		// Verify deletions
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, TableSize-concurrency)
-	})
-}
-
-// Test_Concurrent_Query tests concurrent Query operations
-func Test_Concurrent_Query(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 20
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				result, err := db.Model(table).Where("id", (id%TableSize)+1).One()
-				t.AssertNil(err)
-				t.AssertNE(result, nil)
-			}(i)
-		}
-		wg.Wait()
-	})
-}
-
-// Test_Concurrent_Transaction tests concurrent transaction operations
-func Test_Concurrent_Transaction(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 10
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				err := db.Transaction(ctx, func(ctx g.Ctx, tx gdb.TX) error {
-					_, err := tx.Model(table).Insert(g.Map{
-						"passport": fmt.Sprintf("user_%d", id),
-						"password": fmt.Sprintf("pass_%d", id),
-						"nickname": fmt.Sprintf("name_%d", id),
-					})
-					return err
-				})
-				t.AssertNil(err)
-			}(i + 1)
-		}
-		wg.Wait()
-
-		// Verify all transactions committed
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, concurrency)
-	})
-}
-
-// Test_Concurrent_Mixed_Operations tests mixed concurrent operations
-func Test_Concurrent_Mixed_Operations(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		operations := 30
-
-		wg.Add(operations)
-		for i := 0; i < operations; i++ {
-			op := i % 3
-			switch op {
-			case 0: // Insert
-				go func(id int) {
-					defer wg.Done()
-					_, _ = db.Model(table).Insert(g.Map{
-						"passport": fmt.Sprintf("new_user_%d", id),
-						"password": fmt.Sprintf("new_pass_%d", id),
-						"nickname": fmt.Sprintf("new_name_%d", id),
-					})
-				}(i)
-			case 1: // Update
-				go func(id int) {
-					defer wg.Done()
-					targetId := (id % TableSize) + 1
-					_, _ = db.Model(table).Data(g.Map{
-						"nickname": fmt.Sprintf("concurrent_%d", id),
-					}).Where("id", targetId).Update()
-				}(i)
-			case 2: // Query
-				go func(id int) {
-					defer wg.Done()
-					targetId := (id % TableSize) + 1
-					_, _ = db.Model(table).Where("id", targetId).One()
-				}(i)
-			}
-		}
-		wg.Wait()
-
-		// Verify database is still consistent
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.AssertGT(count, TableSize)
-	})
-}
-
-// Test_Concurrent_Connection_Pool tests connection pool under load
-func Test_Concurrent_Connection_Pool(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 50
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				// Each goroutine performs multiple operations
-				for j := 0; j < 5; j++ {
-					_, err := db.Model(table).Where("id", (id%TableSize)+1).One()
-					t.AssertNil(err)
-				}
-			}(i)
-		}
-		wg.Wait()
-	})
-}
-
-// Test_Concurrent_Schema_Switch tests concurrent schema switching
-func Test_Concurrent_Schema_Switch(t *testing.T) {
-	table1 := createTableWithDb(db, "test_schema_1")
-	table2 := createTableWithDb(db2, "test_schema_2")
-	defer dropTableWithDb(db, table1)
-	defer dropTableWithDb(db2, table2)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 10
-
-		wg.Add(concurrency * 2)
-		for i := 0; i < concurrency; i++ {
-			// Insert to schema1
-			go func(id int) {
-				defer wg.Done()
-				_, err := db.Model(table1).Insert(g.Map{
-					"passport": fmt.Sprintf("user_s1_%d", id),
-					"password": fmt.Sprintf("pass_%d", id),
-					"nickname": fmt.Sprintf("name_%d", id),
-				})
-				t.AssertNil(err)
-			}(i)
-
-			// Insert to schema2
-			go func(id int) {
-				defer wg.Done()
-				_, err := db2.Model(table2).Insert(g.Map{
-					"passport": fmt.Sprintf("user_s2_%d", id),
-					"password": fmt.Sprintf("pass_%d", id),
-					"nickname": fmt.Sprintf("name_%d", id),
-				})
-				t.AssertNil(err)
-			}(i)
-		}
-		wg.Wait()
-
-		// Verify both schemas
-		count1, err := db.Model(table1).Count()
-		t.AssertNil(err)
-		t.Assert(count1, concurrency)
-
-		count2, err := db2.Model(table2).Count()
-		t.AssertNil(err)
-		t.Assert(count2, concurrency)
-	})
-}
-
-// Test_Concurrent_Model_Clone tests concurrent model cloning
-func Test_Concurrent_Model_Clone(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		baseModel := db.Model(table).Where("id>", 0)
-		var wg sync.WaitGroup
-		concurrency := 20
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(id int) {
-				defer wg.Done()
-				// Clone model for each goroutine
-				m := baseModel.Clone()
-				result, err := m.Where("id<=", TableSize/2).All()
-				t.AssertNil(err)
-				t.AssertGT(len(result), 0)
-			}(i)
-		}
-		wg.Wait()
-	})
-}
-
-// Test_Concurrent_Batch_Insert tests concurrent batch insert operations
-func Test_Concurrent_Batch_Insert(t *testing.T) {
-	table := createTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		var wg sync.WaitGroup
-		concurrency := 5
-		batchSize := 10
-
-		wg.Add(concurrency)
-		for i := 0; i < concurrency; i++ {
-			go func(batchId int) {
-				defer wg.Done()
-				batch := make([]g.Map, 0, batchSize)
-				for j := 0; j < batchSize; j++ {
-					id := batchId*batchSize + j
-					batch = append(batch, g.Map{
-						"passport": fmt.Sprintf("batch_user_%d", id),
-						"password": fmt.Sprintf("pass_%d", id),
-						"nickname": fmt.Sprintf("name_%d", id),
-					})
-				}
-				_, err := db.Model(table).Data(batch).Insert()
-				t.AssertNil(err)
-			}(i)
-		}
-		wg.Wait()
-
-		// Verify all batch inserts
-		count, err := db.Model(table).Count()
-		t.AssertNil(err)
-		t.Assert(count, concurrency*batchSize)
-	})
-}

contrib/drivers/mariadb/mariadb_z_unit_feature_ctx_test.go

@@ -1,163 +0,0 @@
-// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
-//
-// This Source Code Form is subject to the terms of the MIT License.
-// If a copy of the MIT was not distributed with this file,
-// You can obtain one at https://github.com/gogf/gf.
-
-package mariadb_test
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/v2/test/gtest"
-)
-
-func Test_Ctx(t *testing.T) {
-	gtest.C(t, func(t *gtest.T) {
-		db, err := gdb.Instance()
-		t.AssertNil(err)
-
-		err1 := db.PingMaster()
-		err2 := db.PingSlave()
-		t.Assert(err1, nil)
-		t.Assert(err2, nil)
-
-		newDb := db.Ctx(context.Background())
-		t.AssertNE(newDb, nil)
-	})
-}
-
-func Test_Ctx_Query(t *testing.T) {
-	db.GetLogger().(*glog.Logger).SetCtxKeys("SpanId", "TraceId")
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		ctx := context.WithValue(context.Background(), "TraceId", "12345678")
-		ctx = context.WithValue(ctx, "SpanId", "0.1")
-		db.Query(ctx, "select 1")
-	})
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		db.Query(ctx, "select 2")
-	})
-}
-
-func Test_Ctx_Model(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	db.GetLogger().(*glog.Logger).SetCtxKeys("SpanId", "TraceId")
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		ctx := context.WithValue(context.Background(), "TraceId", "12345678")
-		ctx = context.WithValue(ctx, "SpanId", "0.1")
-		db.Model(table).Ctx(ctx).All()
-	})
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-		db.Model(table).All()
-	})
-}
-
-// Test_Ctx_Timeout tests context timeout behavior
-func Test_Ctx_Timeout(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		// Create a context with very short timeout
-		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Nanosecond)
-		defer cancel()
-
-		// Wait for timeout
-		time.Sleep(1 * time.Millisecond)
-
-		// Query should fail due to context timeout
-		_, err := db.Model(table).Ctx(ctx).All()
-		t.AssertNE(err, nil)
-	})
-}
-
-// Test_Ctx_Cancel tests context cancellation
-func Test_Ctx_Cancel(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-
-	gtest.C(t, func(t *gtest.T) {
-		ctx, cancel := context.WithCancel(context.Background())
-		// Cancel immediately
-		cancel()
-
-		// Query should fail due to cancelled context
-		_, err := db.Model(table).Ctx(ctx).All()
-		t.AssertNE(err, nil)
-	})
-}
-
-// Test_Ctx_Propagation_Transaction tests context propagation in transaction
-func Test_Ctx_Propagation_Transaction(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	db.GetLogger().(*glog.Logger).SetCtxKeys("TraceId")
-
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-
-		ctx := context.WithValue(context.Background(), "TraceId", "tx_trace_123")
-		err := db.Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
-			// Context should propagate to transaction operations
-			_, err := tx.Model(table).Ctx(ctx).Where("id", 1).One()
-			return err
-		})
-		t.AssertNil(err)
-	})
-}
-
-// Test_Ctx_Multiple_Values tests context with multiple values
-func Test_Ctx_Multiple_Values(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	db.GetLogger().(*glog.Logger).SetCtxKeys("TraceId", "RequestId", "UserId")
-
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-
-		ctx := context.WithValue(context.Background(), "TraceId", "trace_001")
-		ctx = context.WithValue(ctx, "RequestId", "req_002")
-		ctx = context.WithValue(ctx, "UserId", "user_003")
-
-		db.Model(table).Ctx(ctx).Where("id", 1).One()
-	})
-}
-
-// Test_Ctx_Nested_Operations tests context in nested operations
-func Test_Ctx_Nested_Operations(t *testing.T) {
-	table := createInitTable()
-	defer dropTable(table)
-	db.GetLogger().(*glog.Logger).SetCtxKeys("TraceId")
-
-	gtest.C(t, func(t *gtest.T) {
-		db.SetDebug(true)
-		defer db.SetDebug(false)
-
-		ctx := context.WithValue(context.Background(), "TraceId", "nested_trace")
-
-		// Nested query operations should all have context
-		result, err := db.Model(table).Ctx(ctx).Where("id>", 0).All()
-		t.AssertNil(err)
-
-		if len(result) > 0 {
-			// Another query using same context
-			_, err = db.Model(table).Ctx(ctx).Where("id", result[0]["id"]).One()
-			t.AssertNil(err)
-		}
-	})
-}