Merge branch 'v3', master is ezSQL 3.0.8, archive ezSQL 2.1.7 to v2 branch

Author: TheTechsTech

.gitignore

@@ -1,4 +1,13 @@
-
+/nbproject/private/
+/nbproject/
+~
+~*.*
+*.lock
 clover.xml
-composer.lock
+*.sqlite
+*.sqlite3
 vendor
+build/logs/clover.xml
+tests/pdo/ez_test.sqlite
+tests/sqlite/ez_test.sqlite
+tests/sqlite/ez_test.sqlite3

.travis.yml

@@ -25,12 +25,11 @@ before_script:
   - psql -c "CREATE USER ez_test WITH PASSWORD 'ezTest';" -U postgres
 
 after_success:
-  - travis_retry php vendor/bin/php-coveralls 
+  - bash <(curl -s https://codecov.io/bash)
 
 # Commands you want to run that will verify your build.
 script: 
-  - mkdir -p build/logs
-  - phpunit --coverage-clover build/logs/clover.xml
+  - phpunit --coverage-clover=coverage.xml
 
 # allow_failures: Allow this build to fail under the specified environments.
 # fast_finish: If your build fails do not continue trying to build, just stop.

README.md

@@ -1,5 +1,9 @@
 ezSQL
 =====
+[![Build Status](https://travis-ci.org/ezSQL/ezSQL.svg?branch=v3)](https://travis-ci.org/ezSQL/ezSQL)
+[![Build status](https://ci.appveyor.com/api/projects/status/6s8oqnoxa2i5k04f/branch/v3?svg=true)](https://ci.appveyor.com/project/jv2222/ezsql/branch/v3)
+[![codecov](https://codecov.io/gh/ezSQL/ezSQL/branch/v3/graph/badge.svg)](https://codecov.io/gh/ezSQL/ezSQL)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8db71512a019ab280a16/maintainability)](https://codeclimate.com/github/techno-express/ezSQL/maintainability)
 
 Author
 ------
@@ -17,6 +21,31 @@ Change Log
 ==========
 Note: This change log isn't being used any more due to automated github tracking
 
+3.08 - Merged fork https://github.com/sjstoelting/ezSQL3 to be current with this repo. 
+* Added/Updated PHPunit tests, some marked as incomplete or not fully implemented, SQL drivers not loaded will be skipped.
+* Refactor class code to use `spl_autoload_register`. 
+  Simply using `require_once "ez_sql_loader.php";` then `$database = new database_driver_class;`. This will allow multi SQLdb to be loaded if need be. 
+* Added methods `create_select`, `insert_select`, `update`, `insert`, `replace`, `delete`, and `selecting` an alias for select.
+  These are part of the new ezQuery SQL builder class. They are shortcut calls, these new methods will create proper SQL statements, from supplied arguments variable or array, prevent injections, then execute guery, in case of `selecting` execute get_results. 
+* Added many additional functions to support ezQuery builder and to easily process SQL prepare statements. Supplied arguments will be replace with necessary placeholder and values added to parameter array.
+* All new methods has been fully PHPunit tested under current supported database systems, and should be able to handle most use cases as is.
+* Todo: Implement WHERE IN sub selection and shortcut method calls for the remainder of SQL standard statements.
+
+```
+ezSQL3 - From Author: Stefanie Janine Stoelting - http://stefanie-stoelting.de
+
+News about ezSQL3 are available at http://stefanie-stoelting.de/ezsql3-news.html
+
+* 3.07 - Added the new class ezSQL_mysql to use mysqli. To update existing projects, just change the class you are using from ezSQL_mysql to ezSQL_mysqli. This class is downward compatible to ezSQL_mysql, but is able to use prepared statements.
+* 3.06 - Extended ezSQL_mysql method quick_connect with a charset parameter
+* 3.05 - Extended ez_sql_oracleTNS class, that does now support client site connection pooling
+* 3.04 - Added a new class for Oracle database connection to get rid of TNSNAMES.ORA configuration files
+* 3.03 - Changed error messages, wrong classname used in a messages
+* 3.02 - Improved ezSQL_recordset, array results of rows are faster
+* 3.01 - Added a class for query result handling. The ezSQL_recordset contains methods that behave like fetch_assoc, fetch_row, and fetch_object
+* 3.00 - Changed the code to PHP5, added PHPDoc tags, and added unit tests
+```
+
 2.17 - Updates to ezSQL_postgresql (thx Stefanie Janine Stoelting)
 
 2.16 - Added profiling functions to mySQL version & added fix to stop mySQL hanging on very long runnign scripts

appveyor.yml

@@ -0,0 +1,139 @@
+build: false
+platform:
+  - x64
+clone_folder: c:\projects\php-project-workspace
+
+## Build matrix for lowest and highest possible targets
+environment:
+  matrix:
+  - php_ver_target: 7.0
+  MYSQL_DATABASE: ez_test
+  MYSQL_HOST: localhost
+  MYSQL_USER: root
+  MYSQL_PASSWORD: Password12!
+  MYSQL_PATH: C:\Program Files\MySQL\MySQL Server 5.7
+  
+services:
+    - mssql2014
+    - mysql
+    - postgresql
+    
+## Cache composer, chocolatey and php bits
+cache:
+    - composer.phar
+    # Cache chocolatey packages
+    - C:\ProgramData\chocolatey\bin -> .appveyor.yml
+    - C:\ProgramData\chocolatey\lib -> .appveyor.yml
+    # Cache php install
+    - c:\tools\php -> .appveyor.yml
+    
+## Set up environment variables
+init:
+    - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;C:\Program Files\PostgreSQL\9.4\bin\;%PATH%
+    - SET COMPOSER_NO_INTERACTION=1
+    - SET PHP=1 # This var is connected to PHP install cache
+    - SET ANSICON=121x90 (121x90)
+    
+## Install PHP and composer, and run the appropriate composer command Get the MSSQL DLL's and XDEBUG
+install:
+    - IF EXIST c:\tools\php (SET PHP=0)
+    - ps: >-
+        If ($env:php_ver_target -eq "5.6") {
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y --forcex86 php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+        } Else {
+          appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
+        }
+    - appveyor-retry cinst -y sqlite
+    - cd c:\tools\php
+    # Get the MSSQL DLL's
+    - ps: >-
+        If ($env:PHP -eq "1") {
+          If ($env:php_ver_target -eq "5.6") {
+            $source = "https://cdn.joomla.org/ci/php-sqlsrv.zip"
+            $destination = "c:\tools\php\php-sqlsrv.zip"
+            Invoke-WebRequest $source -OutFile $destination
+            #appveyor-retry appveyor DownloadFile https://cdn.joomla.org/ci/php-sqlsrv.zip
+            7z x php-sqlsrv.zip > $null
+            copy SQLSRV\php_sqlsrv_56_nts.dll ext\php_sqlsrv_nts.dll
+            copy SQLSRV\php_pdo_sqlsrv_56_nts.dll ext\php_pdo_sqlsrv_nts.dll
+            Remove-Item c:\tools\php\* -include .zip
+            } Else {
+            $DLLVersion = "4.3.0"
+            cd c:\tools\php\ext
+            $source = "http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            $destination = "c:\tools\php\ext\php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            Invoke-WebRequest $source -OutFile $destination
+            #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/sqlsrv/$($DLLVersion)/php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            $source = "http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            $destination = "c:\tools\php\ext\php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip"
+            Invoke-WebRequest $source -OutFile $destination
+            #appveyor-retry appveyor DownloadFile http://windows.php.net/downloads/pecl/releases/pdo_sqlsrv/$($DLLVersion)/php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip
+            7z x -y php_pdo_sqlsrv-$($DLLVersion)-$($env:php_ver_target)-nts-vc14-x64.zip > $null
+            Remove-Item c:\tools\php\ext* -include .zip
+            cd c:\tools\php}}
+    - IF %PHP%==1 copy php.ini-production php.ini /Y
+    - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
+    - IF %PHP%==1 echo extension_dir=ext >> php.ini
+    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
+    - ps: >-
+        If ($env:php_ver_target -eq "5.6") {
+          Add-Content php.ini "`nextension=php_sqlsrv_nts.dll"
+          Add-Content php.ini "`nextension=php_pdo_sqlsrv_nts.dll"
+          Add-Content php.ini "`n"
+        } Else {
+          Add-Content php.ini "`nextension=php_sqlsrv.dll"
+          Add-Content php.ini "`nextension=php_pdo_sqlsrv.dll"
+          Add-Content php.ini "`n"
+        }
+    - IF %PHP%==1 echo extension=php_pgsql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_pgsql.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_sqlite3.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_mysqli.dll >> php.ini
+    - IF %PHP%==1 echo extension=php_pdo_mysql.dll >> php.ini
+    - IF %PHP%==1 appveyor-retry appveyor DownloadFile https://xdebug.org/files/php_xdebug-2.5.5-7.0-vc14-nts-x86_64.dll -FileName c:\tools\php\ext\php_xdebug-2.5.5-7.0-vc14-nts-x86_64.dll
+    - IF %PHP%==1 echo [xdebug] >> php.ini
+    - IF %PHP%==1 echo zend_extension=php_xdebug-2.5.5-7.0-vc14-nts-x86_64.dll >> php.ini
+    - IF %PHP%==1 echo zend.assertions=1 >> php.ini
+    - IF %PHP%==1 echo assert.exception=On >> php.ini
+    - IF %PHP%==1 echo xdebug.remote_enable=1 >> php.ini
+    - IF %PHP%==1 echo xdebug.remote_autostart=1 >> php.ini
+    - IF %PHP%==1 echo xdebug.profiler_enable=off >> php.ini
+    - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
+    - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
+    - cd c:\projects\php-project-workspace
+    - composer self-update
+    - composer require php-coveralls/php-coveralls
+    
+build_script:
+  # postgres
+  - SET PGUSER=postgres
+  - SET PGPASSWORD=Password12!
+  - createdb ez_test
+  - psql -c "CREATE USER ez_test WITH PASSWORD 'ezTest';"
+  # sqlserver
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "CREATE DATABASE ez_test"
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -d ez_test -Q "CREATE LOGIN ez_test WITH PASSWORD=N'ezTest', DEFAULT_DATABASE=ez_test, CHECK_EXPIRATION=OFF, CHECK_POLICY=OFF; ALTER SERVER ROLE [sysadmin] ADD MEMBER ez_test" 
+  
+before_test:
+  - SET PATH=%MYSQL_PATH%\bin;%PATH%
+  - mysqladmin --host=%MYSQL_HOST% --user=%MYSQL_USER% --password=%MYSQL_PASSWORD% create %MYSQL_DATABASE%    
+  # mysql
+  - mysql -u root -p"Password12!" -e "CREATE DATABASE IF NOT EXISTS ez_test;"
+  - mysql -u root -p"Password12!" -e "GRANT ALL PRIVILEGES ON ez_test.* TO ez_test@localhost IDENTIFIED BY 'ezTest'";
+  - mysql -u root -p"Password12!" -e "FLUSH PRIVILEGES;"
+    
+on_success:
+  - ps: |
+      $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
+      Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+      bash codecov.sh -f "coverage.xml"
+      
+## Run the actual test
+test_script:
+    - cd c:\projects\php-project-workspace
+    - vendor/bin/phpunit --coverage-clover=coverage.xml
+    

codecov.yml

@@ -0,0 +1,5 @@
+ignore:
+  - "unsupported/."
+  - "tests/." 
+  - "vendor/."
+  - "docs/."  # regexp accepted