dep: update deps
This commit is contained in:
parent
18a2049013
commit
840683528d
|
|
@ -229,6 +229,12 @@
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
revision = "fcd59fca7456889be7f2ad4515b7612fd6acef31"
|
revision = "fcd59fca7456889be7f2ad4515b7612fd6acef31"
|
||||||
|
|
||||||
|
[[projects]]
|
||||||
|
name = "github.com/gchaincl/dotsql"
|
||||||
|
packages = ["."]
|
||||||
|
revision = "5487b6a5fc12870425fc14d9e05a3fabddd91d7e"
|
||||||
|
version = "v0.1.0"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/go-ini/ini"
|
name = "github.com/go-ini/ini"
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
|
|
@ -503,6 +509,15 @@
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
revision = "7cafcd837844e784b526369c9bce262804aebc60"
|
revision = "7cafcd837844e784b526369c9bce262804aebc60"
|
||||||
|
|
||||||
|
[[projects]]
|
||||||
|
branch = "master"
|
||||||
|
name = "github.com/lib/pq"
|
||||||
|
packages = [
|
||||||
|
".",
|
||||||
|
"oid"
|
||||||
|
]
|
||||||
|
revision = "27ea5d92de30060e7121ddd543fe14e9a327e0cc"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
name = "github.com/lucas-clemente/aes12"
|
name = "github.com/lucas-clemente/aes12"
|
||||||
|
|
@ -553,6 +568,18 @@
|
||||||
revision = "ab3ca2f6f85577d7ec82e0a6df721147a2e737f9"
|
revision = "ab3ca2f6f85577d7ec82e0a6df721147a2e737f9"
|
||||||
version = "v2.0.1"
|
version = "v2.0.1"
|
||||||
|
|
||||||
|
[[projects]]
|
||||||
|
name = "github.com/mattes/migrate"
|
||||||
|
packages = [
|
||||||
|
".",
|
||||||
|
"database",
|
||||||
|
"database/postgres",
|
||||||
|
"source",
|
||||||
|
"source/go-bindata"
|
||||||
|
]
|
||||||
|
revision = "035c07716cd373d88456ec4d701402df52584cb4"
|
||||||
|
version = "v3.0.1"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/mattn/go-isatty"
|
name = "github.com/mattn/go-isatty"
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
|
|
@ -938,6 +965,6 @@
|
||||||
[solve-meta]
|
[solve-meta]
|
||||||
analyzer-name = "dep"
|
analyzer-name = "dep"
|
||||||
analyzer-version = 1
|
analyzer-version = 1
|
||||||
inputs-digest = "e0d2f0d7da737ab5517f0ff1c22588a2f835a8f37ef6b67e491ffd6e1e0defc3"
|
inputs-digest = "9eaa07e1d6ac7d535a05586369d4609d3930210539508423bac7cc4db97795d9"
|
||||||
solver-name = "gps-cdcl"
|
solver-name = "gps-cdcl"
|
||||||
solver-version = 1
|
solver-version = 1
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
||||||
|
*.o
|
||||||
|
*.a
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Folders
|
||||||
|
_obj
|
||||||
|
_test
|
||||||
|
|
||||||
|
# Architecture specific extensions/prefixes
|
||||||
|
*.[568vq]
|
||||||
|
[568vq].out
|
||||||
|
|
||||||
|
*.cgo1.go
|
||||||
|
*.cgo2.c
|
||||||
|
_cgo_defun.c
|
||||||
|
_cgo_gotypes.go
|
||||||
|
_cgo_export.*
|
||||||
|
|
||||||
|
_testmain.go
|
||||||
|
|
||||||
|
*.exe
|
||||||
|
*.test
|
||||||
|
*.prof
|
||||||
|
|
||||||
|
.env
|
||||||
|
|
@ -0,0 +1,6 @@
|
||||||
|
The author disclaims copyright to this source code. In place of
|
||||||
|
a legal notice, here is a blessing:
|
||||||
|
|
||||||
|
May you do good and not evil.
|
||||||
|
May you find forgiveness for yourself and forgive others.
|
||||||
|
May you share freely, never taking more than you give.
|
||||||
|
|
@ -0,0 +1,121 @@
|
||||||
|
Creative Commons Legal Code
|
||||||
|
|
||||||
|
CC0 1.0 Universal
|
||||||
|
|
||||||
|
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
|
||||||
|
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
|
||||||
|
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
|
||||||
|
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
|
||||||
|
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
|
||||||
|
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
|
||||||
|
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
|
||||||
|
HEREUNDER.
|
||||||
|
|
||||||
|
Statement of Purpose
|
||||||
|
|
||||||
|
The laws of most jurisdictions throughout the world automatically confer
|
||||||
|
exclusive Copyright and Related Rights (defined below) upon the creator
|
||||||
|
and subsequent owner(s) (each and all, an "owner") of an original work of
|
||||||
|
authorship and/or a database (each, a "Work").
|
||||||
|
|
||||||
|
Certain owners wish to permanently relinquish those rights to a Work for
|
||||||
|
the purpose of contributing to a commons of creative, cultural and
|
||||||
|
scientific works ("Commons") that the public can reliably and without fear
|
||||||
|
of later claims of infringement build upon, modify, incorporate in other
|
||||||
|
works, reuse and redistribute as freely as possible in any form whatsoever
|
||||||
|
and for any purposes, including without limitation commercial purposes.
|
||||||
|
These owners may contribute to the Commons to promote the ideal of a free
|
||||||
|
culture and the further production of creative, cultural and scientific
|
||||||
|
works, or to gain reputation or greater distribution for their Work in
|
||||||
|
part through the use and efforts of others.
|
||||||
|
|
||||||
|
For these and/or other purposes and motivations, and without any
|
||||||
|
expectation of additional consideration or compensation, the person
|
||||||
|
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
|
||||||
|
is an owner of Copyright and Related Rights in the Work, voluntarily
|
||||||
|
elects to apply CC0 to the Work and publicly distribute the Work under its
|
||||||
|
terms, with knowledge of his or her Copyright and Related Rights in the
|
||||||
|
Work and the meaning and intended legal effect of CC0 on those rights.
|
||||||
|
|
||||||
|
1. Copyright and Related Rights. A Work made available under CC0 may be
|
||||||
|
protected by copyright and related or neighboring rights ("Copyright and
|
||||||
|
Related Rights"). Copyright and Related Rights include, but are not
|
||||||
|
limited to, the following:
|
||||||
|
|
||||||
|
i. the right to reproduce, adapt, distribute, perform, display,
|
||||||
|
communicate, and translate a Work;
|
||||||
|
ii. moral rights retained by the original author(s) and/or performer(s);
|
||||||
|
iii. publicity and privacy rights pertaining to a person's image or
|
||||||
|
likeness depicted in a Work;
|
||||||
|
iv. rights protecting against unfair competition in regards to a Work,
|
||||||
|
subject to the limitations in paragraph 4(a), below;
|
||||||
|
v. rights protecting the extraction, dissemination, use and reuse of data
|
||||||
|
in a Work;
|
||||||
|
vi. database rights (such as those arising under Directive 96/9/EC of the
|
||||||
|
European Parliament and of the Council of 11 March 1996 on the legal
|
||||||
|
protection of databases, and under any national implementation
|
||||||
|
thereof, including any amended or successor version of such
|
||||||
|
directive); and
|
||||||
|
vii. other similar, equivalent or corresponding rights throughout the
|
||||||
|
world based on applicable law or treaty, and any national
|
||||||
|
implementations thereof.
|
||||||
|
|
||||||
|
2. Waiver. To the greatest extent permitted by, but not in contravention
|
||||||
|
of, applicable law, Affirmer hereby overtly, fully, permanently,
|
||||||
|
irrevocably and unconditionally waives, abandons, and surrenders all of
|
||||||
|
Affirmer's Copyright and Related Rights and associated claims and causes
|
||||||
|
of action, whether now known or unknown (including existing as well as
|
||||||
|
future claims and causes of action), in the Work (i) in all territories
|
||||||
|
worldwide, (ii) for the maximum duration provided by applicable law or
|
||||||
|
treaty (including future time extensions), (iii) in any current or future
|
||||||
|
medium and for any number of copies, and (iv) for any purpose whatsoever,
|
||||||
|
including without limitation commercial, advertising or promotional
|
||||||
|
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
|
||||||
|
member of the public at large and to the detriment of Affirmer's heirs and
|
||||||
|
successors, fully intending that such Waiver shall not be subject to
|
||||||
|
revocation, rescission, cancellation, termination, or any other legal or
|
||||||
|
equitable action to disrupt the quiet enjoyment of the Work by the public
|
||||||
|
as contemplated by Affirmer's express Statement of Purpose.
|
||||||
|
|
||||||
|
3. Public License Fallback. Should any part of the Waiver for any reason
|
||||||
|
be judged legally invalid or ineffective under applicable law, then the
|
||||||
|
Waiver shall be preserved to the maximum extent permitted taking into
|
||||||
|
account Affirmer's express Statement of Purpose. In addition, to the
|
||||||
|
extent the Waiver is so judged Affirmer hereby grants to each affected
|
||||||
|
person a royalty-free, non transferable, non sublicensable, non exclusive,
|
||||||
|
irrevocable and unconditional license to exercise Affirmer's Copyright and
|
||||||
|
Related Rights in the Work (i) in all territories worldwide, (ii) for the
|
||||||
|
maximum duration provided by applicable law or treaty (including future
|
||||||
|
time extensions), (iii) in any current or future medium and for any number
|
||||||
|
of copies, and (iv) for any purpose whatsoever, including without
|
||||||
|
limitation commercial, advertising or promotional purposes (the
|
||||||
|
"License"). The License shall be deemed effective as of the date CC0 was
|
||||||
|
applied by Affirmer to the Work. Should any part of the License for any
|
||||||
|
reason be judged legally invalid or ineffective under applicable law, such
|
||||||
|
partial invalidity or ineffectiveness shall not invalidate the remainder
|
||||||
|
of the License, and in such case Affirmer hereby affirms that he or she
|
||||||
|
will not (i) exercise any of his or her remaining Copyright and Related
|
||||||
|
Rights in the Work or (ii) assert any associated claims and causes of
|
||||||
|
action with respect to the Work, in either case contrary to Affirmer's
|
||||||
|
express Statement of Purpose.
|
||||||
|
|
||||||
|
4. Limitations and Disclaimers.
|
||||||
|
|
||||||
|
a. No trademark or patent rights held by Affirmer are waived, abandoned,
|
||||||
|
surrendered, licensed or otherwise affected by this document.
|
||||||
|
b. Affirmer offers the Work as-is and makes no representations or
|
||||||
|
warranties of any kind concerning the Work, express, implied,
|
||||||
|
statutory or otherwise, including without limitation warranties of
|
||||||
|
title, merchantability, fitness for a particular purpose, non
|
||||||
|
infringement, or the absence of latent or other defects, accuracy, or
|
||||||
|
the present or absence of errors, whether or not discoverable, all to
|
||||||
|
the greatest extent permissible under applicable law.
|
||||||
|
c. Affirmer disclaims responsibility for clearing rights of other persons
|
||||||
|
that may apply to the Work or any use thereof, including without
|
||||||
|
limitation any person's Copyright and Related Rights in the Work.
|
||||||
|
Further, Affirmer disclaims responsibility for obtaining any necessary
|
||||||
|
consents, permissions or other rights required for any use of the
|
||||||
|
Work.
|
||||||
|
d. Affirmer understands and acknowledges that Creative Commons is not a
|
||||||
|
party to this document and has no duty or obligation with respect to
|
||||||
|
this CC0 or use of the Work.
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
# tools
|
||||||
|
Various tools of mine in Go
|
||||||
|
|
||||||
|
Installing these tools
|
||||||
|
----------------------
|
||||||
|
|
||||||
|
To install any of these tools, type in:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ go get christine.website/go/tools/$toolname
|
||||||
|
```
|
||||||
|
|
||||||
|
For example:
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ go get christine.website/go/tools/license
|
||||||
|
```
|
||||||
|
|
||||||
|
`dokku`
|
||||||
|
-------
|
||||||
|
|
||||||
|
This is a simple command line tool to interface with Dokku servers. This is
|
||||||
|
a port of my shell extension
|
||||||
|
[`dokku.zsh`](https://github.com/Xe/dotfiles/blob/master/.zsh/dokku.zsh) to
|
||||||
|
a nice Go binary.
|
||||||
|
|
||||||
|
This takes a configuration file for defining multiple servers:
|
||||||
|
|
||||||
|
```ini
|
||||||
|
[server "default"]
|
||||||
|
user = dokku
|
||||||
|
host = panel.apps.xeserv.us
|
||||||
|
sshkey = /.ssh/id_rsa
|
||||||
|
```
|
||||||
|
|
||||||
|
By default it will imply that the SSH key is `~/.ssh/id_rsa` and that the
|
||||||
|
username is `dokku`. By default the server named `default` will be used for
|
||||||
|
command execution.
|
||||||
|
|
||||||
|
### TODO
|
||||||
|
|
||||||
|
- [ ] Allow interactive commands
|
||||||
|
- [ ] Directly pipe stdin and stdout to the ssh connection
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
`license`
|
||||||
|
---------
|
||||||
|
|
||||||
|
This is a simple command line tool to help users generate a license file based
|
||||||
|
on information they have already given their system and is easy for the system
|
||||||
|
to figure out on its own.
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ license
|
||||||
|
Usage of license:
|
||||||
|
license [options] <license kind>
|
||||||
|
|
||||||
|
-email="": email of the person licensing the software
|
||||||
|
-name="": name of the person licensing the software
|
||||||
|
-out=false: write to a file instead of stdout
|
||||||
|
-show=false: show all licenses instead of generating one
|
||||||
|
|
||||||
|
By default the name and email are scraped from `git config`
|
||||||
|
```
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ license -show
|
||||||
|
Licenses available:
|
||||||
|
zlib
|
||||||
|
unlicense
|
||||||
|
mit
|
||||||
|
apache
|
||||||
|
bsd-2
|
||||||
|
gpl-2
|
||||||
|
```
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ license zlib
|
||||||
|
Copyright (c) 2015 Christine Dodrill <xena@yolo-swag.com>
|
||||||
|
|
||||||
|
This software is provided 'as-is', without any express or implied
|
||||||
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
arising from the use of this software.
|
||||||
|
|
||||||
|
Permission is granted to anyone to use this software for any purpose,
|
||||||
|
including commercial applications, and to alter it and redistribute it
|
||||||
|
freely, subject to the following restrictions:
|
||||||
|
|
||||||
|
1. The origin of this software must not be misrepresented; you must not
|
||||||
|
claim that you wrote the original software. If you use this software
|
||||||
|
in a product, an acknowledgement in the product documentation would be
|
||||||
|
appreciated but is not required.
|
||||||
|
|
||||||
|
2. Altered source versions must be plainly marked as such, and must not be
|
||||||
|
misrepresented as being the original software.
|
||||||
|
|
||||||
|
3. This notice may not be removed or altered from any source distribution.
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
`ghstat`
|
||||||
|
--------
|
||||||
|
|
||||||
|
Command ghstat shows the status of GitHub via their status API.
|
||||||
|
|
||||||
|
Usage of ./ghstat:
|
||||||
|
-message=false: show last message?
|
||||||
|
|
||||||
|
This follows https://status.github.com/api for all but the list of all recent
|
||||||
|
status messages.
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ ghstat
|
||||||
|
Status: minor (Fri Mar 27 15:24:57 2015)
|
||||||
|
```
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ ghstat -message
|
||||||
|
Last message:
|
||||||
|
Status: minor
|
||||||
|
Message: We've deployed our volumetric attack defenses against an extremely
|
||||||
|
large amount of traffic. Performance is stabilizing.
|
||||||
|
Time: Fri Mar 27 15:04:59 2015
|
||||||
|
```
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
# Compiled Object files, Static and Dynamic libs (Shared Objects)
|
||||||
|
*.o
|
||||||
|
*.a
|
||||||
|
*.so
|
||||||
|
|
||||||
|
# Folders
|
||||||
|
_obj
|
||||||
|
_test
|
||||||
|
|
||||||
|
# Architecture specific extensions/prefixes
|
||||||
|
*.[568vq]
|
||||||
|
[568vq].out
|
||||||
|
|
||||||
|
*.cgo1.go
|
||||||
|
*.cgo2.c
|
||||||
|
_cgo_defun.c
|
||||||
|
_cgo_gotypes.go
|
||||||
|
_cgo_export.*
|
||||||
|
|
||||||
|
_testmain.go
|
||||||
|
|
||||||
|
*.exe
|
||||||
|
*.test
|
||||||
|
*.prof
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
language: go
|
||||||
|
go:
|
||||||
|
- 1.2
|
||||||
|
- 1.3
|
||||||
|
- 1.3.3
|
||||||
|
- 1.4
|
||||||
|
- tip
|
||||||
|
|
||||||
|
install: go get -t -tags integration ./...
|
||||||
|
script: go test -tags integration
|
||||||
|
|
@ -0,0 +1,340 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
|
software--to make sure the software is free for all its users. This
|
||||||
|
General Public License applies to most of the Free Software
|
||||||
|
Foundation's software and to any other program whose authors commit to
|
||||||
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
|
the GNU Lesser General Public License instead.) You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if you
|
||||||
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
|
|
||||||
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
|
|
||||||
|
Also, for each author's protection and ours, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
software. If the software is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original, so
|
||||||
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
|
program will individually obtain patent licenses, in effect making the
|
||||||
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
|
patent must be licensed for everyone's free use or not licensed at all.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License applies to any program or other work which contains
|
||||||
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
|
under the terms of this General Public License. The "Program", below,
|
||||||
|
refers to any such program or work, and a "work based on the Program"
|
||||||
|
means either the Program or any derivative work under copyright law:
|
||||||
|
that is to say, a work containing the Program or a portion of it,
|
||||||
|
either verbatim or with modifications and/or translated into another
|
||||||
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running the Program is not restricted, and the output from the Program
|
||||||
|
is covered only if its contents constitute a work based on the
|
||||||
|
Program (independent of having been made by running the Program).
|
||||||
|
Whether that is true depends on what the Program does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
|
and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
|
of it, thus forming a work based on the Program, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) You must cause the modified files to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
|
whole or in part contains or is derived from the Program or any
|
||||||
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
|
parties under the terms of this License.
|
||||||
|
|
||||||
|
c) If the modified program normally reads commands interactively
|
||||||
|
when run, you must cause it, when started running for such
|
||||||
|
interactive use in the most ordinary way, to print or display an
|
||||||
|
announcement including an appropriate copyright notice and a
|
||||||
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
|
these conditions, and telling the user how to view a copy of this
|
||||||
|
License. (Exception: if the Program itself is interactive but
|
||||||
|
does not normally print such an announcement, your work based on
|
||||||
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Program,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Program.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Program
|
||||||
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
|
under Section 2) in object code or executable form under the terms of
|
||||||
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
|
|
||||||
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
|
source code, which must be distributed under the terms of Sections
|
||||||
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
|
machine-readable copy of the corresponding source code, to be
|
||||||
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
|
customarily used for software interchange; or,
|
||||||
|
|
||||||
|
c) Accompany it with the information you received as to the offer
|
||||||
|
to distribute corresponding source code. (This alternative is
|
||||||
|
allowed only for noncommercial distribution and only if you
|
||||||
|
received the program in object code or executable form with such
|
||||||
|
an offer, in accord with Subsection b above.)
|
||||||
|
|
||||||
|
The source code for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
|
associated interface definition files, plus the scripts used to
|
||||||
|
control compilation and installation of the executable. However, as a
|
||||||
|
special exception, the source code distributed need not include
|
||||||
|
anything that is normally distributed (in either source or binary
|
||||||
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component
|
||||||
|
itself accompanies the executable.
|
||||||
|
|
||||||
|
If distribution of executable or object code is made by offering
|
||||||
|
access to copy from a designated place, then offering equivalent
|
||||||
|
access to copy the source code from the same place counts as
|
||||||
|
distribution of the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
|
except as expressly provided under this License. Any attempt
|
||||||
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
|
void, and will automatically terminate your rights under this License.
|
||||||
|
However, parties who have received copies, or rights, from you under
|
||||||
|
this License will not have their licenses terminated so long as such
|
||||||
|
parties remain in full compliance.
|
||||||
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Program or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Program (or any work based on the
|
||||||
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Program or works based on it.
|
||||||
|
|
||||||
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
|
Program), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
|
these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Program at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Program by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under
|
||||||
|
any particular circumstance, the balance of the section is intended to
|
||||||
|
apply and the section as a whole is intended to apply in other
|
||||||
|
circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system, which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Program under this License
|
||||||
|
may add an explicit geographical distribution limitation excluding
|
||||||
|
those countries, so that distribution is permitted only in or among
|
||||||
|
countries not thus excluded. In such case, this License incorporates
|
||||||
|
the limitation as if written in the body of this License.
|
||||||
|
|
||||||
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies a version number of this License which applies to it and "any
|
||||||
|
later version", you have the option of following the terms and conditions
|
||||||
|
either of that version or of any later version published by the Free
|
||||||
|
Software Foundation. If the Program does not specify a version number of
|
||||||
|
this License, you may choose any version ever published by the Free Software
|
||||||
|
Foundation.
|
||||||
|
|
||||||
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
|
of preserving the free status of all derivatives of our free software and
|
||||||
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
|
REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
{description}
|
||||||
|
Copyright (C) {year} {fullname}
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program is interactive, make it output a short notice like this
|
||||||
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, the commands you use may
|
||||||
|
be called something other than `show w' and `show c'; they could even be
|
||||||
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
|
||||||
|
{signature of Ty Coon}, 1 April 1989
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
This General Public License does not permit incorporating your program into
|
||||||
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
|
consider it more useful to permit linking proprietary applications with the
|
||||||
|
library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License.
|
||||||
|
|
||||||
|
|
@ -0,0 +1,75 @@
|
||||||
|
dotsql [](https://travis-ci.org/gchaincl/dotsql)
|
||||||
|
======
|
||||||
|
|
||||||
|
A Golang library for using SQL.
|
||||||
|
|
||||||
|
It is not an ORM, it is not a query builder. Dotsql is a library that helps you
|
||||||
|
keep sql files in one place and use it with ease.
|
||||||
|
|
||||||
|
_Dotsql is heavily inspired by_ [yesql](https://github.com/krisajenkins/yesql).
|
||||||
|
|
||||||
|
Installation
|
||||||
|
--
|
||||||
|
Simple install the package to your `$GOPATH` with the `go` tool from shell:
|
||||||
|
```bash
|
||||||
|
$ go get github.com/gchaincl/dotsql
|
||||||
|
```
|
||||||
|
Make sure Git is installed on your machine and in your system's `$PATH`
|
||||||
|
|
||||||
|
Usage [](https://godoc.org/github.com/gchaincl/dotsql)
|
||||||
|
--
|
||||||
|
|
||||||
|
First of all, you need to define queries into a file:
|
||||||
|
|
||||||
|
```sql
|
||||||
|
-- name: create-users-table
|
||||||
|
CREATE TABLE users (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
||||||
|
name VARCHAR(255),
|
||||||
|
email VARCHAR(255)
|
||||||
|
);
|
||||||
|
-- name: create-user
|
||||||
|
INSERT INTO users (name, email) VALUES(?, ?)
|
||||||
|
-- name: find-one-user-by-email
|
||||||
|
SELECT id,name,email FROM users WHERE email = ? LIMIT 1
|
||||||
|
--name: drop-users-table
|
||||||
|
DROP TABLE users
|
||||||
|
```
|
||||||
|
|
||||||
|
Notice that every query has a name tag (`--name:<some name>`),
|
||||||
|
this will be helpful for referring to a specific query
|
||||||
|
|
||||||
|
Then you should be able to run something like:
|
||||||
|
|
||||||
|
```go
|
||||||
|
// Get a database handle
|
||||||
|
db, err := sql.Open("sqlite3", ":memory:")
|
||||||
|
|
||||||
|
// Loads queries from file
|
||||||
|
dot, err := dotsql.LoadFromFile("queries.sql")
|
||||||
|
|
||||||
|
// Run queries
|
||||||
|
res, err := dot.Exec(db, "create-users-table")
|
||||||
|
res, err := dot.Exec(db, "create-user", "User Name", "main@example.com")
|
||||||
|
rows, err := dot.Query(db, "find-one-user-by-email", "main@example.com")
|
||||||
|
|
||||||
|
stmt, err := dot.Prepare(db, "drop-users-table")
|
||||||
|
result, err := stmt.Exec()
|
||||||
|
```
|
||||||
|
|
||||||
|
For a complete example please refer to [integration_test.go](https://github.com/gchaincl/dotsql/blob/master/integration_test.go) and [test_schema.sql](https://github.com/gchaincl/dotsql/blob/master/test_schema.sql)
|
||||||
|
|
||||||
|
Development
|
||||||
|
--
|
||||||
|
|
||||||
|
Dotsql is in a very early stage so api may change. Contributions are welcome!
|
||||||
|
Integration tests are tagged with `+integration`, so if you want to run them you should:
|
||||||
|
```bash
|
||||||
|
go test -tags=integration
|
||||||
|
```
|
||||||
|
_If integration tests takes too long remember to_ `go install code.google.com/p/go-sqlite/go1/sqlite3`
|
||||||
|
|
||||||
|
Otherwise just run:
|
||||||
|
```bash
|
||||||
|
go test
|
||||||
|
```
|
||||||
|
|
@ -0,0 +1,131 @@
|
||||||
|
// Package dotsql provides a way to separate your code from SQL queries.
|
||||||
|
//
|
||||||
|
// It is not an ORM, it is not a query builder.
|
||||||
|
// Dotsql is a library that helps you keep sql files in one place and use it with ease.
|
||||||
|
//
|
||||||
|
// For more usage examples see https://github.com/gchaincl/dotsql
|
||||||
|
package dotsql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"bytes"
|
||||||
|
"database/sql"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Preparer is an interface used by Prepare.
|
||||||
|
type Preparer interface {
|
||||||
|
Prepare(query string) (*sql.Stmt, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Queryer is an interface used by Query.
|
||||||
|
type Queryer interface {
|
||||||
|
Query(query string, args ...interface{}) (*sql.Rows, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Execer is an interface used by Exec.
|
||||||
|
type Execer interface {
|
||||||
|
Exec(query string, args ...interface{}) (sql.Result, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DotSql represents a dotSQL queries holder.
|
||||||
|
type DotSql struct {
|
||||||
|
queries map[string]string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d DotSql) lookupQuery(name string) (query string, err error) {
|
||||||
|
query, ok := d.queries[name]
|
||||||
|
if !ok {
|
||||||
|
err = fmt.Errorf("dotsql: '%s' could not be found", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Query is a wrapper for database/sql's Prepare(), using dotsql named query.
|
||||||
|
func (d DotSql) Prepare(db Preparer, name string) (*sql.Stmt, error) {
|
||||||
|
query, err := d.lookupQuery(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return db.Prepare(query)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Query is a wrapper for database/sql's Query(), using dotsql named query.
|
||||||
|
func (d DotSql) Query(db Queryer, name string, args ...interface{}) (*sql.Rows, error) {
|
||||||
|
query, err := d.lookupQuery(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return db.Query(query, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exec is a wrapper for database/sql's Exec(), using dotsql named query.
|
||||||
|
func (d DotSql) Exec(db Execer, name string, args ...interface{}) (sql.Result, error) {
|
||||||
|
query, err := d.lookupQuery(name)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return db.Exec(query, args...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Raw returns the query, everything after the --name tag
|
||||||
|
func (d DotSql) Raw(name string) (string, error) {
|
||||||
|
return d.lookupQuery(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryMap returns a map[string]string of loaded queries
|
||||||
|
func (d DotSql) QueryMap() map[string]string {
|
||||||
|
return d.queries
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load imports sql queries from any io.Reader.
|
||||||
|
func Load(r io.Reader) (*DotSql, error) {
|
||||||
|
scanner := &Scanner{}
|
||||||
|
queries := scanner.Run(bufio.NewScanner(r))
|
||||||
|
|
||||||
|
dotsql := &DotSql{
|
||||||
|
queries: queries,
|
||||||
|
}
|
||||||
|
|
||||||
|
return dotsql, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadFromFile imports SQL queries from the file.
|
||||||
|
func LoadFromFile(sqlFile string) (*DotSql, error) {
|
||||||
|
f, err := os.Open(sqlFile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
|
||||||
|
return Load(f)
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoadFromString imports SQL queries from the string.
|
||||||
|
func LoadFromString(sql string) (*DotSql, error) {
|
||||||
|
buf := bytes.NewBufferString(sql)
|
||||||
|
return Load(buf)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Merge takes one or more *DotSql and merge its queries
|
||||||
|
// It's in-order, so the last source will override queries with the same name
|
||||||
|
// in the previous arguments if any.
|
||||||
|
func Merge(dots ...*DotSql) *DotSql {
|
||||||
|
queries := make(map[string]string)
|
||||||
|
|
||||||
|
for _, dot := range dots {
|
||||||
|
for k, v := range dot.QueryMap() {
|
||||||
|
queries[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &DotSql{
|
||||||
|
queries: queries,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,105 @@
|
||||||
|
package dotsql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func failIfError(t *testing.T, err error) {
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("err == nil, got '%s'", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoad(t *testing.T) {
|
||||||
|
_, err := Load(strings.NewReader(""))
|
||||||
|
failIfError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadFromString(t *testing.T) {
|
||||||
|
_, err := LoadFromString("")
|
||||||
|
failIfError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRaw(t *testing.T) {
|
||||||
|
expectedQuery := "SELECT 1+1"
|
||||||
|
|
||||||
|
dot, err := LoadFromString("--name: my-query\n" + expectedQuery)
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
got, err := dot.Raw("my-query")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
got = strings.TrimSpace(got)
|
||||||
|
if got != expectedQuery {
|
||||||
|
t.Errorf("Raw() == '%s', expected '%s'", got, expectedQuery)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueries(t *testing.T) {
|
||||||
|
expectedQueryMap := map[string]string{
|
||||||
|
"select": "SELECT * from users",
|
||||||
|
"insert": "INSERT INTO users (?, ?, ?)",
|
||||||
|
}
|
||||||
|
|
||||||
|
dot, err := LoadFromString(`
|
||||||
|
-- name: select
|
||||||
|
SELECT * from users
|
||||||
|
|
||||||
|
-- name: insert
|
||||||
|
INSERT INTO users (?, ?, ?)
|
||||||
|
`)
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
got := dot.QueryMap()
|
||||||
|
|
||||||
|
if len(got) != len(expectedQueryMap) {
|
||||||
|
t.Errorf("QueryMap() len (%d) differ from expected (%d)", len(got), len(expectedQueryMap))
|
||||||
|
}
|
||||||
|
|
||||||
|
for name, query := range got {
|
||||||
|
if query != expectedQueryMap[name] {
|
||||||
|
t.Errorf("QueryMap()[%s] == '%s', expected '%s'", query, expectedQueryMap[name])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMergeHaveBothQueries(t *testing.T) {
|
||||||
|
expectedQueryMap := map[string]string{
|
||||||
|
"query-a": "SELECT * FROM a",
|
||||||
|
"query-b": "SELECT * FROM b",
|
||||||
|
}
|
||||||
|
|
||||||
|
a, err := LoadFromString("--name: query-a\nSELECT * FROM a")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
b, err := LoadFromString("--name: query-b\nSELECT * FROM b")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
c := Merge(a, b)
|
||||||
|
|
||||||
|
got := c.QueryMap()
|
||||||
|
if len(got) != len(expectedQueryMap) {
|
||||||
|
t.Errorf("QueryMap() len (%d) differ from expected (%d)", len(got), len(expectedQueryMap))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMergeTakesPresecendeFromLastArgument(t *testing.T) {
|
||||||
|
expectedQuery := "SELECT * FROM c"
|
||||||
|
|
||||||
|
a, err := LoadFromString("--name: query\nSELECT * FROM a")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
b, err := LoadFromString("--name: query\nSELECT * FROM b")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
c, err := LoadFromString("--name: query\nSELECT * FROM c")
|
||||||
|
failIfError(t, err)
|
||||||
|
|
||||||
|
x := Merge(a, b, c)
|
||||||
|
|
||||||
|
got := x.QueryMap()["query"]
|
||||||
|
if expectedQuery != got {
|
||||||
|
t.Errorf("Expected query: '%s', got: '%s'", expectedQuery, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
package dotsql_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"github.com/gchaincl/dotsql"
|
||||||
|
)
|
||||||
|
|
||||||
|
func ExampleLoadFromFile() {
|
||||||
|
db, err := sql.Open("sqlite3", ":memory:")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dot, err := dotsql.LoadFromFile("queries/users.sql")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* users.sql looks like:
|
||||||
|
--name: create-user
|
||||||
|
INSERT INTO users (email) VALUES(?)
|
||||||
|
|
||||||
|
--name: find-user-by-email
|
||||||
|
SELECT email FROM users WHERE email = ?
|
||||||
|
*/
|
||||||
|
|
||||||
|
if _, err := dot.Exec(db, "create-user", "user@example.com"); err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows, err := dot.Query(db, "find-user-by-email", "user@example.com")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,97 @@
|
||||||
|
// +build integration
|
||||||
|
|
||||||
|
package dotsql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
_ "code.google.com/p/go-sqlite/go1/sqlite3"
|
||||||
|
)
|
||||||
|
|
||||||
|
func initDotSql() (*sql.DB, *DotSql) {
|
||||||
|
db, err := sql.Open("sqlite3", ":memory:")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
dotsql, err := LoadFromFile("test_schema.sql")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = dotsql.Exec(db, "create-users-table")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return db, dotsql
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateTable(t *testing.T) {
|
||||||
|
db, _ := initDotSql()
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
row := db.QueryRow(
|
||||||
|
"SELECT name FROM sqlite_master WHERE type='table' AND name='users'",
|
||||||
|
)
|
||||||
|
|
||||||
|
var table string
|
||||||
|
row.Scan(&table)
|
||||||
|
|
||||||
|
if table != "users" {
|
||||||
|
t.Errorf("Table 'users' has not been created")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestInserts(t *testing.T) {
|
||||||
|
db, dotsql := initDotSql()
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
_, err := dotsql.Exec(db, "create-user", "Foo Bar", "foo@bar.com")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
row := db.QueryRow(
|
||||||
|
"SELECT email FROM users LIMIT 1",
|
||||||
|
)
|
||||||
|
|
||||||
|
var email string
|
||||||
|
row.Scan(&email)
|
||||||
|
|
||||||
|
if email != "foo@bar.com" {
|
||||||
|
t.Errorf("Expect to find user with email == %s, got %s", "foo@bar.com", email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSelect(t *testing.T) {
|
||||||
|
db, dotsql := initDotSql()
|
||||||
|
defer db.Close()
|
||||||
|
|
||||||
|
_, err := db.Exec("INSERT INTO users(email) VALUES('foo@bar.com')")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows, err := dotsql.Query(db, "find-one-user-by-email", "foo@bar.com")
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
ok := rows.Next()
|
||||||
|
if ok == false {
|
||||||
|
t.Errorf("User with email 'foo@bar.com' cound not be found")
|
||||||
|
}
|
||||||
|
|
||||||
|
var id, name interface{}
|
||||||
|
var email string
|
||||||
|
err = rows.Scan(&id, &name, &email)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if email != "foo@bar.com" {
|
||||||
|
t.Errorf("Expect to find user with email == %s, got %s", "foo@bar.com", email)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,67 @@
|
||||||
|
package dotsql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"regexp"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Scanner struct {
|
||||||
|
line string
|
||||||
|
queries map[string]string
|
||||||
|
current string
|
||||||
|
}
|
||||||
|
|
||||||
|
type stateFn func(*Scanner) stateFn
|
||||||
|
|
||||||
|
func getTag(line string) string {
|
||||||
|
re := regexp.MustCompile("^\\s*--\\s*name:\\s*(\\S+)")
|
||||||
|
matches := re.FindStringSubmatch(line)
|
||||||
|
if matches == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return matches[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
func initialState(s *Scanner) stateFn {
|
||||||
|
if tag := getTag(s.line); len(tag) > 0 {
|
||||||
|
s.current = tag
|
||||||
|
return queryState
|
||||||
|
}
|
||||||
|
return initialState
|
||||||
|
}
|
||||||
|
|
||||||
|
func queryState(s *Scanner) stateFn {
|
||||||
|
if tag := getTag(s.line); len(tag) > 0 {
|
||||||
|
s.current = tag
|
||||||
|
} else {
|
||||||
|
s.appendQueryLine()
|
||||||
|
}
|
||||||
|
return queryState
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Scanner) appendQueryLine() {
|
||||||
|
current := s.queries[s.current]
|
||||||
|
line := strings.Trim(s.line, " \t")
|
||||||
|
if len(line) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(current) > 0 {
|
||||||
|
current = current + "\n"
|
||||||
|
}
|
||||||
|
|
||||||
|
current = current + line
|
||||||
|
s.queries[s.current] = current
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Scanner) Run(io *bufio.Scanner) map[string]string {
|
||||||
|
s.queries = make(map[string]string)
|
||||||
|
|
||||||
|
for state := initialState; io.Scan(); {
|
||||||
|
s.line = io.Text()
|
||||||
|
state = state(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.queries
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
package dotsql
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGetTag(t *testing.T) {
|
||||||
|
var tests = []struct {
|
||||||
|
line string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{"SELECT 1+1", ""},
|
||||||
|
{"-- Some Comment", ""},
|
||||||
|
{"-- name: ", ""},
|
||||||
|
{"-- name: find-users-by-name", "find-users-by-name"},
|
||||||
|
{" -- name: save-user ", "save-user"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, c := range tests {
|
||||||
|
got := getTag(c.line)
|
||||||
|
if got != c.want {
|
||||||
|
t.Errorf("isTag('%s') == %s, expect %v", c.line, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestScannerRun(t *testing.T) {
|
||||||
|
sqlFile := `
|
||||||
|
-- name: all-users
|
||||||
|
-- Finds all users
|
||||||
|
SELECT * from USER
|
||||||
|
|
||||||
|
-- name: empty-query-should-not-be-stored
|
||||||
|
-- name: save-user
|
||||||
|
INSERT INTO users (?, ?, ?)
|
||||||
|
`
|
||||||
|
|
||||||
|
scanner := &Scanner{}
|
||||||
|
queries := scanner.Run(bufio.NewScanner(strings.NewReader(sqlFile)))
|
||||||
|
|
||||||
|
numberOfQueries := len(queries)
|
||||||
|
expectedQueries := 2
|
||||||
|
if numberOfQueries != expectedQueries {
|
||||||
|
t.Errorf("Scanner/Run() has %d queries instead of %d",
|
||||||
|
numberOfQueries, expectedQueries)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
-- name: create-users-table
|
||||||
|
CREATE TABLE users (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
|
||||||
|
name VARCHAR(255),
|
||||||
|
email VARCHAR(255)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- name: create-user
|
||||||
|
INSERT INTO users (name, email) VALUES(?, ?)
|
||||||
|
|
||||||
|
-- name: find-one-user-by-email
|
||||||
|
SELECT id,name,email FROM users WHERE email = ? LIMIT 1
|
||||||
|
|
||||||
|
-- name: drop-users-table
|
||||||
|
DROP TABLE users
|
||||||
Loading…
Reference in New Issue