From c830e2ccf5efc5f43aac672a96dc0d75adf4f9a5 Mon Sep 17 00:00:00 2001 From: Minero Aoki Date: Wed, 7 Aug 2013 15:28:52 +0900 Subject: [PATCH] Updates license notice (add reference to fiksu). --- LICENSE | 33 +++++++++++++++++++++++++++++++++ README.md | 13 +++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index e3f208a..d88b6a9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,4 @@ +----------------------------------------------------------------------------------- The MIT License (MIT) Copyright (c) 2004-2013 David Heinemeier Hansson (original code author) @@ -19,3 +20,35 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +----------------------------------------------------------------------------------- +Copyright (c) 2010-2013, Fiksu, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + o Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + o Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + + o Fiksu, Inc. nor the names of its contributors may be used to + endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index ed0b2f3..304fcef 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,15 @@ activerecord4-redshift-adapter ============================== Amazon Redshift adapter for ActiveRecord 4 (Rails 4). -Almost all code are copied from ActiveRecord 4 PostgreSQL -driver and modified for Redshift. +I copied PostgreSQL driver from ActiveRecord 4.0.0 and modified for Redshift. +"Barely works" patch was borrowed from fiksu/activerecord-redshift-adapter. I know Redshift driver already exists (https://github.com/fiksu/activerecord-redshift-adapter), -but it supports only ActiveRecord 3. Also, AR4 code is magnifically different -from AR3 code because of file separation, patching does not work well. -I want to use Rails 4 with Redshift NOW, so I created this repository. -If anybody write better Redshift driver for ActiveRecord 4, I abandon this driver. +but it currently supports only ActiveRecord 3. Also, AR4 code is magnifically +different from AR3 code because of file separation, patching does not work well. +I want to use Rails 4 with Redshift NOW, so I wrote this driver. +If anybody write better Redshift driver which works with ActiveRecord 4, +I abandon this driver. Usage -------------------