Skip to content

Commit

Permalink
Move github.com/go-xorm/xorm to xorm.io/xorm (go-xorm#1459)
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny authored and Gitea committed Oct 15, 2019
1 parent 33fc33b commit b81aa40
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 108 deletions.
46 changes: 4 additions & 42 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,11 @@ platform:
os: linux
arch: amd64

clone:
disable: true

workspace:
base: /go
path: src/github.com/go-xorm/xorm
path: src/gitea.com/xorm/xorm

steps:
- name: git
pull: default
image: plugins/git:next
settings:
depth: 50
tags: true

- name: init_postgres
pull: default
image: postgres:9.5
Expand Down Expand Up @@ -186,21 +176,11 @@ platform:
os: linux
arch: amd64

clone:
disable: true

workspace:
base: /go
path: src/github.com/go-xorm/xorm
path: src/gitea.com/xorm/xorm

steps:
- name: git
pull: default
image: plugins/git:next
settings:
depth: 50
tags: true

- name: init_postgres
pull: default
image: postgres:9.5
Expand Down Expand Up @@ -406,20 +386,11 @@ platform:
os: linux
arch: amd64

clone:
disable: true

workspace:
base: /go
path: src/github.com/go-xorm/xorm
path: src/gitea.com/xorm/xorm

steps:
- name: git
pull: default
image: plugins/git:next
settings:
depth: 50
tags: true

- name: build
pull: default
Expand Down Expand Up @@ -618,20 +589,11 @@ platform:
os: linux
arch: amd64

clone:
disable: true

workspace:
base: /go
path: src/github.com/go-xorm/xorm
path: src/gitea.com/xorm/xorm

steps:
- name: git
pull: default
image: plugins/git:next
settings:
depth: 50
tags: true

- name: build
pull: default
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ proposed functionality.
We appreciate any bug reports, but especially ones with self-contained
(doesn't depend on code outside of xorm), minimal (can't be simplified
further) test cases. It's especially helpful if you can submit a pull
request with just the failing test case(you can find some example test file like [session_get_test.go](https://github.com/go-xorm/xorm/blob/master/session_get_test.go)).
request with just the failing test case(you can find some example test file like [session_get_test.go](https://gitea.com/xorm/xorm/src/branch/master/session_get_test.go)).

If you implements a new database interface, you maybe need to add a test_<databasename>.sh file.
For example, [mysql_test.go](https://github.com/go-xorm/xorm/blob/master/test_mysql.sh)
For example, [mysql_test.go](https://gitea.com/xorm/xorm/src/branch/master/test_mysql.sh)

### New functionality

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# xorm

[中文](https://github.com/go-xorm/xorm/blob/master/README_CN.md)
[中文](https://gitea.com/xorm/xorm/src/branch/master/README_CN.md)

Xorm is a simple and powerful ORM for Go.

[![CircleCI](https://circleci.com/gh/go-xorm/xorm.svg?style=shield)](https://circleci.com/gh/go-xorm/xorm) [![codecov](https://codecov.io/gh/go-xorm/xorm/branch/master/graph/badge.svg)](https://codecov.io/gh/go-xorm/xorm)
[![](https://goreportcard.com/badge/github.com/go-xorm/xorm)](https://goreportcard.com/report/github.com/go-xorm/xorm)
[![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)](http://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)

## Features
Expand Down Expand Up @@ -56,13 +56,13 @@ Drivers for Go's sql package which currently support database/sql includes:

## Installation

go get github.com/go-xorm/xorm
go get xorm.io/xorm

## Documents

* [Manual](http://xorm.io/docs)

* [GoDoc](http://godoc.org/github.com/go-xorm/xorm)
* [GoDoc](http://godoc.org/xorm.io/xorm)

## Quick Start

Expand Down Expand Up @@ -337,7 +337,7 @@ if _, err := session.Exec("delete from userinfo where username = ?", user2.Usern
return nil
```

* Transation should on one go routine. There is transaction and resue session memory
* Transation should be on one go routine. There is transaction and resue session memory

```Go
session := engine.NewSession()
Expand Down Expand Up @@ -419,7 +419,7 @@ res, err := engine.Transaction(func(session *xorm.Session) (interface{}, error)

## Contributing

If you want to pull request, please see [CONTRIBUTING](https://github.com/go-xorm/xorm/blob/master/CONTRIBUTING.md). And we also provide [Xorm on Google Groups](https://groups.google.com/forum/#!forum/xorm) to discuss.
If you want to pull request, please see [CONTRIBUTING](https://gitea.com/xorm/xorm/src/branch/master/CONTRIBUTING.md). And we also provide [Xorm on Google Groups](https://groups.google.com/forum/#!forum/xorm) to discuss.

## Credits

Expand Down
14 changes: 6 additions & 8 deletions README_CN.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# xorm

[English](https://github.com/go-xorm/xorm/blob/master/README.md)
[English](https://gitea.com/xorm/xorm/src/branch/master/README.md)

xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作非常简便。

[![CircleCI](https://circleci.com/gh/go-xorm/xorm.svg?style=shield)](https://circleci.com/gh/go-xorm/xorm) [![codecov](https://codecov.io/gh/go-xorm/xorm/branch/master/graph/badge.svg)](https://codecov.io/gh/go-xorm/xorm)
[![](https://goreportcard.com/badge/github.com/go-xorm/xorm)](https://goreportcard.com/report/github.com/go-xorm/xorm)
[![Build Status](https://drone.gitea.com/api/badges/xorm/builder/status.svg)](https://drone.gitea.com/xorm/builder) [![](http://gocover.io/_badge/xorm.io/xorm)](http://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)

## 特性
Expand Down Expand Up @@ -56,15 +56,13 @@ xorm是一个简单而强大的Go语言ORM库. 通过它可以使数据库操作

## 安装

go get github.com/go-xorm/xorm
go get xorm.io/xorm

## 文档

* [操作指南](http://xorm.io/docs)

* [GoWalker代码文档](http://gowalker.org/github.com/go-xorm/xorm)

* [Godoc代码文档](http://godoc.org/github.com/go-xorm/xorm)
* [Godoc代码文档](http://godoc.org/xorm.io/xorm)

# 快速开始

Expand Down Expand Up @@ -414,7 +412,7 @@ res, err := engine.Transaction(func(session *xorm.Session) (interface{}, error)

## 贡献

如果您也想为Xorm贡献您的力量,请查看 [CONTRIBUTING](https://github.com/go-xorm/xorm/blob/master/CONTRIBUTING.md)。您也可以加入QQ群 技术帮助和讨论。
如果您也想为Xorm贡献您的力量,请查看 [CONTRIBUTING](https://gitea.com/xorm/xorm/src/branch/master/CONTRIBUTING.md)。您也可以加入QQ群 技术帮助和讨论。
群一:280360085 (已满)
群二:795010183

Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Installation
Make sure you have installed Go 1.6+ and then:
go get github.com/go-xorm/xorm
go get xorm.io/xorm
Create Engine
Expand Down
2 changes: 1 addition & 1 deletion examples/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/cachegoroutine.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"os"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/derive.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/find.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"time"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/goroutine.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"runtime"

_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/maxconnect.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"runtime"

_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/singlemapping.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

_ "github.com/go-sql-driver/mysql"
"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/tables.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"os"

"github.com/go-xorm/xorm"
"xorm.io/xorm"
_ "github.com/mattn/go-sqlite3"
)

Expand Down
9 changes: 2 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
module github.com/go-xorm/xorm
module xorm.io/xorm

go 1.11

require (
github.com/cockroachdb/apd v1.1.0 // indirect
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4
github.com/go-sql-driver/mysql v1.4.1
github.com/gofrs/uuid v3.2.0+incompatible // indirect
github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
github.com/jackc/pgx v3.6.0+incompatible
github.com/kr/pretty v0.1.0 // indirect
github.com/lib/pq v1.0.0
github.com/mattn/go-sqlite3 v1.10.0
github.com/pkg/errors v0.8.1 // indirect
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
github.com/stretchr/testify v1.4.0
github.com/ziutek/mymysql v1.5.4
xorm.io/builder v0.3.6
Expand Down
Loading

0 comments on commit b81aa40

Please sign in to comment.