Commit 82cf868
committed
Merge branch '2.0-dev' of https://github.com/joomla-framework/database into 3.x-dev
# Conflicts:
# .drone.jsonnet
# .drone.yml
# Tests/AbstractDatabaseDriverTestCase.php
# Tests/Mysql/MysqlDriverTest.php
# Tests/Mysqli/MysqliDriverTest.php
# Tests/Pgsql/PgsqlDriverTest.php
# Tests/Sqlite/SqliteDriverTest.php
# Tests/Sqlsrv/SqlsrvDriverTest.php
# ruleset.xml
# src/Command/ExportCommand.php
# src/DatabaseDriver.php
# src/DatabaseExporter.php
# src/DatabaseImporter.php
# src/Mysql/MysqlDriver.php
# src/Mysql/MysqlImporter.php
# src/Mysqli/MysqliDriver.php
# src/Mysqli/MysqliImporter.php
# src/Pgsql/PgsqlDriver.php
# src/Sqlite/SqliteDriver.php18 files changed
Lines changed: 1302 additions & 808 deletions
File tree
- Tests
- Mysqli
- Mysql
- Pgsql
- Sqlite
- Sqlsrv
- src
- Command
- Mysqli
- Mysql
- Pgsql
- Sqlite
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
68 | 70 | | |
69 | 71 | | |
70 | 72 | | |
| |||
252 | 254 | | |
253 | 255 | | |
254 | 256 | | |
255 | | - | |
256 | | - | |
257 | | - | |
258 | | - | |
259 | | - | |
260 | | - | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | 257 | | |
265 | 258 | | |
266 | 259 | | |
| |||
0 commit comments