Skip to content

Commit 478a42c

Browse files
smolasmola
authored
Merge pull request #117 from smola/use-sqle
split gitql and sqle, fix #88, fix #89
2 parents 7154635 + 78d5c25 commit 478a42c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+53
-5230
lines changed

Diff for: ‎.travis.yml

+10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,17 @@ language: go
22
sudo: false
33
go:
44
- 1.7
5+
- 1.8
6+
- tip
7+
matrix:
8+
fast_finish: true
9+
allow_failures:
10+
- go: tip
511
before_install:
12+
- rm -rf $GOPATH/src/gopkg.in/sqle
13+
- mkdir -p $GOPATH/src/gopkg.in/sqle
14+
- ln -s $PWD $GOPATH/src/gopkg.in/sqle/gitql.v0
15+
- cd $GOPATH/src/gopkg.in/sqle/gitql.v0
616
- go get -t -v ./...
717
install:
818
- go build -ldflags="-X main.version=$TRAVIS_TAG" -v -o gitql ./cmd/...

Diff for: ‎README.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<p align="center">
2-
<img src="https://rawgit.com/gitql/gitql/master/gitql-logo.svg">
2+
<img src="https://rawgit.com/sqle/gitql/master/gitql-logo.svg">
33
</p>
44

55
<p align="center">
6-
<a href="https://codebeat.co/projects/gb.xjqchip.workers.dev-gitql-gitql"><img alt="codebeat badge" src="https://codebeat.co/badges/ff0a63ef-e1b1-4a8a-9662-8b2ae17718fa" /></a>
7-
8-
<a href="https://travis-ci.org/gitql/gitql"><img alt="Build Status" src="https://travis-ci.org/gitql/gitql.svg?branch=master" /></a>
6+
7+
<a href="https://codebeat.co/projects/gb.xjqchip.workers.dev-sqle-gitql"><img alt="codebeat badge" src="https://codebeat.co/badges/d797a013-326b-4686-a1a7-adcb3039f65c" /></a>
8+
9+
<a href="https://travis-ci.org/sqle/gitql"><img alt="Build Status" src="https://travis-ci.org/sqle/gitql.svg?branch=master" /></a>
910

10-
<a href="https://codecov.io/gh/gitql/gitql"><img alt="codecov" src="https://codecov.io/gh/gitql/gitql/branch/master/graph/badge.svg" /></a>
11+
<a href="https://codecov.io/gh/sqle/gitql"><img alt="codecov" src="https://codecov.io/gh/sqle/gitql/branch/master/graph/badge.svg" /></a>
1112

12-
<a href="https://godoc.org/github.com/gitql/gitql"><img alt="GoDoc" src="https://godoc.org/github.com/gitql/gitql?status.svg" /></a>
13+
<a href="https://godoc.org/gopkg.in/sqle/gitql.v0"><img alt="GoDoc" src="https://godoc.org/gopkg.in/sqle/gitql.v0?status.svg" /></a>
1314
</p>
1415

1516
<a href="https://asciinema.org/a/102733?autoplay=1" target="_blank"><img src="https://asciinema.org/a/102733.png" width="979"/></a>
1617

1718
## Installation
1819

19-
Check the [Releases](https://github.com/gitql/gitql/releases) page to download
20+
Check the [Releases](https://github.com/sqle/gitql/releases) page to download
2021
the gitql binary.
2122

2223
## Usage
@@ -95,4 +96,4 @@ We are continuously adding more functionality to gitql. We support a subset of t
9596

9697
## License
9798

98-
gitql is licensed under the [MIT License](https://github.com/gitql/gitql/blob/master/LICENSE).
99+
gitql is licensed under the [MIT License](https://github.com/sqle/gitql/blob/master/LICENSE).

Diff for: ‎git/blobs.go renamed to ‎blobs.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package git
1+
package gitql
22

33
import (
4-
"github.com/gitql/gitql/sql"
4+
"gopkg.in/sqle/sqle.v0/sql"
55

66
"srcd.works/go-git.v4"
77
"srcd.works/go-git.v4/plumbing/object"

Diff for: ‎git/blobs_test.go renamed to ‎blobs_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package git
1+
package gitql
22

33
import (
44
"testing"
55

6-
"github.com/gitql/gitql/sql"
6+
"gopkg.in/sqle/sqle.v0/sql"
77

88
"github.com/src-d/go-git-fixtures"
99
"github.com/stretchr/testify/assert"

Diff for: ‎cmd/gitql/query_base.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"os"
66
"path/filepath"
77

8-
"github.com/gitql/gitql"
9-
"github.com/gitql/gitql/git"
10-
"github.com/gitql/gitql/internal/format"
8+
"gopkg.in/sqle/gitql.v0"
9+
"gopkg.in/sqle/gitql.v0/internal/format"
10+
"gopkg.in/sqle/sqle.v0"
1111

1212
gogit "srcd.works/go-git.v4"
1313
"srcd.works/go-git.v4/utils/ioutil"
@@ -32,8 +32,8 @@ func (c *cmdQueryBase) buildDatabase() error {
3232
}
3333

3434
c.name = filepath.Base(filepath.Join(c.Path, ".."))
35-
gitql.DefaultEngine.AddDatabase(git.NewDatabase(c.name, r))
36-
c.db, err = sql.Open(gitql.DriverName, "")
35+
sqle.DefaultEngine.AddDatabase(gitql.NewDatabase(c.name, r))
36+
c.db, err = sql.Open(sqle.DriverName, "")
3737
return err
3838
}
3939

Diff for: ‎git/commits.go renamed to ‎commits.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package git
1+
package gitql
22

33
import (
4-
"github.com/gitql/gitql/sql"
4+
"gopkg.in/sqle/sqle.v0/sql"
55

66
"srcd.works/go-git.v4"
77
"srcd.works/go-git.v4/plumbing/object"

Diff for: ‎git/commits_test.go renamed to ‎commits_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package git
1+
package gitql
22

33
import (
44
"testing"
55

6-
"github.com/gitql/gitql/sql"
6+
"gopkg.in/sqle/sqle.v0/sql"
77

88
"github.com/src-d/go-git-fixtures"
99
"github.com/stretchr/testify/assert"

Diff for: ‎git/database.go renamed to ‎database.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package git
1+
package gitql
22

33
import (
4-
"github.com/gitql/gitql/sql"
4+
"gopkg.in/sqle/sqle.v0/sql"
55

66
"srcd.works/go-git.v4"
77
)

Diff for: ‎git/database_test.go renamed to ‎database_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package git
1+
package gitql
22

33
import (
44
"sort"
55
"testing"
66

7-
"github.com/gitql/gitql/sql"
7+
"gopkg.in/sqle/sqle.v0/sql"
88

99
"github.com/src-d/go-git-fixtures"
1010
"github.com/stretchr/testify/assert"
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func init() {
17-
fixtures.RootFolder = "../../../../github.com/src-d/go-git-fixtures/"
17+
fixtures.RootFolder = "../../../github.com/src-d/go-git-fixtures/"
1818
}
1919

2020
const (

Diff for: ‎engine.go

-221
This file was deleted.

0 commit comments

Comments
 (0)