Skip to content

Commit

Permalink
Merge branch 'release/0.6.0-new'
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderdean committed Jan 1, 2018
2 parents 0ae72da + 69a1c50 commit 5e416bb
Show file tree
Hide file tree
Showing 189 changed files with 18,520 additions and 2,424 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ sudo: false

language: go
go:
- 1.6.4
- 1.7.4
- 1.8.5
- 1.9.2
- tip

before_install:
Expand All @@ -29,7 +29,7 @@ deploy:
provider: script
script: release-manager --config .release.yml --check-version --make-version --make-artifact --upload-artifact
on:
condition: '"${TRAVIS_GO_VERSION}" == "1.7.4"'
condition: '"${TRAVIS_GO_VERSION}" == "1.9.2"'
tags: true

addons:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
Version 0.6.0 (2017-01-01)
--------------------------
Bump Go version to 1.9.2 (#112)
Remove Go versions 1.6 and 1.7 from .travis.yml (#110)
Add support for Snowflake database (#114)
Add database-specific config.yml samples (#118)
Update README markdown in accordance with CommonMark (#104)

Version 0.5.2 (2017-01-13)
--------------------------
Update Copyright to 2015-2017 (#83)
Expand Down
127 changes: 79 additions & 48 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
# SQL Runner

[![Build Status] [travis-image]][travis] [![Coveralls][coveralls-image]][coveralls] [![Release][release-image]][releases] [![License][license-image]][license]
[![Build Status][travis-image]][travis] [![Coveralls][coveralls-image]][coveralls] [![Release][release-image]][releases] [![License][license-image]][license]

## Overview

Run playbooks of SQL scripts in series and parallel on Amazon Redshift and PostgreSQL.
Run playbooks of SQL scripts in series and parallel on Snowflake DB, Amazon Redshift and PostgreSQL.

Used with **[Snowplow] [snowplow]** for scheduled SQL-based transformations of event stream data.
Used with **[Snowplow][snowplow]** for scheduled SQL-based transformations of event stream data.

| **[Devops Guide] [devops-guide]** | **[Analysts Guide] [analysts-guide]** | **[Developers Guide] [developers-guide]** |
| **[Devops Guide][devops-guide]** | **[Analysts Guide][analysts-guide]** | **[Developers Guide][developers-guide]** |
|:--------------------------------------:|:-----------------------------------------:|:---------------------------------------------:|
| [![i1] [devops-image]] [devops-guide] | [![i2] [analysts-image]] [analysts-guide] | [![i3] [developers-image]] [developers-guide] |
| [![i1][devops-image]][devops-guide] | [![i2][analysts-image]][analysts-guide] | [![i3][developers-image]][developers-guide] |

## Quickstart

Assuming you are running on **64bit Linux**:

```bash
> wget http://dl.bintray.com/snowplow/snowplow-generic/sql_runner_0.5.2_linux_amd64.zip
> unzip sql_runner_0.5.2_linux_amd64.zip
> wget http://dl.bintray.com/snowplow/snowplow-generic/sql_runner_0.6.0_linux_amd64.zip
> unzip sql_runner_0.6.0_linux_amd64.zip
> ./sql-runner -usage
```

## Copyright and license

SQL Runner is copyright 2015-2017 Snowplow Analytics Ltd.

Licensed under the **[Apache License, Version 2.0] [license]** (the "License");
Licensed under the **[Apache License, Version 2.0][license]** (the "License");
you may not use this software except in compliance with the License.

Unless required by applicable law or agreed to in writing, software
Expand All @@ -38,7 +38,7 @@ limitations under the License.
[travis]: https://travis-ci.org/snowplow/sql-runner
[travis-image]: https://travis-ci.org/snowplow/sql-runner.png?branch=master

[release-image]: http://img.shields.io/badge/release-0.5.2-6ad7e5.svg?style=flat
[release-image]: http://img.shields.io/badge/release-0.6.0-6ad7e5.svg?style=flat
[releases]: https://github.com/snowplow/sql-runner/releases

[license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.2
0.6.0
30 changes: 30 additions & 0 deletions config/postgres.yml.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
targets:
- name: "My Postgres database"
type: postgres
host: ADD HERE
database: ADD HERE # Name of database
port: 5432 # Default Postgres port
username: ADD HERE
password: ADD HERE
ssl: false # SSL disabled by default
variables:
foo: bar
steps:
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
File renamed without changes.
33 changes: 33 additions & 0 deletions config/snowflake.yml.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
targets:
- name: "My Snowflake database"
type: snowflake
account: ADD HERE # Your Snowflake account name
region: ADD HERE # Leave blank for default us-east-1
database: ADD HERE # Name of database
warehouse: ADD HERE # Name of warehouse to run the queries
username: ADD HERE
password: ADD HERE
host: # Leave blank
port: # Leave blank
ssl: true # Snowflake connection is always secured by TLS
variables:
foo: bar
steps:
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
- name: ADD HERE
queries:
- name: ADD HERE
file: ADD REL/ABS PATH
template: true
2 changes: 1 addition & 1 deletion sql_runner/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
const (
CLI_NAME = "sql-runner"
CLI_DESCRIPTION = `Run playbooks of SQL scripts in series and parallel on Redshift and Postgres`
CLI_VERSION = "0.5.2"
CLI_VERSION = "0.6.0"

SQLROOT_BINARY = "BINARY"
SQLROOT_PLAYBOOK = "PLAYBOOK"
Expand Down
5 changes: 3 additions & 2 deletions sql_runner/playbook.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ type Playbook struct {
}

type Target struct {
Name, Type, Host, Database, Port, Username, Password string
Ssl bool
Name, Type, Host, Database, Port, Username,
Password, Region, Account, Warehouse string
Ssl bool
}

type Step struct {
Expand Down
Loading

0 comments on commit 5e416bb

Please sign in to comment.