@neverinfamous/mysql-mcp 2.3.0 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.dockerignore +1 -0
- package/.gitattributes +18 -0
- package/.github/workflows/codeql.yml +2 -10
- package/.github/workflows/docker-publish.yml +15 -13
- package/CHANGELOG.md +287 -1
- package/DOCKER_README.md +100 -265
- package/Dockerfile +5 -0
- package/README.md +124 -59
- package/VERSION +1 -1
- package/dist/__tests__/mocks/adapter.d.ts.map +1 -1
- package/dist/__tests__/mocks/adapter.js +2 -0
- package/dist/__tests__/mocks/adapter.js.map +1 -1
- package/dist/adapters/DatabaseAdapter.d.ts.map +1 -1
- package/dist/adapters/DatabaseAdapter.js +50 -9
- package/dist/adapters/DatabaseAdapter.js.map +1 -1
- package/dist/adapters/mysql/MySQLAdapter.d.ts +6 -0
- package/dist/adapters/mysql/MySQLAdapter.d.ts.map +1 -1
- package/dist/adapters/mysql/MySQLAdapter.js +8 -0
- package/dist/adapters/mysql/MySQLAdapter.js.map +1 -1
- package/dist/adapters/mysql/SchemaManager.js +16 -15
- package/dist/adapters/mysql/SchemaManager.js.map +1 -1
- package/dist/adapters/mysql/prompts/index.js +10 -20
- package/dist/adapters/mysql/prompts/index.js.map +1 -1
- package/dist/adapters/mysql/prompts/proxysqlSetup.js +1 -1
- package/dist/adapters/mysql/resources/docstore.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/docstore.js +10 -7
- package/dist/adapters/mysql/resources/docstore.js.map +1 -1
- package/dist/adapters/mysql/resources/events.js +11 -8
- package/dist/adapters/mysql/resources/events.js.map +1 -1
- package/dist/adapters/mysql/resources/indexes.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/indexes.js +12 -15
- package/dist/adapters/mysql/resources/indexes.js.map +1 -1
- package/dist/adapters/mysql/resources/innodb.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/innodb.js +20 -17
- package/dist/adapters/mysql/resources/innodb.js.map +1 -1
- package/dist/adapters/mysql/resources/locks.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/locks.js +9 -6
- package/dist/adapters/mysql/resources/locks.js.map +1 -1
- package/dist/adapters/mysql/resources/performance.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/performance.js +15 -15
- package/dist/adapters/mysql/resources/performance.js.map +1 -1
- package/dist/adapters/mysql/resources/spatial.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/spatial.js +9 -6
- package/dist/adapters/mysql/resources/spatial.js.map +1 -1
- package/dist/adapters/mysql/resources/sysschema.d.ts.map +1 -1
- package/dist/adapters/mysql/resources/sysschema.js +12 -9
- package/dist/adapters/mysql/resources/sysschema.js.map +1 -1
- package/dist/adapters/mysql/tools/admin/backup.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/admin/backup.js +170 -121
- package/dist/adapters/mysql/tools/admin/backup.js.map +1 -1
- package/dist/adapters/mysql/tools/admin/maintenance.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/admin/maintenance.js +106 -57
- package/dist/adapters/mysql/tools/admin/maintenance.js.map +1 -1
- package/dist/adapters/mysql/tools/admin/monitoring.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/admin/monitoring.js +183 -101
- package/dist/adapters/mysql/tools/admin/monitoring.js.map +1 -1
- package/dist/adapters/mysql/tools/cluster/group-replication.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/cluster/group-replication.js +164 -120
- package/dist/adapters/mysql/tools/cluster/group-replication.js.map +1 -1
- package/dist/adapters/mysql/tools/cluster/innodb-cluster.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/cluster/innodb-cluster.js +212 -145
- package/dist/adapters/mysql/tools/cluster/innodb-cluster.js.map +1 -1
- package/dist/adapters/mysql/tools/codemode/index.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/codemode/index.js +6 -4
- package/dist/adapters/mysql/tools/codemode/index.js.map +1 -1
- package/dist/adapters/mysql/tools/core.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/core.js +152 -29
- package/dist/adapters/mysql/tools/core.js.map +1 -1
- package/dist/adapters/mysql/tools/docstore.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/docstore.js +340 -163
- package/dist/adapters/mysql/tools/docstore.js.map +1 -1
- package/dist/adapters/mysql/tools/events.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/events.js +284 -198
- package/dist/adapters/mysql/tools/events.js.map +1 -1
- package/dist/adapters/mysql/tools/json/core.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/json/core.js +11 -39
- package/dist/adapters/mysql/tools/json/core.js.map +1 -1
- package/dist/adapters/mysql/tools/json/enhanced.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/json/enhanced.js +15 -33
- package/dist/adapters/mysql/tools/json/enhanced.js.map +1 -1
- package/dist/adapters/mysql/tools/json/helpers.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/json/helpers.js +13 -24
- package/dist/adapters/mysql/tools/json/helpers.js.map +1 -1
- package/dist/adapters/mysql/tools/partitioning.js +3 -0
- package/dist/adapters/mysql/tools/partitioning.js.map +1 -1
- package/dist/adapters/mysql/tools/performance/analysis.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/performance/analysis.js +89 -60
- package/dist/adapters/mysql/tools/performance/analysis.js.map +1 -1
- package/dist/adapters/mysql/tools/performance/optimization.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/performance/optimization.js +151 -127
- package/dist/adapters/mysql/tools/performance/optimization.js.map +1 -1
- package/dist/adapters/mysql/tools/proxysql.d.ts +1 -1
- package/dist/adapters/mysql/tools/proxysql.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/proxysql.js +289 -176
- package/dist/adapters/mysql/tools/proxysql.js.map +1 -1
- package/dist/adapters/mysql/tools/replication.js +75 -49
- package/dist/adapters/mysql/tools/replication.js.map +1 -1
- package/dist/adapters/mysql/tools/roles.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/roles.js +224 -182
- package/dist/adapters/mysql/tools/roles.js.map +1 -1
- package/dist/adapters/mysql/tools/router.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/router.js +168 -67
- package/dist/adapters/mysql/tools/router.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/constraints.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/constraints.js +21 -3
- package/dist/adapters/mysql/tools/schema/constraints.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/management.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/management.js +61 -14
- package/dist/adapters/mysql/tools/schema/management.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/routines.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/routines.js +27 -4
- package/dist/adapters/mysql/tools/schema/routines.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/scheduled_events.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/scheduled_events.js +24 -3
- package/dist/adapters/mysql/tools/schema/scheduled_events.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/triggers.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/triggers.js +23 -2
- package/dist/adapters/mysql/tools/schema/triggers.js.map +1 -1
- package/dist/adapters/mysql/tools/schema/views.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/schema/views.js +47 -7
- package/dist/adapters/mysql/tools/schema/views.js.map +1 -1
- package/dist/adapters/mysql/tools/security/audit.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/security/audit.js +102 -34
- package/dist/adapters/mysql/tools/security/audit.js.map +1 -1
- package/dist/adapters/mysql/tools/security/data-protection.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/security/data-protection.js +264 -205
- package/dist/adapters/mysql/tools/security/data-protection.js.map +1 -1
- package/dist/adapters/mysql/tools/security/encryption.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/security/encryption.js +137 -104
- package/dist/adapters/mysql/tools/security/encryption.js.map +1 -1
- package/dist/adapters/mysql/tools/shell/backup.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/shell/backup.js +71 -59
- package/dist/adapters/mysql/tools/shell/backup.js.map +1 -1
- package/dist/adapters/mysql/tools/shell/restore.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/shell/restore.js +61 -47
- package/dist/adapters/mysql/tools/shell/restore.js.map +1 -1
- package/dist/adapters/mysql/tools/spatial/geometry.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/spatial/geometry.js +19 -5
- package/dist/adapters/mysql/tools/spatial/geometry.js.map +1 -1
- package/dist/adapters/mysql/tools/spatial/operations.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/spatial/operations.js +42 -17
- package/dist/adapters/mysql/tools/spatial/operations.js.map +1 -1
- package/dist/adapters/mysql/tools/spatial/queries.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/spatial/queries.js +109 -57
- package/dist/adapters/mysql/tools/spatial/queries.js.map +1 -1
- package/dist/adapters/mysql/tools/spatial/setup.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/spatial/setup.js +103 -50
- package/dist/adapters/mysql/tools/spatial/setup.js.map +1 -1
- package/dist/adapters/mysql/tools/stats/comparative.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/stats/comparative.js +128 -79
- package/dist/adapters/mysql/tools/stats/comparative.js.map +1 -1
- package/dist/adapters/mysql/tools/stats/descriptive.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/stats/descriptive.js +174 -102
- package/dist/adapters/mysql/tools/stats/descriptive.js.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/activity.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/activity.js +50 -25
- package/dist/adapters/mysql/tools/sysschema/activity.js.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/performance.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/performance.js +121 -66
- package/dist/adapters/mysql/tools/sysschema/performance.js.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/resources.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/sysschema/resources.js +101 -64
- package/dist/adapters/mysql/tools/sysschema/resources.js.map +1 -1
- package/dist/adapters/mysql/tools/text/fulltext.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/text/fulltext.js +18 -32
- package/dist/adapters/mysql/tools/text/fulltext.js.map +1 -1
- package/dist/adapters/mysql/tools/transactions.d.ts.map +1 -1
- package/dist/adapters/mysql/tools/transactions.js +48 -23
- package/dist/adapters/mysql/tools/transactions.js.map +1 -1
- package/dist/adapters/mysql/types/proxysql-types.d.ts +15 -0
- package/dist/adapters/mysql/types/proxysql-types.d.ts.map +1 -1
- package/dist/adapters/mysql/types/proxysql-types.js +33 -1
- package/dist/adapters/mysql/types/proxysql-types.js.map +1 -1
- package/dist/adapters/mysql/types/router-types.d.ts +1 -1
- package/dist/adapters/mysql/types/router-types.js +1 -1
- package/dist/adapters/mysql/types/router-types.js.map +1 -1
- package/dist/adapters/mysql/types/shell-types.js +2 -2
- package/dist/adapters/mysql/types/shell-types.js.map +1 -1
- package/dist/adapters/mysql/types.d.ts +485 -21
- package/dist/adapters/mysql/types.d.ts.map +1 -1
- package/dist/adapters/mysql/types.js +546 -19
- package/dist/adapters/mysql/types.js.map +1 -1
- package/dist/auth/scopes.js +1 -1
- package/dist/auth/scopes.js.map +1 -1
- package/dist/codemode/api.d.ts +3 -2
- package/dist/codemode/api.d.ts.map +1 -1
- package/dist/codemode/api.js +80 -5
- package/dist/codemode/api.js.map +1 -1
- package/dist/codemode/sandbox-factory.js +1 -1
- package/dist/codemode/sandbox-factory.js.map +1 -1
- package/dist/codemode/types.d.ts +26 -0
- package/dist/codemode/types.d.ts.map +1 -1
- package/dist/codemode/types.js +2 -0
- package/dist/codemode/types.js.map +1 -1
- package/dist/codemode/worker-sandbox.d.ts +4 -2
- package/dist/codemode/worker-sandbox.d.ts.map +1 -1
- package/dist/codemode/worker-sandbox.js +66 -7
- package/dist/codemode/worker-sandbox.js.map +1 -1
- package/dist/codemode/worker-script.d.ts +3 -0
- package/dist/codemode/worker-script.d.ts.map +1 -1
- package/dist/codemode/worker-script.js +128 -75
- package/dist/codemode/worker-script.js.map +1 -1
- package/dist/constants/ServerInstructions.d.ts +1 -1
- package/dist/constants/ServerInstructions.d.ts.map +1 -1
- package/dist/constants/ServerInstructions.js +37 -31
- package/dist/constants/ServerInstructions.js.map +1 -1
- package/dist/filtering/ToolConstants.d.ts +1 -1
- package/dist/filtering/ToolConstants.d.ts.map +1 -1
- package/dist/filtering/ToolConstants.js +1 -2
- package/dist/filtering/ToolConstants.js.map +1 -1
- package/dist/pool/ConnectionPool.d.ts.map +1 -1
- package/dist/pool/ConnectionPool.js.map +1 -1
- package/dist/transports/http.d.ts.map +1 -1
- package/dist/transports/http.js +6 -0
- package/dist/transports/http.js.map +1 -1
- package/dist/utils/validators.d.ts +1 -1
- package/dist/utils/validators.d.ts.map +1 -1
- package/dist/utils/validators.js.map +1 -1
- package/package.json +4 -4
- package/releases/v2.3.0-release-notes.md +20 -20
- package/releases/v2.3.1-release-notes.md +34 -0
- package/releases/v3.0.0-release-notes.md +81 -0
- package/src/__tests__/mocks/adapter.ts +3 -0
- package/src/__tests__/perf.test.ts +6 -6
- package/src/adapters/DatabaseAdapter.ts +58 -9
- package/src/adapters/__tests__/DatabaseAdapter.test.ts +89 -8
- package/src/adapters/mysql/MySQLAdapter.ts +17 -2
- package/src/adapters/mysql/SchemaManager.ts +21 -21
- package/src/adapters/mysql/__tests__/MySQLAdapter.test.ts +1 -1
- package/src/adapters/mysql/prompts/index.ts +12 -22
- package/src/adapters/mysql/prompts/proxysqlSetup.ts +1 -1
- package/src/adapters/mysql/resources/docstore.ts +13 -10
- package/src/adapters/mysql/resources/events.ts +12 -12
- package/src/adapters/mysql/resources/indexes.ts +17 -19
- package/src/adapters/mysql/resources/innodb.ts +23 -22
- package/src/adapters/mysql/resources/locks.ts +9 -7
- package/src/adapters/mysql/resources/performance.ts +23 -18
- package/src/adapters/mysql/resources/spatial.ts +9 -7
- package/src/adapters/mysql/resources/sysschema.ts +12 -11
- package/src/adapters/mysql/tools/__tests__/core.test.ts +126 -55
- package/src/adapters/mysql/tools/__tests__/docstore.test.ts +459 -88
- package/src/adapters/mysql/tools/__tests__/events.test.ts +281 -103
- package/src/adapters/mysql/tools/__tests__/proxysql.test.ts +128 -28
- package/src/adapters/mysql/tools/__tests__/replication.test.ts +48 -2
- package/src/adapters/mysql/tools/__tests__/roles.test.ts +15 -18
- package/src/adapters/mysql/tools/__tests__/router.test.ts +32 -5
- package/src/adapters/mysql/tools/__tests__/security.test.ts +126 -2
- package/src/adapters/mysql/tools/__tests__/security_injection.test.ts +84 -76
- package/src/adapters/mysql/tools/__tests__/security_integration.test.ts +47 -50
- package/src/adapters/mysql/tools/__tests__/spatial.test.ts +11 -10
- package/src/adapters/mysql/tools/__tests__/spatial_handler.test.ts +54 -38
- package/src/adapters/mysql/tools/__tests__/stats.test.ts +285 -152
- package/src/adapters/mysql/tools/__tests__/transactions.test.ts +13 -13
- package/src/adapters/mysql/tools/admin/__tests__/backup.test.ts +171 -25
- package/src/adapters/mysql/tools/admin/__tests__/maintenance.test.ts +240 -4
- package/src/adapters/mysql/tools/admin/__tests__/monitoring-summary.test.ts +274 -0
- package/src/adapters/mysql/tools/admin/__tests__/monitoring.test.ts +94 -5
- package/src/adapters/mysql/tools/admin/backup.ts +193 -143
- package/src/adapters/mysql/tools/admin/maintenance.ts +118 -69
- package/src/adapters/mysql/tools/admin/monitoring.ts +201 -125
- package/src/adapters/mysql/tools/cluster/__tests__/group-replication.test.ts +69 -0
- package/src/adapters/mysql/tools/cluster/__tests__/innodb-cluster.test.ts +141 -0
- package/src/adapters/mysql/tools/cluster/group-replication.ts +172 -132
- package/src/adapters/mysql/tools/cluster/innodb-cluster.ts +231 -157
- package/src/adapters/mysql/tools/codemode/__tests__/codemode-tool.test.ts +227 -0
- package/src/adapters/mysql/tools/codemode/index.ts +5 -3
- package/src/adapters/mysql/tools/core.ts +152 -38
- package/src/adapters/mysql/tools/docstore.ts +422 -205
- package/src/adapters/mysql/tools/events.ts +334 -233
- package/src/adapters/mysql/tools/json/__tests__/core.test.ts +20 -0
- package/src/adapters/mysql/tools/json/__tests__/enhanced.test.ts +82 -50
- package/src/adapters/mysql/tools/json/__tests__/helpers.test.ts +42 -3
- package/src/adapters/mysql/tools/json/core.ts +21 -42
- package/src/adapters/mysql/tools/json/enhanced.ts +22 -37
- package/src/adapters/mysql/tools/json/helpers.ts +21 -25
- package/src/adapters/mysql/tools/partitioning.ts +3 -0
- package/src/adapters/mysql/tools/performance/__tests__/analysis.test.ts +98 -5
- package/src/adapters/mysql/tools/performance/__tests__/optimization-coverage.test.ts +515 -0
- package/src/adapters/mysql/tools/performance/__tests__/optimization.test.ts +187 -0
- package/src/adapters/mysql/tools/performance/analysis.ts +95 -69
- package/src/adapters/mysql/tools/performance/optimization.ts +182 -153
- package/src/adapters/mysql/tools/proxysql.ts +314 -209
- package/src/adapters/mysql/tools/replication.ts +84 -57
- package/src/adapters/mysql/tools/roles.ts +274 -226
- package/src/adapters/mysql/tools/router.ts +181 -85
- package/src/adapters/mysql/tools/schema/__tests__/constraints.test.ts +13 -0
- package/src/adapters/mysql/tools/schema/__tests__/management.test.ts +60 -25
- package/src/adapters/mysql/tools/schema/__tests__/scheduled_events.test.ts +11 -0
- package/src/adapters/mysql/tools/schema/__tests__/triggers.test.ts +25 -4
- package/src/adapters/mysql/tools/schema/__tests__/views.test.ts +46 -14
- package/src/adapters/mysql/tools/schema/constraints.ts +22 -3
- package/src/adapters/mysql/tools/schema/management.ts +60 -15
- package/src/adapters/mysql/tools/schema/routines.ts +26 -4
- package/src/adapters/mysql/tools/schema/scheduled_events.ts +25 -3
- package/src/adapters/mysql/tools/schema/triggers.ts +27 -2
- package/src/adapters/mysql/tools/schema/views.ts +46 -8
- package/src/adapters/mysql/tools/security/__tests__/audit.test.ts +90 -4
- package/src/adapters/mysql/tools/security/audit.ts +113 -39
- package/src/adapters/mysql/tools/security/data-protection.ts +293 -233
- package/src/adapters/mysql/tools/security/encryption.ts +172 -139
- package/src/adapters/mysql/tools/shell/__tests__/backup.test.ts +29 -0
- package/src/adapters/mysql/tools/shell/backup.ts +90 -73
- package/src/adapters/mysql/tools/shell/restore.ts +62 -48
- package/src/adapters/mysql/tools/spatial/__tests__/operations.test.ts +22 -14
- package/src/adapters/mysql/tools/spatial/__tests__/queries.test.ts +65 -51
- package/src/adapters/mysql/tools/spatial/geometry.ts +23 -7
- package/src/adapters/mysql/tools/spatial/operations.ts +60 -31
- package/src/adapters/mysql/tools/spatial/queries.ts +142 -65
- package/src/adapters/mysql/tools/spatial/setup.ts +121 -55
- package/src/adapters/mysql/tools/stats/__tests__/comparative.test.ts +12 -10
- package/src/adapters/mysql/tools/stats/comparative.ts +150 -98
- package/src/adapters/mysql/tools/stats/descriptive.ts +204 -127
- package/src/adapters/mysql/tools/sysschema/__tests__/error-paths.test.ts +222 -0
- package/src/adapters/mysql/tools/sysschema/__tests__/performance.test.ts +45 -0
- package/src/adapters/mysql/tools/sysschema/__tests__/resources.test.ts +6 -3
- package/src/adapters/mysql/tools/sysschema/activity.ts +52 -27
- package/src/adapters/mysql/tools/sysschema/performance.ts +132 -68
- package/src/adapters/mysql/tools/sysschema/resources.ts +105 -67
- package/src/adapters/mysql/tools/text/__tests__/fulltext.test.ts +45 -17
- package/src/adapters/mysql/tools/text/fulltext.ts +27 -38
- package/src/adapters/mysql/tools/transactions.ts +49 -24
- package/src/adapters/mysql/types/proxysql-types.ts +38 -1
- package/src/adapters/mysql/types/router-types.ts +1 -1
- package/src/adapters/mysql/types/shell-types.ts +2 -2
- package/src/adapters/mysql/types.ts +632 -19
- package/src/auth/__tests__/scopes.test.ts +2 -2
- package/src/auth/scopes.ts +1 -1
- package/src/codemode/__tests__/api.test.ts +417 -0
- package/src/codemode/__tests__/sandbox-factory.test.ts +158 -0
- package/src/codemode/__tests__/sandbox.test.ts +301 -0
- package/src/codemode/__tests__/security.test.ts +368 -0
- package/src/codemode/__tests__/worker-sandbox.test.ts +179 -0
- package/src/codemode/__tests__/worker-script.test.ts +226 -0
- package/src/codemode/api.ts +89 -5
- package/src/codemode/sandbox-factory.ts +1 -1
- package/src/codemode/types.ts +34 -0
- package/src/codemode/worker-sandbox.ts +74 -7
- package/src/codemode/worker-script.ts +157 -86
- package/src/constants/ServerInstructions.ts +37 -31
- package/src/filtering/ToolConstants.ts +1 -2
- package/src/filtering/__tests__/ToolFilter.test.ts +9 -9
- package/src/pool/ConnectionPool.ts +4 -1
- package/src/transports/__tests__/http.test.ts +15 -3
- package/src/transports/http.ts +12 -0
- package/src/utils/validators.ts +2 -1
- package/vitest.config.ts +3 -1
- package/CODE_MODE.md +0 -245
|
@@ -4,7 +4,31 @@
|
|
|
4
4
|
* Tools for querying spatial relationships and distances.
|
|
5
5
|
* 4 tools: distance, distance_sphere, contains, within.
|
|
6
6
|
*/
|
|
7
|
-
import { z } from "zod";
|
|
7
|
+
import { z, ZodError } from "zod";
|
|
8
|
+
import { validateQualifiedIdentifier, escapeQualifiedTable, } from "../../../../utils/validators.js";
|
|
9
|
+
import { ValidationError } from "../../../../utils/validators.js";
|
|
10
|
+
// =============================================================================
|
|
11
|
+
// Helpers
|
|
12
|
+
// =============================================================================
|
|
13
|
+
/** Extract human-readable messages from a ZodError instead of raw JSON array */
|
|
14
|
+
function formatZodError(error) {
|
|
15
|
+
return error.issues.map((i) => i.message).join("; ");
|
|
16
|
+
}
|
|
17
|
+
/** Strip verbose adapter prefixes from MySQL error messages */
|
|
18
|
+
function stripErrorPrefix(msg) {
|
|
19
|
+
return msg.replace(/^(Query failed:\s*)?(Execute failed:\s*)?/i, "");
|
|
20
|
+
}
|
|
21
|
+
/** Safely extract a string field from raw params for error context */
|
|
22
|
+
function paramStr(params, key) {
|
|
23
|
+
if (params !== null &&
|
|
24
|
+
params !== undefined &&
|
|
25
|
+
typeof params === "object" &&
|
|
26
|
+
key in params) {
|
|
27
|
+
const val = params[key];
|
|
28
|
+
return typeof val === "string" ? val : "";
|
|
29
|
+
}
|
|
30
|
+
return "";
|
|
31
|
+
}
|
|
8
32
|
// =============================================================================
|
|
9
33
|
// Zod Schemas
|
|
10
34
|
// =============================================================================
|
|
@@ -57,21 +81,20 @@ export function createSpatialDistanceTool(adapter) {
|
|
|
57
81
|
idempotentHint: true,
|
|
58
82
|
},
|
|
59
83
|
handler: async (params, _context) => {
|
|
60
|
-
const { table, spatialColumn, point, maxDistance, limit, srid } = DistanceSchema.parse(params);
|
|
61
|
-
// Validate identifiers
|
|
62
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
63
|
-
throw new Error("Invalid table name");
|
|
64
|
-
}
|
|
65
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
66
|
-
throw new Error("Invalid column name");
|
|
67
|
-
}
|
|
68
84
|
try {
|
|
85
|
+
const { table, spatialColumn, point, maxDistance, limit, srid } = DistanceSchema.parse(params);
|
|
86
|
+
// Validate identifiers
|
|
87
|
+
validateQualifiedIdentifier(table, "table");
|
|
88
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
89
|
+
return { success: false, error: "Invalid column name" };
|
|
90
|
+
}
|
|
69
91
|
// Use 'axis-order=long-lat' to accept natural longitude-latitude order
|
|
70
92
|
const pointWkt = `POINT(${String(point.longitude)} ${String(point.latitude)})`;
|
|
93
|
+
const escapedTable = escapeQualifiedTable(table);
|
|
71
94
|
let query = `
|
|
72
|
-
SELECT *,
|
|
95
|
+
SELECT *, ST_AsText(\`${spatialColumn}\`) as ${spatialColumn}_wkt,
|
|
73
96
|
ST_Distance(\`${spatialColumn}\`, ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat')) as distance
|
|
74
|
-
FROM
|
|
97
|
+
FROM ${escapedTable}
|
|
75
98
|
`;
|
|
76
99
|
const queryParams = [pointWkt];
|
|
77
100
|
if (maxDistance !== undefined) {
|
|
@@ -80,18 +103,26 @@ export function createSpatialDistanceTool(adapter) {
|
|
|
80
103
|
}
|
|
81
104
|
query += ` ORDER BY distance LIMIT ${String(limit)}`;
|
|
82
105
|
const result = await adapter.executeQuery(query, queryParams);
|
|
106
|
+
// Strip raw binary spatial column from each row
|
|
107
|
+
const rows = (result.rows ?? []).map((row) => Object.fromEntries(Object.entries(row).filter(([key]) => key !== spatialColumn)));
|
|
83
108
|
return {
|
|
84
|
-
results:
|
|
85
|
-
count:
|
|
109
|
+
results: rows,
|
|
110
|
+
count: rows.length,
|
|
86
111
|
referencePoint: point,
|
|
87
112
|
};
|
|
88
113
|
}
|
|
89
114
|
catch (error) {
|
|
115
|
+
if (error instanceof ZodError) {
|
|
116
|
+
return { success: false, error: formatZodError(error) };
|
|
117
|
+
}
|
|
118
|
+
if (error instanceof ValidationError) {
|
|
119
|
+
return { success: false, error: error.message };
|
|
120
|
+
}
|
|
90
121
|
const msg = error instanceof Error ? error.message : String(error);
|
|
91
122
|
if (msg.includes("doesn't exist")) {
|
|
92
|
-
return { exists: false, table };
|
|
123
|
+
return { exists: false, table: paramStr(params, "table") };
|
|
93
124
|
}
|
|
94
|
-
return { success: false, error: msg };
|
|
125
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
95
126
|
}
|
|
96
127
|
},
|
|
97
128
|
};
|
|
@@ -112,21 +143,20 @@ export function createSpatialDistanceSphereTool(adapter) {
|
|
|
112
143
|
idempotentHint: true,
|
|
113
144
|
},
|
|
114
145
|
handler: async (params, _context) => {
|
|
115
|
-
const { table, spatialColumn, point, maxDistance, limit, srid } = DistanceSchema.parse(params);
|
|
116
|
-
// Validate identifiers
|
|
117
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
118
|
-
throw new Error("Invalid table name");
|
|
119
|
-
}
|
|
120
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
121
|
-
throw new Error("Invalid column name");
|
|
122
|
-
}
|
|
123
146
|
try {
|
|
147
|
+
const { table, spatialColumn, point, maxDistance, limit, srid } = DistanceSchema.parse(params);
|
|
148
|
+
// Validate identifiers
|
|
149
|
+
validateQualifiedIdentifier(table, "table");
|
|
150
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
151
|
+
return { success: false, error: "Invalid column name" };
|
|
152
|
+
}
|
|
124
153
|
// Use 'axis-order=long-lat' to accept natural longitude-latitude order
|
|
125
154
|
const pointWkt = `POINT(${String(point.longitude)} ${String(point.latitude)})`;
|
|
155
|
+
const escapedTable = escapeQualifiedTable(table);
|
|
126
156
|
let query = `
|
|
127
|
-
SELECT *,
|
|
157
|
+
SELECT *, ST_AsText(\`${spatialColumn}\`) as ${spatialColumn}_wkt,
|
|
128
158
|
ST_Distance_Sphere(\`${spatialColumn}\`, ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat')) as distance_meters
|
|
129
|
-
FROM
|
|
159
|
+
FROM ${escapedTable}
|
|
130
160
|
`;
|
|
131
161
|
const queryParams = [pointWkt];
|
|
132
162
|
if (maxDistance !== undefined) {
|
|
@@ -135,19 +165,27 @@ export function createSpatialDistanceSphereTool(adapter) {
|
|
|
135
165
|
}
|
|
136
166
|
query += ` ORDER BY distance_meters LIMIT ${String(limit)}`;
|
|
137
167
|
const result = await adapter.executeQuery(query, queryParams);
|
|
168
|
+
// Strip raw binary spatial column from each row
|
|
169
|
+
const rows = (result.rows ?? []).map((row) => Object.fromEntries(Object.entries(row).filter(([key]) => key !== spatialColumn)));
|
|
138
170
|
return {
|
|
139
|
-
results:
|
|
140
|
-
count:
|
|
171
|
+
results: rows,
|
|
172
|
+
count: rows.length,
|
|
141
173
|
referencePoint: point,
|
|
142
174
|
unit: "meters",
|
|
143
175
|
};
|
|
144
176
|
}
|
|
145
177
|
catch (error) {
|
|
178
|
+
if (error instanceof ZodError) {
|
|
179
|
+
return { success: false, error: formatZodError(error) };
|
|
180
|
+
}
|
|
181
|
+
if (error instanceof ValidationError) {
|
|
182
|
+
return { success: false, error: error.message };
|
|
183
|
+
}
|
|
146
184
|
const msg = error instanceof Error ? error.message : String(error);
|
|
147
185
|
if (msg.includes("doesn't exist")) {
|
|
148
|
-
return { exists: false, table };
|
|
186
|
+
return { exists: false, table: paramStr(params, "table") };
|
|
149
187
|
}
|
|
150
|
-
return { success: false, error: msg };
|
|
188
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
151
189
|
}
|
|
152
190
|
},
|
|
153
191
|
};
|
|
@@ -168,33 +206,40 @@ export function createSpatialContainsTool(adapter) {
|
|
|
168
206
|
idempotentHint: true,
|
|
169
207
|
},
|
|
170
208
|
handler: async (params, _context) => {
|
|
171
|
-
const { table, spatialColumn, polygon, limit, srid } = ContainsSchema.parse(params);
|
|
172
|
-
// Validate identifiers
|
|
173
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
174
|
-
throw new Error("Invalid table name");
|
|
175
|
-
}
|
|
176
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
177
|
-
throw new Error("Invalid column name");
|
|
178
|
-
}
|
|
179
209
|
try {
|
|
210
|
+
const { table, spatialColumn, polygon, limit, srid } = ContainsSchema.parse(params);
|
|
211
|
+
// Validate identifiers
|
|
212
|
+
validateQualifiedIdentifier(table, "table");
|
|
213
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
214
|
+
return { success: false, error: "Invalid column name" };
|
|
215
|
+
}
|
|
216
|
+
const escapedTable = escapeQualifiedTable(table);
|
|
180
217
|
const query = `
|
|
181
|
-
SELECT
|
|
182
|
-
FROM
|
|
218
|
+
SELECT *, ST_AsText(\`${spatialColumn}\`) as ${spatialColumn}_wkt
|
|
219
|
+
FROM ${escapedTable}
|
|
183
220
|
WHERE ST_Contains(ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat'), \`${spatialColumn}\`)
|
|
184
221
|
LIMIT ${String(limit)}
|
|
185
222
|
`;
|
|
186
223
|
const result = await adapter.executeQuery(query, [polygon]);
|
|
224
|
+
// Strip raw binary spatial column from each row
|
|
225
|
+
const rows = (result.rows ?? []).map((row) => Object.fromEntries(Object.entries(row).filter(([key]) => key !== spatialColumn)));
|
|
187
226
|
return {
|
|
188
|
-
results:
|
|
189
|
-
count:
|
|
227
|
+
results: rows,
|
|
228
|
+
count: rows.length,
|
|
190
229
|
};
|
|
191
230
|
}
|
|
192
231
|
catch (error) {
|
|
232
|
+
if (error instanceof ZodError) {
|
|
233
|
+
return { success: false, error: formatZodError(error) };
|
|
234
|
+
}
|
|
235
|
+
if (error instanceof ValidationError) {
|
|
236
|
+
return { success: false, error: error.message };
|
|
237
|
+
}
|
|
193
238
|
const msg = error instanceof Error ? error.message : String(error);
|
|
194
239
|
if (msg.includes("doesn't exist")) {
|
|
195
|
-
return { exists: false, table };
|
|
240
|
+
return { exists: false, table: paramStr(params, "table") };
|
|
196
241
|
}
|
|
197
|
-
return { success: false, error: msg };
|
|
242
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
198
243
|
}
|
|
199
244
|
},
|
|
200
245
|
};
|
|
@@ -215,33 +260,40 @@ export function createSpatialWithinTool(adapter) {
|
|
|
215
260
|
idempotentHint: true,
|
|
216
261
|
},
|
|
217
262
|
handler: async (params, _context) => {
|
|
218
|
-
const { table, spatialColumn, geometry, limit, srid } = WithinSchema.parse(params);
|
|
219
|
-
// Validate identifiers
|
|
220
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
221
|
-
throw new Error("Invalid table name");
|
|
222
|
-
}
|
|
223
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
224
|
-
throw new Error("Invalid column name");
|
|
225
|
-
}
|
|
226
263
|
try {
|
|
264
|
+
const { table, spatialColumn, geometry, limit, srid } = WithinSchema.parse(params);
|
|
265
|
+
// Validate identifiers
|
|
266
|
+
validateQualifiedIdentifier(table, "table");
|
|
267
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(spatialColumn)) {
|
|
268
|
+
return { success: false, error: "Invalid column name" };
|
|
269
|
+
}
|
|
270
|
+
const escapedTable = escapeQualifiedTable(table);
|
|
227
271
|
const query = `
|
|
228
|
-
SELECT
|
|
229
|
-
FROM
|
|
272
|
+
SELECT *, ST_AsText(\`${spatialColumn}\`) as ${spatialColumn}_wkt
|
|
273
|
+
FROM ${escapedTable}
|
|
230
274
|
WHERE ST_Within(\`${spatialColumn}\`, ST_GeomFromText(?, ${String(srid)}, 'axis-order=long-lat'))
|
|
231
275
|
LIMIT ${String(limit)}
|
|
232
276
|
`;
|
|
233
277
|
const result = await adapter.executeQuery(query, [geometry]);
|
|
278
|
+
// Strip raw binary spatial column from each row
|
|
279
|
+
const rows = (result.rows ?? []).map((row) => Object.fromEntries(Object.entries(row).filter(([key]) => key !== spatialColumn)));
|
|
234
280
|
return {
|
|
235
|
-
results:
|
|
236
|
-
count:
|
|
281
|
+
results: rows,
|
|
282
|
+
count: rows.length,
|
|
237
283
|
};
|
|
238
284
|
}
|
|
239
285
|
catch (error) {
|
|
286
|
+
if (error instanceof ZodError) {
|
|
287
|
+
return { success: false, error: formatZodError(error) };
|
|
288
|
+
}
|
|
289
|
+
if (error instanceof ValidationError) {
|
|
290
|
+
return { success: false, error: error.message };
|
|
291
|
+
}
|
|
240
292
|
const msg = error instanceof Error ? error.message : String(error);
|
|
241
293
|
if (msg.includes("doesn't exist")) {
|
|
242
|
-
return { exists: false, table };
|
|
294
|
+
return { exists: false, table: paramStr(params, "table") };
|
|
243
295
|
}
|
|
244
|
-
return { success: false, error: msg };
|
|
296
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
245
297
|
}
|
|
246
298
|
},
|
|
247
299
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/queries.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAOxB,gFAAgF;AAChF,cAAc;AACd,gFAAgF;AAEhF,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;IACxC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACzD,KAAK,EAAE,CAAC;SACL,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;QACrB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;KACrB,CAAC;SACD,QAAQ,CAAC,iBAAiB,CAAC;IAC9B,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACzE,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IACzD,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;CAChD,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;IACxC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACzD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,iCAAiC,CAAC;IAC/D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1D,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,OAAO,CAAC,IAAI,CAAC;SACb,QAAQ,CAAC,gEAAgE,CAAC;CAC9E,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC;IACxC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACzD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,6BAA6B,CAAC;IAC5D,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;IAC1D,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,OAAO,CAAC,IAAI,CAAC;SACb,QAAQ,CAAC,gEAAgE,CAAC;CAC9E,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAAqB;IAErB,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,KAAK,EAAE,wBAAwB;QAC/B,WAAW,EACT,wEAAwE;QAC1E,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,cAAc;QAC3B,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,GAC7D,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE/B,uBAAuB;YACvB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,CAAC;gBACH,uEAAuE;gBACvE,MAAM,QAAQ,GAAG,SAAS,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAE/E,IAAI,KAAK,GAAG;;uCAEmB,aAAa,0BAA0B,MAAM,CAAC,IAAI,CAAC;yBACjE,KAAK;aACjB,CAAC;gBAEN,MAAM,WAAW,GAAc,CAAC,QAAQ,CAAC,CAAC;gBAE1C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,KAAK,IAAI,wBAAwB,aAAa,0BAA0B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC;oBACrH,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1C,CAAC;gBAED,KAAK,IAAI,4BAA4B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAErD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBAC9D,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;oBAC/B,cAAc,EAAE,KAAK;iBACtB,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAC7C,OAAqB;IAErB,OAAO;QACL,IAAI,EAAE,+BAA+B;QACrC,KAAK,EAAE,0BAA0B;QACjC,WAAW,EACT,0FAA0F;QAC5F,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,cAAc;QAC3B,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,GAC7D,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE/B,uBAAuB;YACvB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,CAAC;gBACH,uEAAuE;gBACvE,MAAM,QAAQ,GAAG,SAAS,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAE/E,IAAI,KAAK,GAAG;;8CAE0B,aAAa,0BAA0B,MAAM,CAAC,IAAI,CAAC;yBACxE,KAAK;aACjB,CAAC;gBAEN,MAAM,WAAW,GAAc,CAAC,QAAQ,CAAC,CAAC;gBAE1C,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC9B,KAAK,IAAI,+BAA+B,aAAa,0BAA0B,MAAM,CAAC,IAAI,CAAC,gCAAgC,CAAC;oBAC5H,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;gBAC1C,CAAC;gBAED,KAAK,IAAI,mCAAmC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAE5D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBAC9D,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;oBAC/B,cAAc,EAAE,KAAK;oBACrB,IAAI,EAAE,QAAQ;iBACf,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAAqB;IAErB,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,KAAK,EAAE,wBAAwB;QAC/B,WAAW,EACT,uEAAuE;QACzE,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,cAAc;QAC3B,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,GAClD,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE/B,uBAAuB;YACvB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG;;yBAEG,KAAK;uDACyB,MAAM,CAAC,IAAI,CAAC,+BAA+B,aAAa;wBACvF,MAAM,CAAC,KAAK,CAAC;aACxB,CAAC;gBAEN,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC5D,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;iBAChC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAqB;IAC3D,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,KAAK,EAAE,sBAAsB;QAC7B,WAAW,EAAE,8DAA8D;QAC3E,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,YAAY;QACzB,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,WAAW,EAAE;YACX,YAAY,EAAE,IAAI;YAClB,cAAc,EAAE,IAAI;SACrB;QACD,OAAO,EAAE,KAAK,EAAE,MAAe,EAAE,QAAwB,EAAE,EAAE;YAC3D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,GACnD,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE7B,uBAAuB;YACvB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG;;yBAEG,KAAK;oCACM,aAAa,0BAA0B,MAAM,CAAC,IAAI,CAAC;wBAC/D,MAAM,CAAC,KAAK,CAAC;aACxB,CAAC;gBAEN,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7D,OAAO;oBACL,OAAO,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBAC1B,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;iBAChC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,GAAG,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACnE,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC;oBAClC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAClC,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/queries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;AAsEpC;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,YAAY,GACpB,cAAc,CAsEhB;AAED;;GAEG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,YAAY,GACpB,cAAc,CAgHhB"}
|
|
@@ -4,26 +4,48 @@
|
|
|
4
4
|
* Tools for creating and managing spatial columns and indexes.
|
|
5
5
|
* 2 tools: column creation and index creation.
|
|
6
6
|
*/
|
|
7
|
-
import { z } from "zod";
|
|
7
|
+
import { z, ZodError } from "zod";
|
|
8
|
+
import { validateQualifiedIdentifier, escapeQualifiedTable, } from "../../../../utils/validators.js";
|
|
9
|
+
import { ValidationError } from "../../../../utils/validators.js";
|
|
10
|
+
// =============================================================================
|
|
11
|
+
// Helpers
|
|
12
|
+
// =============================================================================
|
|
13
|
+
/** Extract human-readable messages from a ZodError instead of raw JSON array */
|
|
14
|
+
function formatZodError(error) {
|
|
15
|
+
return error.issues.map((i) => i.message).join("; ");
|
|
16
|
+
}
|
|
17
|
+
/** Strip verbose adapter prefixes from MySQL error messages */
|
|
18
|
+
function stripErrorPrefix(msg) {
|
|
19
|
+
return msg.replace(/^(Query failed:\s*)?(Execute failed:\s*)?/i, "");
|
|
20
|
+
}
|
|
21
|
+
/** Safely extract a string field from raw params for error context */
|
|
22
|
+
function paramStr(params, key) {
|
|
23
|
+
if (params !== null &&
|
|
24
|
+
params !== undefined &&
|
|
25
|
+
typeof params === "object" &&
|
|
26
|
+
key in params) {
|
|
27
|
+
const val = params[key];
|
|
28
|
+
return typeof val === "string" ? val : "";
|
|
29
|
+
}
|
|
30
|
+
return "";
|
|
31
|
+
}
|
|
8
32
|
// =============================================================================
|
|
9
33
|
// Zod Schemas
|
|
10
34
|
// =============================================================================
|
|
35
|
+
const VALID_GEOMETRY_TYPES = new Set([
|
|
36
|
+
"POINT",
|
|
37
|
+
"LINESTRING",
|
|
38
|
+
"POLYGON",
|
|
39
|
+
"GEOMETRY",
|
|
40
|
+
"MULTIPOINT",
|
|
41
|
+
"MULTILINESTRING",
|
|
42
|
+
"MULTIPOLYGON",
|
|
43
|
+
"GEOMETRYCOLLECTION",
|
|
44
|
+
]);
|
|
11
45
|
const SpatialColumnSchema = z.object({
|
|
12
46
|
table: z.string().describe("Table name"),
|
|
13
47
|
column: z.string().describe("Column name"),
|
|
14
|
-
type: z
|
|
15
|
-
.enum([
|
|
16
|
-
"POINT",
|
|
17
|
-
"LINESTRING",
|
|
18
|
-
"POLYGON",
|
|
19
|
-
"GEOMETRY",
|
|
20
|
-
"MULTIPOINT",
|
|
21
|
-
"MULTILINESTRING",
|
|
22
|
-
"MULTIPOLYGON",
|
|
23
|
-
"GEOMETRYCOLLECTION",
|
|
24
|
-
])
|
|
25
|
-
.default("GEOMETRY")
|
|
26
|
-
.describe("Geometry type"),
|
|
48
|
+
type: z.string().default("GEOMETRY").describe("Geometry type"),
|
|
27
49
|
srid: z
|
|
28
50
|
.number()
|
|
29
51
|
.default(4326)
|
|
@@ -53,18 +75,25 @@ export function createSpatialCreateColumnTool(adapter) {
|
|
|
53
75
|
readOnlyHint: false,
|
|
54
76
|
},
|
|
55
77
|
handler: async (params, _context) => {
|
|
56
|
-
const { table, column, type, srid, nullable } = SpatialColumnSchema.parse(params);
|
|
57
|
-
// Validate identifiers
|
|
58
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
59
|
-
throw new Error("Invalid table name");
|
|
60
|
-
}
|
|
61
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(column)) {
|
|
62
|
-
throw new Error("Invalid column name");
|
|
63
|
-
}
|
|
64
78
|
try {
|
|
79
|
+
const { table, column, type, srid, nullable } = SpatialColumnSchema.parse(params);
|
|
80
|
+
// Validate identifiers
|
|
81
|
+
validateQualifiedIdentifier(table, "table");
|
|
82
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(column)) {
|
|
83
|
+
return { success: false, error: "Invalid column name" };
|
|
84
|
+
}
|
|
85
|
+
// Validate geometry type
|
|
86
|
+
const upperType = type.toUpperCase();
|
|
87
|
+
if (!VALID_GEOMETRY_TYPES.has(upperType)) {
|
|
88
|
+
return {
|
|
89
|
+
success: false,
|
|
90
|
+
error: `Invalid type: '${type}' — expected one of: ${[...VALID_GEOMETRY_TYPES].join(", ")}`,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
65
93
|
const nullClause = nullable ? "" : " NOT NULL";
|
|
66
94
|
const sridClause = srid ? ` SRID ${String(srid)}` : "";
|
|
67
|
-
await adapter.executeQuery(`ALTER TABLE
|
|
95
|
+
await adapter.executeQuery(`ALTER TABLE ${escapeQualifiedTable(table)} ADD COLUMN \`${column}\` ${upperType}${sridClause}${nullClause}`);
|
|
96
|
+
adapter.clearSchemaCache();
|
|
68
97
|
return {
|
|
69
98
|
success: true,
|
|
70
99
|
table,
|
|
@@ -75,17 +104,25 @@ export function createSpatialCreateColumnTool(adapter) {
|
|
|
75
104
|
};
|
|
76
105
|
}
|
|
77
106
|
catch (error) {
|
|
107
|
+
if (error instanceof ZodError) {
|
|
108
|
+
return { success: false, error: formatZodError(error) };
|
|
109
|
+
}
|
|
110
|
+
if (error instanceof ValidationError) {
|
|
111
|
+
return { success: false, error: error.message };
|
|
112
|
+
}
|
|
78
113
|
const msg = error instanceof Error ? error.message : String(error);
|
|
79
114
|
if (msg.includes("doesn't exist")) {
|
|
80
|
-
return { exists: false, table };
|
|
115
|
+
return { exists: false, table: paramStr(params, "table") };
|
|
81
116
|
}
|
|
82
117
|
if (msg.includes("Duplicate column name")) {
|
|
118
|
+
const col = paramStr(params, "column");
|
|
119
|
+
const tbl = paramStr(params, "table");
|
|
83
120
|
return {
|
|
84
121
|
success: false,
|
|
85
|
-
|
|
122
|
+
error: `Column '${col}' already exists on table '${tbl}'`,
|
|
86
123
|
};
|
|
87
124
|
}
|
|
88
|
-
return { success: false, error: msg };
|
|
125
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
89
126
|
}
|
|
90
127
|
},
|
|
91
128
|
};
|
|
@@ -105,45 +142,52 @@ export function createSpatialCreateIndexTool(adapter) {
|
|
|
105
142
|
readOnlyHint: false,
|
|
106
143
|
},
|
|
107
144
|
handler: async (params, _context) => {
|
|
108
|
-
const { table, column, indexName } = SpatialIndexSchema.parse(params);
|
|
109
|
-
// Validate identifiers
|
|
110
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(table)) {
|
|
111
|
-
throw new Error("Invalid table name");
|
|
112
|
-
}
|
|
113
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(column)) {
|
|
114
|
-
throw new Error("Invalid column name");
|
|
115
|
-
}
|
|
116
|
-
const idxName = indexName ?? `idx_spatial_${table}_${column}`;
|
|
117
|
-
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(idxName)) {
|
|
118
|
-
throw new Error("Invalid index name");
|
|
119
|
-
}
|
|
120
145
|
try {
|
|
146
|
+
const { table, column, indexName } = SpatialIndexSchema.parse(params);
|
|
147
|
+
// Validate identifiers
|
|
148
|
+
validateQualifiedIdentifier(table, "table");
|
|
149
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(column)) {
|
|
150
|
+
return { success: false, error: "Invalid column name" };
|
|
151
|
+
}
|
|
152
|
+
// For qualified names (schema.table), split for information_schema queries
|
|
153
|
+
const parts = table.split(".");
|
|
154
|
+
const bareTable = parts.length > 1 ? parts[1] : parts[0];
|
|
155
|
+
const schemaClause = parts.length > 1 ? "TABLE_SCHEMA = ?" : "TABLE_SCHEMA = DATABASE()";
|
|
156
|
+
const schemaParams = parts.length > 1 ? [parts[0]] : [];
|
|
157
|
+
const idxName = indexName ?? `idx_spatial_${bareTable}_${column}`;
|
|
158
|
+
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(idxName)) {
|
|
159
|
+
return { success: false, error: "Invalid index name" };
|
|
160
|
+
}
|
|
121
161
|
// Check if column is nullable - SPATIAL indexes require NOT NULL
|
|
122
162
|
const colInfo = await adapter.executeQuery(`SELECT IS_NULLABLE, DATA_TYPE FROM information_schema.COLUMNS
|
|
123
|
-
WHERE
|
|
163
|
+
WHERE ${schemaClause} AND TABLE_NAME = ? AND COLUMN_NAME = ?`, [...schemaParams, bareTable, column]);
|
|
124
164
|
const colRow = colInfo.rows?.[0];
|
|
125
165
|
if (colRow) {
|
|
126
166
|
const isNullable = colRow["IS_NULLABLE"] === "YES";
|
|
127
167
|
const dataType = String(colRow["DATA_TYPE"]).toUpperCase();
|
|
128
168
|
if (isNullable) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
`
|
|
169
|
+
return {
|
|
170
|
+
success: false,
|
|
171
|
+
error: `Cannot create SPATIAL index on nullable column '${column}'. ` +
|
|
172
|
+
`Alter the column to NOT NULL first: ` +
|
|
173
|
+
`ALTER TABLE ${escapeQualifiedTable(table)} MODIFY \`${column}\` ${dataType} NOT NULL`,
|
|
174
|
+
};
|
|
132
175
|
}
|
|
133
176
|
}
|
|
134
177
|
// Check if a SPATIAL index already exists on this column (any name)
|
|
135
178
|
const existingIdx = await adapter.executeQuery(`SELECT INDEX_NAME FROM information_schema.STATISTICS
|
|
136
|
-
WHERE
|
|
137
|
-
LIMIT 1`, [
|
|
179
|
+
WHERE ${schemaClause} AND TABLE_NAME = ? AND COLUMN_NAME = ? AND INDEX_TYPE = 'SPATIAL'
|
|
180
|
+
LIMIT 1`, [...schemaParams, bareTable, column]);
|
|
138
181
|
const existingRow = existingIdx.rows?.[0];
|
|
139
182
|
if (existingRow) {
|
|
140
183
|
const existingName = String(existingRow["INDEX_NAME"]);
|
|
141
184
|
return {
|
|
142
185
|
success: false,
|
|
143
|
-
|
|
186
|
+
error: `Spatial index '${existingName}' already exists on column '${column}' of table '${table}'`,
|
|
144
187
|
};
|
|
145
188
|
}
|
|
146
|
-
await adapter.executeQuery(`CREATE SPATIAL INDEX \`${idxName}\` ON
|
|
189
|
+
await adapter.executeQuery(`CREATE SPATIAL INDEX \`${idxName}\` ON ${escapeQualifiedTable(table)}(\`${column}\`)`);
|
|
190
|
+
adapter.clearSchemaCache();
|
|
147
191
|
return {
|
|
148
192
|
success: true,
|
|
149
193
|
table,
|
|
@@ -152,20 +196,29 @@ export function createSpatialCreateIndexTool(adapter) {
|
|
|
152
196
|
};
|
|
153
197
|
}
|
|
154
198
|
catch (error) {
|
|
199
|
+
if (error instanceof ZodError) {
|
|
200
|
+
return { success: false, error: formatZodError(error) };
|
|
201
|
+
}
|
|
202
|
+
if (error instanceof ValidationError) {
|
|
203
|
+
return { success: false, error: error.message };
|
|
204
|
+
}
|
|
155
205
|
const msg = error instanceof Error ? error.message : String(error);
|
|
206
|
+
const tbl = paramStr(params, "table");
|
|
156
207
|
if (msg.includes("doesn't exist")) {
|
|
157
|
-
return { exists: false, table };
|
|
208
|
+
return { exists: false, table: tbl };
|
|
158
209
|
}
|
|
159
210
|
if (msg.includes("Cannot create SPATIAL index on nullable column")) {
|
|
160
|
-
return { success: false,
|
|
211
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
161
212
|
}
|
|
213
|
+
const idxFromParams = paramStr(params, "indexName");
|
|
214
|
+
const idx = idxFromParams || `idx_spatial_${tbl}_${paramStr(params, "column")}`;
|
|
162
215
|
if (msg.includes("Duplicate key name")) {
|
|
163
216
|
return {
|
|
164
217
|
success: false,
|
|
165
|
-
|
|
218
|
+
error: `Index '${idx}' already exists on table '${tbl}'`,
|
|
166
219
|
};
|
|
167
220
|
}
|
|
168
|
-
return { success: false, error: msg };
|
|
221
|
+
return { success: false, error: stripErrorPrefix(msg) };
|
|
169
222
|
}
|
|
170
223
|
},
|
|
171
224
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/spatial/setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comparative.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/stats/comparative.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"comparative.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/mysql/tools/stats/comparative.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EACV,cAAc,EAEf,MAAM,4BAA4B,CAAC;AA8CpC;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CA8F3E;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CA4G1E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,cAAc,CA4HzE"}
|