Skip to content
Permalink
Browse files

Update framework readme's.

  • Loading branch information...
stuconnolly committed Oct 12, 2018
1 parent f21665e commit 4a11a33e944dd8384c50328e2661737d246517ac
Showing with 17 additions and 17 deletions.
  1. +13 −13 Frameworks/PostgresKit/README.md
  2. +4 −4 Frameworks/SPMySQLFramework/README.md
@@ -1,14 +1,14 @@
# PostgresKit

PostgresKit is a fork and heavily modified version of the PostgresClientKit
PostgresKit is a fork and heavily modified version of the PostgresClientKit
code from the PostgresKit project:

[http://code.google.com/p/postgres-kit/](http://code.google.com/p/postgres-kit/)

PostgresClientKit was originally written by David Thorpe and is licensed under
version 2 of the Apache License.

This PostgresKit fork was created by Stuart Connolly on July 22, 2012 and
This PostgresKit fork was created by Stuart Connolly on July 22, 2012 and
is to be developed as part of the Sequel Pro project:

[http://sequelpro.com/](http://sequelpro.com/)
@@ -19,28 +19,28 @@ Any new code added during it's development is licensed under the MIT license
and is copyrighted by the respective developer and the Sequel Pro team.

The framework also includes libpq, the static C library interface to PostgreSQL
and libpqtypes, a libpq extension designed to ease the use of parameterised
and libpqtypes, a libpq extension designed to ease the use of parameterised
queries and enhanced support for handling native PostgreSQL data types.

libpq is licensed under The PostgreSQL License and is copyrighted by:

Portions Copyright (c) 1996-2012, The PostgreSQL Global Development Group
Portions Copyright (c) 1994, The Regents of the University of California
Full license:

Full license:

[https://www.postgresql.org/about/licence/](https://www.postgresql.org/about/licence/)

libpqtypes is licensed under the BSD license and is copyrighted by:

Copyright (c) 2008-2011 eSilo, LLC. All rights reserved

Full License:

[http://libpqtypes.esilo.com/pkgdocs.html?file=LICENSE](http://libpqtypes.esilo.com/pkgdocs.html?file=LICENSE)

The entire framework is dual licensed under both version 2 of the Apache
license and the MIT license. Use of it must carry both of the following
The entire framework is dual licensed under both version 2 of the Apache
license and the MIT license. Use of it must carry both of the following
licenses to indicate this:

### Apache 2 License
@@ -61,8 +61,8 @@ limitations under the License.

### MIT License

Copyright (c) 2017 Sequel Pro Team. All rights reserved.
Copyright (c) 2018 Sequel Pro Team. All rights reserved.

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
@@ -71,10 +71,10 @@ copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -2,7 +2,7 @@

The SPMySQL Framework is intended to provide a stable MySQL connection framework, with the ability to run text-based queries and rapidly retrieve result sets with conversion from MySQL data types to Cocoa objects.

SPMySQL.framework has an interface loosely based around that provided by MCPKit by Serge Cohen and Bertrand Mansion ([http://mysql-cocoa.sourceforge.net/](http://mysql-cocoa.sourceforge.net/)), and in particular the heavily modified Sequel Pro version ([http://www.sequelpro.com/](http://www.sequelpro.com/)). It is a full rewrite of the original framework, although it includes code from patches implementing the following Sequel Pro functionality, largely contributed by Hans-Jörg Bibiko, Stuart Connolly, Jakob Egger and Rowan Beentje:
SPMySQL.framework has an interface loosely based around that provided by MCPKit by Serge Cohen and Bertrand Mansion ([http://mysql-cocoa.sourceforge.net/](http://mysql-cocoa.sourceforge.net/)), and in particular the heavily modified Sequel Pro version ([https://sequelpro.com/](https://sequelpro.com/)). It is a full rewrite of the original framework, although it includes code from patches implementing the following Sequel Pro functionality, largely contributed by Hans-Jörg Bibiko, Stuart Connolly, Jakob Egger and Rowan Beentje:

* Connection locking (Jakob et al.)
* Ping & keepalive (Rowan et al.)
@@ -21,7 +21,7 @@ SPMySQL.framework has an interface loosely based around that provided by MCPKit

## Integration

SPMySQL.framework can be added to your project as a standard Cocoa framework, or the entire project
SPMySQL.framework can be added to your project as a standard Cocoa framework, or the entire project
can be added as a subproject in Xcode.

To add as a subproject in Xcode:
@@ -32,12 +32,12 @@ To add as a subproject in Xcode:
4. If you don't have a Copy Frameworks phase, add one; drag the SPMySQL.framework child target to this phase.
5. In your build settings, add a User Header Search Path; make it a recursive path to the SPMySQL project folder location (for example `${PROJECT_DIR}/Frameworks/SPMySQLFramework`). This should allow you to `#include "SPMySQL.h"` and have everything function.

As a last resort jump onto IRC and join #sequel-pro on irc.freenode.net and any of the
As a last resort jump onto IRC and join #sequel-pro on irc.freenode.net and any of the
developers will be more than happy to help you out.

## License

Copyright (c) 2017 Rowan Beentje (rowan.beent.je) & the Sequel Pro team. All rights reserved.
Copyright (c) 2018 Rowan Beentje (rowan.beent.je) & the Sequel Pro team. All rights reserved.

SPMySQLFramework is free and open source software, licensed under [MIT](https://opensource.org/licenses/MIT). See [LICENSE](https://github.com/sequelpro/sequelpro/blob/master/Frameworks/SPMySQLFramework/LICENSE) for full details.

0 comments on commit 4a11a33

Please sign in to comment.
You can’t perform that action at this time.