Update PicoDB

This commit is contained in:
Frédéric Guillot 2018-01-29 16:14:53 -08:00
parent 9ddefa979a
commit a4231323ea
7 changed files with 520 additions and 518 deletions

View File

@ -30,7 +30,7 @@
"eluceo/ical": "0.10.1",
"erusev/parsedown" : "1.6.0",
"fguillot/json-rpc" : "1.2.1",
"fguillot/picodb" : "1.0.15",
"fguillot/picodb" : "1.0.16",
"miniflux/picofeed": "0.1.34",
"fguillot/simpleLogger" : "1.0.1",
"fguillot/simple-validator" : "1.0.1",

24
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "fa5e1f971060c305f81531da883b01ad",
"content-hash": "0076f6a8c01e655ba7d4be0948d8ea9e",
"packages": [
{
"name": "aferrandini/phpqrcode",
@ -288,16 +288,16 @@
},
{
"name": "fguillot/picodb",
"version": "v1.0.15",
"version": "v1.0.16",
"source": {
"type": "git",
"url": "https://github.com/fguillot/picoDb.git",
"reference": "1dccdf9e1309545e68d7161668cfcb084f0f5e09"
"reference": "03b89d09e283cbaffbb4039e4ba6eaa3d327002a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fguillot/picoDb/zipball/1dccdf9e1309545e68d7161668cfcb084f0f5e09",
"reference": "1dccdf9e1309545e68d7161668cfcb084f0f5e09",
"url": "https://api.github.com/repos/fguillot/picoDb/zipball/03b89d09e283cbaffbb4039e4ba6eaa3d327002a",
"reference": "03b89d09e283cbaffbb4039e4ba6eaa3d327002a",
"shasum": ""
},
"require": {
@ -324,7 +324,7 @@
],
"description": "Minimalist database query builder",
"homepage": "https://github.com/fguillot/picoDb",
"time": "2018-01-11T21:47:49+00:00"
"time": "2018-01-30T00:01:16+00:00"
},
{
"name": "fguillot/simple-queue",
@ -992,7 +992,7 @@
},
{
"name": "symfony/finder",
"version": "v3.4.3",
"version": "v3.4.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
@ -2533,16 +2533,16 @@
},
{
"name": "webmozart/assert",
"version": "1.2.0",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
"reference": "0df1908962e7a3071564e857d86874dad1ef204a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
"reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
"url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
"reference": "0df1908962e7a3071564e857d86874dad1ef204a",
"shasum": ""
},
"require": {
@ -2579,7 +2579,7 @@
"check",
"validate"
],
"time": "2016-11-23T20:04:58+00:00"
"time": "2018-01-29T19:49:41+00:00"
}
],
"aliases": [],

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b::getLoader();
return ComposerAutoloaderInit52171af285e1b8005511556b6240be1b::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b
class ComposerAutoloaderInit52171af285e1b8005511556b6240be1b
{
private static $loader;
@ -19,15 +19,15 @@ class ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit52171af285e1b8005511556b6240be1b', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit52171af285e1b8005511556b6240be1b', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit52171af285e1b8005511556b6240be1b::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -48,19 +48,19 @@ class ComposerAutoloaderInit6edea6294a88689e3f5c56484bb70c9b
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit52171af285e1b8005511556b6240be1b::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire6edea6294a88689e3f5c56484bb70c9b($fileIdentifier, $file);
composerRequire52171af285e1b8005511556b6240be1b($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire6edea6294a88689e3f5c56484bb70c9b($fileIdentifier, $file)
function composerRequire52171af285e1b8005511556b6240be1b($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b
class ComposerStaticInit52171af285e1b8005511556b6240be1b
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1123,10 +1123,10 @@ class ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::$prefixesPsr0;
$loader->classMap = ComposerStaticInit6edea6294a88689e3f5c56484bb70c9b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit52171af285e1b8005511556b6240be1b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit52171af285e1b8005511556b6240be1b::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit52171af285e1b8005511556b6240be1b::$prefixesPsr0;
$loader->classMap = ComposerStaticInit52171af285e1b8005511556b6240be1b::$classMap;
}, null, ClassLoader::class);
}

File diff suppressed because it is too large Load Diff

View File

@ -40,13 +40,15 @@ class Postgres extends Base
public function createConnection(array $settings)
{
$dsn = 'pgsql:dbname='.$settings['database'];
$username = null;
$password = null;
if (! empty($settings['username'])) {
$dsn .= ';user='.$settings['username'];
$username = $settings['username'];
}
if (! empty($settings['password'])) {
$dsn .= ';password='.$settings['password'];
$password = $settings['password'];
}
if (! empty($settings['hostname'])) {
@ -57,7 +59,7 @@ class Postgres extends Base
$dsn .= ';port='.$settings['port'];
}
$this->pdo = new PDO($dsn);
$this->pdo = new PDO($dsn, $username, $password);
if (isset($settings['schema_table'])) {
$this->schemaTable = $settings['schema_table'];