Diffusion KDb d8b10603c229

Merge branch '3.1'
d8b10603c229
Actions

Authored by staniek on Jul 3 2018, 8:42 PM.

Description

Merge branch '3.1'

Conflicts:
cmake/modules/FindICU.cmake
src/drivers/mysql/kdb_mysqldriver.json
src/drivers/postgresql/kdb_postgresqldriver.json
src/drivers/sqlite/kdb_sqlitedriver.json
src/drivers/sybase/kdb_sybasedriver.json
src/drivers/xbase/kdb_xbasedriver.json

Details

Committed

staniek

Jul 3 2018, 8:42 PM

Parents

R15:57c8ecfb282e: GIT_SILENT bump recommended version of SQLite to 3.24.0
R15:c4c3ccd7fd69: Merge branch '3.1'

Branches

Unknown

Tags

Unknown

staniek committed R15:d8b10603c229: Merge branch '3.1' (authored by staniek).Jul 3 2018, 8:42 PM

Merged Changes

	Commit			Author	Details	Committed
	57c8ecfb282e			staniek	GIT_SILENT bump recommended version of SQLite to 3.24.0	Jul 3 2018
	75baf9a3ccb8			staniek	GIT_SILENT http -> https in URLs	Jul 3 2018

Changes (51)

				Path	Packages
	M			KDb.pc.cmake
	M			autotests/KDbTest.cpp
	M			cmake/modules/FindMySQL.cmake
	M			cmake/modules/FindPostgreSQL.cmake
	M			cmake/modules/FindSqlite.cmake
	M			cmake/modules/GetGitRevisionDescription.cmake
	M			cmake/modules/GetGitRevisionDescription.cmake.in
	M			cmake/modules/KDbAddQCH.cmake
	M			cmake/modules/KDbDoxygenQCH.config.in
	M			docs/comparison.txt
	M			docs/kdb_issues.txt
	M			docs/pgsql_issues.txt
	M			docs/sqlite_issues.txt
	M			src/CMakeLists.txt
	M			src/KDb.cpp
	M			src/KDb.h
	M			src/KDbAlter.cpp
	M			src/KDbDriver.cpp
	M			src/KDbDriver.h
	M			src/KDbDriverBehavior.h
	M			src/drivers/CMakeLists.txt
	M			src/drivers/mysql/MysqlConnection.cpp
	M			src/drivers/mysql/MysqlDriver.cpp
	M			src/drivers/mysql/MysqlDriver.h
	M			src/drivers/mysql/MysqlPreparedStatement.cpp
	M			src/drivers/mysql/kdb_mysqldriver.json
	M			src/drivers/postgresql/PostgresqlConnection.cpp
	M			src/drivers/postgresql/PostgresqlConnection_p.h
	M			src/drivers/postgresql/PostgresqlDriver.cpp
	M			src/drivers/postgresql/PostgresqlDriver.h
	M			src/drivers/postgresql/kdb_postgresqldriver.json
	M			src/drivers/sqlite/CMakeLists.txt
	M			src/drivers/sqlite/SqliteAlter.cpp
	M			src/drivers/sqlite/SqliteConnection.cpp
	M			src/drivers/sqlite/SqliteDriver.cpp
	M			src/drivers/sqlite/SqliteKeywords.cpp
	M			src/drivers/sqlite/icu/README.txt
	M			src/drivers/sqlite/icu/icu.cpp
	M			src/drivers/sqlite/kdb_sqlitedriver.json
	M			src/drivers/sybase/kdb_sybasedriver.json
	M			src/drivers/xbase/XbaseExport.cpp
	M			src/drivers/xbase/kdb_xbasedriver.json
	M			src/expression/KDbBinaryExpression.cpp
	M			src/expression/KDbFunctionExpression.cpp
	M			src/parser/KDbSqlParser.y
	M			src/parser/generated/sqlparser.cpp
	M			src/parser/generated/sqlparser.h
	M			src/tools/KDbJsonTrader_p.h
	M			tools/sdc.py
	M			tools/test_coverage.sh
	M			tools/update_recommended_sqlite_ver.sh