diff --git a/.travis.yml b/.travis.yml index e8384900..7abeecea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,20 @@ language: php php: - - 7.1 - 7.2 - 7.3 - 7.4 -env: - - DOCTRINE_VERSION=2.6.* - - DOCTRINE_VERSION=2.7.* - install: - composer self-update - composer install - - composer require doctrine/orm:${DOCTRINE_VERSION} --dev --prefer-source --update-with-dependencies notifications: email: false script: - make test - - if [[ $DOCTRINE_VERSION == 2.7.* && $TRAVIS_PHP_VERSION == 7.4 ]]; then make lint; fi + - if [[ $TRAVIS_PHP_VERSION == 7.4 ]]; then make lint; fi dist: bionic diff --git a/README.md b/README.md index b307c017..efae22ba 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,12 @@ MySQL, Oracle, PostgreSQL and SQLite. |:--:|:---------:| | MySQL | `ACOS, ADDTIME, AES_DECRYPT, AES_ENCRYPT, ANY_VALUE, ASCII, ASIN, ATAN, ATAN2, BINARY, BIT_COUNT, BIT_XOR, CAST, CEIL, CHAR_LENGTH, COLLATE, CONCAT_WS, CONVERT_TZ, COS, COT, COUNTIF, CRC32, DATE, DATE_FORMAT, DATEADD, DATEDIFF, DATESUB, DAY, DAYNAME, DAYOFWEEK, DAYOFYEAR, DEGREES, DIV, EXP, EXTRACT, FIELD, FIND_IN_SET, FLOOR, FORMAT, FROM_BASE64, FROM_UNIXTIME, GREATEST, GROUP_CONCAT, HEX, HOUR, IFELSE, IFNULL, INET_ATON, INET_NTOA, INET6_ATON, INET6_NTOA, INSTR, IS_IPV4, IS_IPV4_COMPAT, IS_IPV4_MAPPED, IS_IPV6, JSON_CONTAINS, JSON_DEPTH, JSON_LENGTH, LAG, LAST_DAY, LEAD, LEAST, LOG, LOG10, LOG2, LPAD, MAKEDATE, MATCH, MD5, MINUTE, MONTH, MONTHNAME, NOW, NULLIF, OVER, PERIOD_DIFF, PI, POWER, QUARTER, RADIANS, RAND, REGEXP, REPLACE, ROUND, RPAD, SECOND, SECTOTIME, SHA1, SHA2, SIN, SOUNDEX, STD, STDDEV, STRTODATE, STR_TO_DATE, SUBSTRING_INDEX, TAN, TIME, TIMEDIFF, TIMESTAMPADD, TIMESTAMPDIFF, TIMETOSEC, TRUNCATE, UNHEX, UNIX_TIMESTAMP, UTC_TIMESTAMP, UUID_SHORT, VARIANCE, WEEK, WEEKDAY, YEAR, YEARMONTH, YEARWEEK` | | Oracle | `CEIL, DAY, FLOOR, HOUR, LISTAGG, MINUTE, MONTH, NVL, SECOND, TO_CHAR, TO_DATE, TRUNC, YEAR` | -| Sqlite | `CASE WHEN THEN ELSE END, DATE, DATE_FORMAT*, DAY, HOUR, IFNULL, JULIANDAY, MINUTE, MONTH, REPLACE, ROUND, SECOND, STRFTIME, WEEK, WEEKDAY, YEAR` | +| SQLite | `CASE WHEN THEN ELSE END, DATE, DATE_FORMAT*, DAY, HOUR, IFNULL, JULIANDAY, MINUTE, MONTH, REPLACE, ROUND, SECOND, STRFTIME, WEEK, WEEKDAY, YEAR` | | PostgreSQL | `AT_TIME_ZONE, COUNT_FILTER, DATE, DATE_PART, DATE_TRUNC, DAY, EXTRACT, GREATEST, HOUR, LEAST, MINUTE, MONTH, REGEXP_REPLACE, SECOND, STRING_AGG, TO_CHAR, TO_DATE, YEAR` | -> Note: Sqlite date functions are implemented as `strftime(format, value)`. - Sqlite only supports the [most common formats](https://www.sqlite.org/lang_datefunc.html), - so `date_format` will convert the mysql substitutions to the closest available sqlite substitutions. +> Note: SQLite date functions are implemented as `strftime(format, value)`. + SQLite only supports the [most common formats](https://www.sqlite.org/lang_datefunc.html), + so `date_format` will convert the mysql substitutions to the closest available SQLite substitutions. This means `date_format(field, '%b %D %Y') -> Jan 1st 2015` becomes `strftime('%m %d %Y', field) -> 01 01 2015`. Installation diff --git a/composer.json b/composer.json index f601bf54..f5f3ccbf 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "beberlei/doctrineextensions", "type": "library", - "description": "A set of extensions to Doctrine 2 that add support for additional query functions available in MySQL and Oracle.", + "description": "A set of extensions to Doctrine 2 that add support for additional query functions available in MySQL, Oracle, PostgreSQL and SQLite.", "keywords": ["doctrine", "orm", "database"], "license": "BSD-3-Clause", "authors": [ @@ -9,14 +9,14 @@ {"name": "Steve Lacey", "email": "steve@steve.ly"} ], "require": { - "php": "^7.1", - "doctrine/orm": "^2.6" + "php": "^7.2 || ^8.0", + "doctrine/orm": "^2.7" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "nesbot/carbon": "*", - "phpunit/phpunit": "^7.0 || ^8.0", - "symfony/yaml": "^4.2", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "symfony/yaml": "^4.2 || ^5.0", "zf1/zend-date": "^1.12", "zf1/zend-registry": "^1.12" },