Skip to content

Commit 5b4a84b

Browse files
authored
Fix v220 migration to be compatible for MSSQL 2008 r2 (#20702)
1 parent abdebd2 commit 5b4a84b

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

models/migrations/v220.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@ import (
1212
"xorm.io/xorm/schemas"
1313
)
1414

15-
func addContainerRepositoryProperty(x *xorm.Engine) error {
15+
func addContainerRepositoryProperty(x *xorm.Engine) (err error) {
1616
switch x.Dialect().URI().DBType {
1717
case schemas.SQLITE:
18-
_, err := x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, u.lower_name || '/' || p.lower_name FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?", packages_model.PropertyTypePackage, container_module.PropertyRepository, packages_model.TypeContainer)
19-
if err != nil {
20-
return err
21-
}
18+
_, err = x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, u.lower_name || '/' || p.lower_name FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?",
19+
packages_model.PropertyTypePackage, container_module.PropertyRepository, packages_model.TypeContainer)
20+
case schemas.MSSQL:
21+
_, err = x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, u.lower_name + '/' + p.lower_name FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?",
22+
packages_model.PropertyTypePackage, container_module.PropertyRepository, packages_model.TypeContainer)
2223
default:
23-
_, err := x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, CONCAT(u.lower_name, '/', p.lower_name) FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?", packages_model.PropertyTypePackage, container_module.PropertyRepository, packages_model.TypeContainer)
24-
if err != nil {
25-
return err
26-
}
24+
_, err = x.Exec("INSERT INTO package_property (ref_type, ref_id, name, value) SELECT ?, p.id, ?, CONCAT(u.lower_name, '/', p.lower_name) FROM package p JOIN `user` u ON p.owner_id = u.id WHERE p.type = ?",
25+
packages_model.PropertyTypePackage, container_module.PropertyRepository, packages_model.TypeContainer)
2726
}
28-
return nil
27+
return err
2928
}

0 commit comments

Comments
 (0)