Skip to content

Commit

Permalink
Merged branch dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc A Hester committed Sep 25, 2016
2 parents 099a483 + d3142e3 commit c49c9b7
Show file tree
Hide file tree
Showing 7 changed files with 568 additions and 295 deletions.
29 changes: 22 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,36 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased][unreleased]
### Added
- Figure out a way to duplicate sqlsrv_field_metadata().
- Figure out a way to duplicate sqlsrv_cancel()
- Figure out a way to duplicate `sqlsrv_field_metadata()`.
- Figure out a way to duplicate `sqlsrv_cancel()`

### Changed
- Make client_info() less reliant on external utils.
- Figure out how/why sqlsrv's PHPTYPE_STR(EAM|ING) function return values are randomly different. Though, when they are different, they are always the same different values.
- figure out how to retrieve client_info for dblib. test odbc functions... those utils may not be installed with unixodbc.
- test odbc functions... those utils may not be installed with unixodbc.

## [0.0.9] - 2016-09-25
### Added
- `configure()` and `get_config()` functions.
- client info for dblib.

### Chanaged
- `init()` is now called automatically by `globals.php` which is now autoloaded via composer. This will affect users who are using custom init config options as well as those who `include()` manually.
- improved `server_info()`
- cleaned up some unnecessary static vars.

### Removed
- ODBC config options. they were never used or tested anyway.

## [0.0.8] - 2016-09-08
### Changed
- improved guesstype() function.
- improved `guesstype()` function.

### Fixed
- some camelcasing

### Removed
- convertDataType() function.
- `convertDataType()` function.

## [0.0.7] - 2016-08-25
### Added
Expand All @@ -34,7 +47,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- changed the way client_info retrieval functions are organized and accessed.

### Fixed
- bug where prepare() options were not being processed at all. oops.
- bug where `prepare()` options were not being processed at all. oops.

### Removed
- ?-to-:tag conversion in prepare as it was highly unnecessary
Expand Down Expand Up @@ -73,7 +86,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added
- First alpha release.

[unreleased]: https://github.com/radsectors/sqlshim/compare/v0.0.4...HEAD
[unreleased]: https://github.com/radsectors/sqlshim/compare/v0.0.9...HEAD
[0.0.9]: https://github.com/radsectors/sqlshim/compare/v0.0.8...v0.0.9
[0.0.8]: https://github.com/radsectors/sqlshim/compare/v0.0.7...v0.0.8
[0.0.7]: https://github.com/radsectors/sqlshim/compare/v0.0.4...v0.0.7
[0.0.4]: https://github.com/radsectors/sqlshim/compare/v0.0.3...v0.0.4
[0.0.3]: https://github.com/radsectors/sqlshim/compare/v0.0.2...v0.0.3
Expand Down
18 changes: 10 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@

The **sqlshim** project aims to replicate [Microsoft SQL Server Driver for PHP][sqlsrv] (**sqlsrv**) on Linux/OS X.

**sqlshim** was conceived out of the need for **[sqlsrv]** (a Windows-only PHP extension) in an OS X development environment. It began as a short script that defined a small set of functions. Unfortunately,
**sqlshim** was born out of the need for **[sqlsrv]** functions in OS X. It started as a short script with a small set of functions and has since evolved into a nearly full replacement for **[sqlsrv]**.

**DISCLAIMER:** **sqlshim** is in alpha and is geared primarily toward use in a development environment. It is provided as-is and without warranty. I will not be held responsible for any damage(s) incurred from its use.
**DISCLAIMER:** **sqlshim** is in alpha and is geared primarily toward use in a development environment. It is provided as-is and without warranty. I will not be held responsible for any damage(s) incurred from its use.<br>
Also, please note that despite its Mac origins, access to a proper Mac test environment has been limited (nonexistent) so I can't presently make any promises to Mac users.


## Basic Usage
1. `\radsectors\sqlshim::init();`
2. `sqlsrv_connect( ... );`
3. ???
4. Profit!!
1. `sqlsrv_connect( ... );`
2. ???
3. Profit!!


## Documentation
For more detailed documentation on **sqlshim**, please see the [sqlshim wiki](https://github.com/radsectors/sqlshim/wiki)


## Installation
See [wiki] for more detailed instructions.

#### Composer
#### Composer (recommended)
1. `composer require "radsectors/sqlshim:dev-master"`
2. Include autoloader.
```php
Expand All @@ -30,9 +31,10 @@ require 'vendor/autoload.php';
#### Manual
1. Download the latest [release](https://github.com/radsectors/sqlshim/releases).
2. Extract `src/sqlshim.php` and `src/globals.php` to wherever you store your 3rd-party libraries.
3. Include `sqlshim.php`.
3. Include `globals.php`.
```php
require '/path/to/sqlshim.php';
require '/path/to/globals.php';
```

#### 3rd-party Lib Setup
Expand Down
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require-dev": {
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "4.*",
"radsectors/urp": "dev-master"
},
"suggest": {

},
"autoload": {
"psr-4": {
"radsectors\\": "src"
}
},
"files": ["src/globals.php"]
},
"autoload-dev": {
"psr-4": {
Expand Down
Loading

0 comments on commit c49c9b7

Please sign in to comment.