From 844543c7daa40a7a52d85996fa0a1e782da660c3 Mon Sep 17 00:00:00 2001 From: cenxiao Date: Fri, 28 Feb 2025 06:26:20 +0000 Subject: [PATCH 1/3] fix drop index SQL for Oracle (#2469) Adjust drop index SQL to work with Oracle Autonomous DB Issue: DROP INDEX IDX_casdoor_permission_rule_PTYPE ON casdoor_permission_rule Error report - ORA-00933: SQL command not properly ended Expected: DROP INDEX IDX_casdoor_permission_rule_PTYPE Co-authored-by: Cenxiao Zhao Co-authored-by: Lunny Xiao Reviewed-on: https://gitea.com/xorm/xorm/pulls/2469 Reviewed-by: Lunny Xiao Co-authored-by: cenxiao Co-committed-by: cenxiao --- dialects/oracle.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dialects/oracle.go b/dialects/oracle.go index 5f614b1a..0170bcae 100644 --- a/dialects/oracle.go +++ b/dialects/oracle.go @@ -684,6 +684,17 @@ func (db *oracle) IndexCheckSQL(tableName, idxName string) (string, []interface{ `WHERE TABLE_NAME = :1 AND INDEX_NAME = :2`, args } +func (db *oracle) DropIndexSQL(tableName string, index *schemas.Index) string { + quote := db.dialect.Quoter().Quote + var name string + if index.IsRegular { + name = index.XName(tableName) + } else { + name = index.Name + } + return fmt.Sprintf("DROP INDEX %v", quote(name)) +} + func (db *oracle) IsTableExist(queryer core.Queryer, ctx context.Context, tableName string) (bool, error) { return db.HasRecords(queryer, ctx, `SELECT table_name FROM user_tables WHERE table_name = :1`, tableName) } From cd0ca0bbc6f4f0f2bc49bdf7b79da0870167d054 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Mar 2025 11:02:35 -0700 Subject: [PATCH 2/3] Update badges on README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 450d649e..20ae3e55 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Xorm is a simple and powerful ORM for Go. -[![Build Status](https://drone.gitea.com/api/badges/xorm/xorm/status.svg)](https://drone.gitea.com/xorm/xorm) [![](http://gocover.io/_badge/xorm.io/xorm)](https://gocover.io/xorm.io/xorm) [![](https://goreportcard.com/badge/xorm.io/xorm)](https://goreportcard.com/report/xorm.io/xorm) [![Join the chat at https://img.shields.io/discord/323460943201959939.svg](https://img.shields.io/discord/323460943201959939.svg)](https://discord.gg/HuR2CF3) +[![Build Status](https://gitea.com/xorm/xorm/actions/workflows/release-tag/badge.svg)](https://gitea.com/xorm/xorm/actions) [![](http://gocover.io/_badge/xorm.io/xorm)](https://gocover.io/xorm.io/xorm) [![](https://goreportcard.com/badge/xorm.io/xorm)](https://goreportcard.com/report/xorm.io/xorm) [![Join the chat at https://img.shields.io/discord/323460943201959939.svg](https://img.shields.io/discord/323460943201959939.svg)](https://discord.gg/HuR2CF3) ## Notice From cc4be22330e03eca735769d8bbb6d2f84e6fa938 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 12 Mar 2025 11:07:52 -0700 Subject: [PATCH 3/3] Disable cockroach tempororily --- .gitea/workflows/test-cockroach.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/test-cockroach.yml b/.gitea/workflows/test-cockroach.yml index 64c2a185..37874e3e 100644 --- a/.gitea/workflows/test-cockroach.yml +++ b/.gitea/workflows/test-cockroach.yml @@ -1,10 +1,11 @@ name: test cockroach -on: +on: push: branches: - - main - - v1 - pull_request: + - donttrigger # disabled for now + #- main + #- v1 + #pull_request: jobs: test-cockroach: