darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #704 from nils-werner/small_sql_maintenance

Browse source 
Small sql maintenance
This commit is contained in:
Brad Rydzewski 2014-11-15 13:19:27 -08:00
commit 91c2678b3d
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -13,8 +13,9 @@ test:
go test -cover -short ./...
test_mysql:
mysql -P 3306 --protocol=tcp -u root -e 'create database test;'
mysql -P 3306 --protocol=tcp -u root -e 'create database if not exists test;'
TEST_DRIVER="mysql" TEST_DATASOURCE="root@tcp(127.0.0.1:3306)/test" go test -short github.com/drone/drone/server/datastore/database
mysql -P 3306 --protocol=tcp -u root -e 'drop database test;'
test_postgres:
TEST_DRIVER="postgres" TEST_DATASOURCE="host=127.0.0.1 user=postgres dbname=postgres sslmode=disable" go test -short github.com/drone/drone/server/datastore/database
@ -26,8 +27,8 @@ build:
go build -o packaging/root/usr/local/bin/droned -ldflags "-X main.revision $(SHA)" github.com/drone/drone/server
install:
install -t /usr/local/bin packaging/root/usr/local/bin/drone
install -t /usr/local/bin packaging/root/usr/local/bin/droned
install -t /usr/local/bin packaging/root/usr/local/bin/drone
install -t /usr/local/bin packaging/root/usr/local/bin/droned
run:
@go run server/main.go --config=$$HOME/.drone/config.toml

13
server/datastore/database/repo.go
View file

@ -79,13 +79,12 @@ LIMIT 1;
// SQL statement to retrieve a list of Repos
// with permissions for the given User ID.
const repoListQuery = `
SELECT *
FROM repos
WHERE repo_id IN (
SELECT repo_id
FROM perms
WHERE user_id = ?
);
SELECT r.*
FROM
repos r
,perms p
WHERE r.repo_id = p.repo_id
AND p.user_id = ?
`
// SQL statement to delete a User by ID.