Git commit 75baf9a3ccb80e1a647774b5c3db8e6366512340 by Jaroslaw Staniek. Committed on 03/07/2018 at 20:36. Pushed by staniek into branch '3.1'. GIT_SILENT http -> https in URLs M +1 -1 KDb.pc.cmake M +1 -1 autotests/KDbTest.cpp M +1 -1 cmake/modules/FindICU.cmake M +1 -1 cmake/modules/FindMySQL.cmake M +1 -1 cmake/modules/FindPostgreSQL.cmake M +2 -2 cmake/modules/FindSqlite.cmake M +2 -2 cmake/modules/GetGitRevisionDescription.cmake M +2 -2 cmake/modules/GetGitRevisionDescription.cmake.in M +1 -1 cmake/modules/KDbAddQCH.cmake M +7 -7 cmake/modules/KDbDoxygenQCH.config.in M +1 -1 docs/comparison.txt M +1 -1 docs/kdb_issues.txt M +1 -1 docs/pgsql_issues.txt M +1 -1 docs/sqlite_issues.txt M +1 -1 src/CMakeLists.txt M +2 -2 src/KDb.cpp M +5 -5 src/KDb.h M +3 -3 src/KDbAlter.cpp M +3 -3 src/KDbDriver.cpp M +1 -1 src/KDbDriver.h M +2 -2 src/KDbDriverBehavior.h M +2 -2 src/drivers/CMakeLists.txt M +3 -3 src/drivers/mysql/MysqlConnection.cpp M +2 -2 src/drivers/mysql/MysqlDriver.cpp M +1 -1 src/drivers/mysql/MysqlDriver.h M +1 -1 src/drivers/mysql/MysqlPreparedStatement.cpp M +1 -1 src/drivers/mysql/kdb_mysqldriver.json M +2 -2 src/drivers/postgresql/PostgresqlConnection.cpp M +1 -1 src/drivers/postgresql/PostgresqlConnection_p.h M +4 -4 src/drivers/postgresql/PostgresqlDriver.cpp M +1 -1 src/drivers/postgresql/PostgresqlDriver.h M +1 -1 src/drivers/postgresql/kdb_postgresqldriver.json M +3 -3 src/drivers/sqlite/CMakeLists.txt M +2 -2 src/drivers/sqlite/SqliteAlter.cpp M +1 -1 src/drivers/sqlite/SqliteConnection.cpp M +1 -1 src/drivers/sqlite/SqliteDriver.cpp M +1 -1 src/drivers/sqlite/SqliteKeywords.cpp M +2 -2 src/drivers/sqlite/icu/README.txt M +1 -1 src/drivers/sqlite/icu/icu.cpp M +1 -1 src/drivers/sqlite/kdb_sqlitedriver.json M +1 -1 src/drivers/sybase/kdb_sybasedriver.json M +1 -1 src/drivers/xbase/XbaseExport.cpp M +1 -1 src/drivers/xbase/kdb_xbasedriver.json M +1 -1 src/expression/KDbBinaryExpression.cpp M +15 -15 src/expression/KDbFunctionExpression.cpp M +1 -1 src/parser/KDbSqlParser.y M +1 -1 src/parser/generated/sqlparser.cpp M +1 -1 src/parser/generated/sqlparser.h M +1 -1 src/tools/KDbJsonTrader_p.h M +2 -2 tools/sdc.py M +1 -1 tools/test_coverage.sh M +1 -1 tools/update_recommended_sqlite_ver.sh https://commits.kde.org/kdb/75baf9a3ccb80e1a647774b5c3db8e6366512340 diff --git a/KDb.pc.cmake b/KDb.pc.cmake index 20ab97b2..1fc8be0e 100644 --- a/KDb.pc.cmake +++ b/KDb.pc.cmake @@ -6,7 +6,7 @@ includedir=3D${prefix}/include Name: @PROJECT_NAME@@PROJECT_STABLE_VERSION_MAJOR@ Description: A database connectivity and creation framework Version: @PROJECT_VERSION@ -URL: http://community.kde.org/KDb +URL: https://community.kde.org/KDb Requires: Qt5Core Qt5Gui Qt5Widgets Qt5Xml icu-lo KF5CoreAddons Libs: -L${libdir} Cflags: -I${includedir} diff --git a/autotests/KDbTest.cpp b/autotests/KDbTest.cpp index 710541d3..57c5b6b5 100644 --- a/autotests/KDbTest.cpp +++ b/autotests/KDbTest.cpp @@ -960,7 +960,7 @@ KDB_EXPORT KDbEscapedString valueToSql(KDbField::Type f= type, const QVariant& v); = /*! Converts value @a v to string representation required by KDbSQL comman= ds: ISO 8601 DateTime format - with "T" delimiter/ - For specification see http://www.w3.org/TR/NOTE-datetime. + For specification see https://www.w3.org/TR/NOTE-datetime. Example: "1994-11-05T13:15:30" not "1994-11-05 13:15:30". @todo Add support for time zones */ KDB_EXPORT KDbEscapedString dateTimeToSql(const QDateTime& v); diff --git a/cmake/modules/FindICU.cmake b/cmake/modules/FindICU.cmake index 7c85e353..563666fc 100644 --- a/cmake/modules/FindICU.cmake +++ b/cmake/modules/FindICU.cmake @@ -11,7 +11,7 @@ = include(FeatureSummary) set_package_properties(ICU PROPERTIES DESCRIPTION "International Component= s for Unicode Library (ICU)" - URL "http://icu-project.org") + URL "https://icu-project.org") = # Look for the header file. find_path( diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake index be5cfa49..9b398f56 100644 --- a/cmake/modules/FindMySQL.cmake +++ b/cmake/modules/FindMySQL.cmake @@ -19,7 +19,7 @@ include(CheckCXXSourceCompiles) include(MacroPushRequiredVars) include(FeatureSummary) set_package_properties(MySQL PROPERTIES - DESCRIPTION "MySQL Client Library (libmysqlclient)" URL "http://www.my= sql.com") + DESCRIPTION "MySQL Client Library (libmysqlclient)" URL "https://www.m= ysql.com") = set(MYSQL_USING_MARIADB FALSE) = diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgre= SQL.cmake index 56e6e56e..8ec30db8 100644 --- a/cmake/modules/FindPostgreSQL.cmake +++ b/cmake/modules/FindPostgreSQL.cmake @@ -77,7 +77,7 @@ = include(FeatureSummary) set_package_properties(PostgreSQL - PROPERTIES DESCRIPTION "C API to PostgreSQL (libpq)" URL "http://www.p= ostgresql.org") + PROPERTIES DESCRIPTION "C API to PostgreSQL (libpq)" URL "https://www.= postgresql.org") = set(PostgreSQL_INCLUDE_PATH_DESCRIPTION "top-level directory containing th= e PostgreSQL include directories. E.g /usr/local/include/PostgreSQL/8.4 or = C:/Program Files/PostgreSQL/8.4/include") set(PostgreSQL_INCLUDE_DIR_MESSAGE "Set the PostgreSQL_INCLUDE_DIR cmake c= ache entry to the ${PostgreSQL_INCLUDE_PATH_DESCRIPTION}") diff --git a/cmake/modules/FindSqlite.cmake b/cmake/modules/FindSqlite.cmake index 884963e2..5cf0a4cd 100644 --- a/cmake/modules/FindSqlite.cmake +++ b/cmake/modules/FindSqlite.cmake @@ -38,7 +38,7 @@ # ENABLE_COLUMN_METADATA ENABLE_FTS3 ENABLE_FTS3_PARENTHESIS ENABLE_M= EMORY_MANAGEMENT # ENABLE_RTREE ENABLE_UNLOCK_NOTIFY ENABLE_UPDATE_DELETE_LIMIT SECURE= _DELETE SOUNDEX # TEMP_STORE THREADSAFE OMIT_LOAD_EXTENSION. -# For complete list of options read http://www.sqlite.org/compile.html +# For complete list of options read https://www.sqlite.org/compile.ht= ml # SQLITE_COMPILE_OPTIONS list is used for the check. # SQLITE_INCLUDE_PATH include directory for sqlite3.h # SQLITE_EXT_INCLUDE_PATH include directory for sqlite3ext.h @@ -53,7 +53,7 @@ set(Sqlite_FOUND TRUE) = include(FeatureSummary) set_package_properties(Sqlite - PROPERTIES DESCRIPTION "SQLite3 client library" URL "http://www.sqlite= .org") + PROPERTIES DESCRIPTION "SQLite3 client library" URL "https://www.sqlit= e.org") = if(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES) if(SQLITE_LOAD_EXTENSION_REQUIRED AND SQLITE_LOAD_EXTENSION OR NOT SQLI= TE_LOAD_EXTENSION_REQUIRED) diff --git a/cmake/modules/GetGitRevisionDescription.cmake b/cmake/modules/= GetGitRevisionDescription.cmake index 28db419c..ee7f38fb 100644 --- a/cmake/modules/GetGitRevisionDescription.cmake +++ b/cmake/modules/GetGitRevisionDescription.cmake @@ -22,13 +22,13 @@ # # Original Author: # 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# https://academic.cleardefinition.com # Iowa State University HCI Graduate Program/VRAC # # Copyright Iowa State University 2009-2010. # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt) = if(__get_git_revision_description) return() diff --git a/cmake/modules/GetGitRevisionDescription.cmake.in b/cmake/modul= es/GetGitRevisionDescription.cmake.in index 6faa374a..d81129b4 100644 --- a/cmake/modules/GetGitRevisionDescription.cmake.in +++ b/cmake/modules/GetGitRevisionDescription.cmake.in @@ -5,13 +5,13 @@ # # Original Author: # 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com +# https://academic.cleardefinition.com # Iowa State University HCI Graduate Program/VRAC # # Copyright Iowa State University 2009-2010. # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) +# https://www.boost.org/LICENSE_1_0.txt) = set(HEAD_HASH) = diff --git a/cmake/modules/KDbAddQCH.cmake b/cmake/modules/KDbAddQCH.cmake index b39502e1..45708bd6 100644 --- a/cmake/modules/KDbAddQCH.cmake +++ b/cmake/modules/KDbAddQCH.cmake @@ -95,7 +95,7 @@ # # NAMESPACE can be used to set a custom namespace of the gener= ated # QCH file. The namepspace is used as the unique id by QHelpEngine (cmp. -# http://doc.qt.io/qt-5/qthelpproject.html#namespace). +# https://doc.qt.io/qt-5/qthelpproject.html#namespace). # The default namespace is ``.``. # Needs to be used when ORG_DOMAIN is not used. # diff --git a/cmake/modules/KDbDoxygenQCH.config.in b/cmake/modules/KDbDoxyg= enQCH.config.in index 8e86035c..a97c129b 100644 --- a/cmake/modules/KDbDoxygenQCH.config.in +++ b/cmake/modules/KDbDoxygenQCH.config.in @@ -198,13 +198,13 @@ ALIASES =3D "intern=3D\parInternal = use only." \ "FIXME=3D\xrefitem fixme \"Fixme\" \"Fixme\"" \ "bc=3D\xrefitem bc \"Binary Compatible\" \"Binary= Compatible\"" \ "threadsafe=3D\xrefitem threadsafe \"Threadsafe\"= \"Threadsafe\"" \ - "artistic=3DArtistic" \ - "bsd=3DBSD" \ - "x11=3DX11" \ - "gpl=3DGPLv2" \ - "lgpl=3DLGPLv2" \ - "mit=3DMIT" \ - "qpl=3DQPL" + "artistic=3DArtistic" \ + "bsd=3DBSD" \ + "x11=3DX11" \ + "gpl=3DGPLv2" \ + "lgpl=3DLGPLv2" \ + "mit=3DMIT" \ + "qpl=3DQPL" = PREDEFINED =3D DOXYGEN_SHOULD_SKIP_THIS \ \ diff --git a/docs/comparison.txt b/docs/comparison.txt index 3e0d8314..8c682a03 100644 --- a/docs/comparison.txt +++ b/docs/comparison.txt @@ -1 +1 @@ -http://sqlite.phxsoftware.com/forums/p/174/622.aspx#622 +https://sqlite.phxsoftware.com/forums/p/174/622.aspx#622 diff --git a/docs/kdb_issues.txt b/docs/kdb_issues.txt index c94432c1..a20faffb 100644 --- a/docs/kdb_issues.txt +++ b/docs/kdb_issues.txt @@ -2,7 +2,7 @@ IDEAS, ISSUES, PROPOSALS for KDb Copyright (C) 2003 Jaros=C5=82aw Staniek staniek at kde.org Started: 2003-08-01 - KDb home page: http://community.kde.org/KDb + KDb home page: https://community.kde.org/KDb = Changes: 2005-09-16 Global BLOBs Storage diff --git a/docs/pgsql_issues.txt b/docs/pgsql_issues.txt index 8097e662..ee058e12 100644 --- a/docs/pgsql_issues.txt +++ b/docs/pgsql_issues.txt @@ -3,5 +3,5 @@ To avoid big memory consuming, we will need to use backend-side (native) c= ursors with "DECLARE CURSOR" statement. Otherwise KDbCursor needs to be buffered. = -http://archives.postgresql.org/pgsql-interfaces/2000-09/msg00082.php +https://archives.postgresql.org/pgsql-interfaces/2000-09/msg00082.php = diff --git a/docs/sqlite_issues.txt b/docs/sqlite_issues.txt index de4c86c6..cec90232 100644 --- a/docs/sqlite_issues.txt +++ b/docs/sqlite_issues.txt @@ -94,7 +94,7 @@ and the default value for the column. --------------------------------------------------------------- OPTIMIZATION: = -http://www.mail-archive.com/sqlite-users@sqlite.org/msg04117.html +https://www.mail-archive.com/sqlite-users@sqlite.org/msg04117.html = From: D. Richard Hipp [mailto:[EMAIL PROTECTED] Sent: Friday, October 08, 2004 5:59 PM diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ff7d4e6..fdc0e3f7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ check_include_file(unistd.h HAVE_UNISTD_H) #) = ########### generate parser/lexer files ############### -# as described at http://public.kitware.com/pipermail/cmake/2002-September= /003028.html +# as described at https://public.kitware.com/pipermail/cmake/2002-Septembe= r/003028.html = # Create target for the parser add_custom_target(parser echo "Creating parser/lexer files") diff --git a/src/KDb.cpp b/src/KDb.cpp index 253be6ae..b25c7222 100644 --- a/src/KDb.cpp +++ b/src/KDb.cpp @@ -1629,7 +1629,7 @@ QString KDb::escapeBLOB(const QByteArray& array, BLOB= EscapingType type) int new_length =3D str.length(); //after X' or 0x, etc. if (type =3D=3D BLOBEscapingType::Octal) { // only escape nonprintable characters as in Table 8-7: - // http://www.postgresql.org/docs/8.1/interactive/datatype-binary.= html + // https://www.postgresql.org/docs/8.1/interactive/datatype-binary= .html // i.e. escape for bytes: < 32, >=3D 127, 39 ('), 92(\). for (int i =3D 0; i < size; i++) { const unsigned char val =3D array[i]; @@ -1687,7 +1687,7 @@ QByteArray KDb::pgsqlByteaToByteArray(const char* dat= a, int length) for (int input =3D 0; s < end; output++) { // kdbDebug()<<(int)s[0]<<" "<<(int)s[1]<<" "<<(int)s[2]<<" "= <<(int)s[3]<<" "<<(int)s[4]; if (s[0] =3D=3D '\\' && (s + 1) < end) { - //special cases as in http://www.postgresql.org/docs/8.1/i= nteractive/datatype-binary.html + //special cases as in https://www.postgresql.org/docs/8.1/= interactive/datatype-binary.html if (s[1] =3D=3D '\'') {// \' if (pass =3D=3D 1) array[output] =3D '\''; diff --git a/src/KDb.h b/src/KDb.h index 58c55c25..5abbf05a 100644 --- a/src/KDb.h +++ b/src/KDb.h @@ -524,7 +524,7 @@ KDB_EXPORT KDbEscapedString escapeString(KDbConnection = *conn, const QString& str * The industry is moving away from it and EcmaScript 5 deprecates i= t. * * See also: - * - http://dev.mysql.com/doc/refman/5.7/en/string-literals.html + * - https://dev.mysql.com/doc/refman/5.7/en/string-literals.html * - https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_s= equences * - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Grammar= _and_types#Using_special_characters_in_strings * - https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lex= ical_grammar#String_literals @@ -538,10 +538,10 @@ enum class BLOBEscapingType { Hex, //!< Escaping like 1FAD without quotes or prefixes Octal, //!< Escaping like 'zk\\000$x', used by PostgreSQL //!< (only non-printable characters are esc= aped using octal numbers); - //!< see http://www.postgresql.org/docs/9.5= /interactive/datatype-binary.html + //!< see https://www.postgresql.org/docs/9.= 5/interactive/datatype-binary.html ByteaHex //!< "bytea hex" escaping, e.g. E'\xDEADBEEF'::bytea = used by PostgreSQL //!< (only non-printable characters are esc= aped using octal numbers); - //!< see http://www.postgresql.org/docs/9.5= /interactive/datatype-binary.html + //!< see https://www.postgresql.org/docs/9.= 5/interactive/datatype-binary.html }; = /*! @return a string containing escaped, printable representation of @a ar= ray. @@ -555,7 +555,7 @@ KDB_EXPORT QString escapeBLOB(const QByteArray& array, = BLOBEscapingType type); If @a length is negative, the data is assumed to point to a null-terminat= ed string and its length is determined dynamically. @a data is escaped in format used by PostgreSQL's bytea datatype - described at http://www.postgresql.org/docs/8.1/interactive/datatype-bina= ry.html + described at https://www.postgresql.org/docs/8.1/interactive/datatype-bin= ary.html This function is used by PostgreSQL KDb and migration drivers. */ KDB_EXPORT QByteArray pgsqlByteaToByteArray(const char* data, int length = =3D -1); = @@ -664,7 +664,7 @@ KDB_EXPORT KDbEscapedString valueToSql(KDbField::Type f= type, const QVariant& v); = /*! Converts value @a v to string representation required by KDbSQL comman= ds: ISO 8601 DateTime format - with "T" delimiter/ - For specification see http://www.w3.org/TR/NOTE-datetime. + For specification see https://www.w3.org/TR/NOTE-datetime. Example: "1994-11-05T13:15:30" not "1994-11-05 13:15:30". @todo Add support for time zones */ KDB_EXPORT KDbEscapedString dateTimeToSql(const QDateTime& v); diff --git a/src/KDbAlter.cpp b/src/KDbAlter.cpp index e1ba0b36..50a2ec27 100644 --- a/src/KDbAlter.cpp +++ b/src/KDbAlter.cpp @@ -135,7 +135,7 @@ struct KDb_AlterTableHandlerStatic { types.insert(QByteArray(name).toLower(), flag) = /* useful links: - http://dev.mysql.com/doc/refman/5.0/en/create-table.html + https://dev.mysql.com/doc/refman/5.0/en/create-table.html */ // ExtendedSchemaAlteringRequired is here because when the field i= s renamed, // we need to do the same rename in extended table schema: @@ -444,9 +444,9 @@ tristate KDbAlterTableHandler::ChangeFieldPropertyActio= n::execute(KDbConnection* /*mysql: A. Get real field type (it's safer): let be the 2nd "Type" column from result of "DESCRIBE t= ablename oldfieldname" - ( http://dev.mysql.com/doc/refman/5.0/en/describe.html ) + ( https://dev.mysql.com/doc/refman/5.0/en/describe.html ) B. Run "ALTER TABLE tablename CHANGE oldfieldname newfieldname "; - ( http://dev.mysql.com/doc/refman/5.0/en/alter-table.html ) + ( https://dev.mysql.com/doc/refman/5.0/en/alter-table.html ) */ } if (m_propertyName =3D=3D QLatin1String("type")) { diff --git a/src/KDbDriver.cpp b/src/KDbDriver.cpp index b7b50439..973a8589 100644 --- a/src/KDbDriver.cpp +++ b/src/KDbDriver.cpp @@ -244,7 +244,7 @@ static KDbEscapedString valueToSqlInternal(const KDbDri= ver *driver, KDbField::Ty = KDbEscapedString KDbDriver::valueToSql(KDbField::Type ftype, const QVarian= t& v) const { - //! note, it was compatible with SQLite: http://www.sqlite.org/cvstrac= /wiki?p=3DDateAndTimeFunctions. + //! note, it was compatible with SQLite: https://www.sqlite.org/cvstra= c/wiki?p=3DDateAndTimeFunctions. return valueToSqlInternal(this, ftype, v); } = @@ -255,9 +255,9 @@ KDbEscapedString KDb::valueToSql(KDbField::Type ftype, = const QVariant& v) = KDbEscapedString KDb::dateTimeToSql(const QDateTime& v) { - /*! (was compatible with SQLite: http://www.sqlite.org/cvstrac/wiki?p= =3DDateAndTimeFunctions) + /*! (was compatible with SQLite: https://www.sqlite.org/cvstrac/wiki?p= =3DDateAndTimeFunctions) Now it's ISO 8601 DateTime format - with "T" delimiter: - http://www.w3.org/TR/NOTE-datetime + https://www.w3.org/TR/NOTE-datetime (e.g. "1994-11-05T13:15:30" not "1994-11-05 13:15:30") @todo add support for time zones? */ diff --git a/src/KDbDriver.h b/src/KDbDriver.h index a599d3c8..8e29e49e 100644 --- a/src/KDbDriver.h +++ b/src/KDbDriver.h @@ -363,7 +363,7 @@ protected: /*! @return true if the database supports specifying default values fo= r field @a field. @c true by default. For example MySQL does not support default values for BLOB, TEXT, GEO= METRY, and JSON types. - (http://dev.mysql.com/doc/refman/5.7/en/data-type-defaults.html). */ + (https://dev.mysql.com/doc/refman/5.7/en/data-type-defaults.html). */ virtual bool supportsDefaultValue(const KDbField &field) const { Q_UNU= SED(field); return true; } = /*! Used by the driver manager to set metaData for just loaded driver.= */ diff --git a/src/KDbDriverBehavior.h b/src/KDbDriverBehavior.h index dbf70786..a7900b0a 100644 --- a/src/KDbDriverBehavior.h +++ b/src/KDbDriverBehavior.h @@ -193,13 +193,13 @@ public: = /*! Literal for boolean true. "1" by default which is typically expected by backends even while the standard sa= ys "TRUE": - http://troels.arvin.dk/db/rdbms/#data_types-boolean + https://troels.arvin.dk/db/rdbms/#data_types-boolean */ QString BOOLEAN_TRUE_LITERAL; = /*! Literal for boolean false. "0" by default which is typically expected by backends even while the standard sa= ys "TRUE": - http://troels.arvin.dk/db/rdbms/#data_types-boolean + https://troels.arvin.dk/db/rdbms/#data_types-boolean */ QString BOOLEAN_FALSE_LITERAL; = diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt index 7b4d376b..ae152d18 100644 --- a/src/drivers/CMakeLists.txt +++ b/src/drivers/CMakeLists.txt @@ -80,7 +80,7 @@ endif() #find_package(FreeTDS) #set_package_properties(FreeTDS PROPERTIES # DESCRIPTION "Open source implementation of the TDS= (Tabular Data Stream) protocol" -# URL "http://www.freetds.org" +# URL "https://www.freetds.org" # TYPE OPTIONAL # PURPOSE "Required by ${BUILD_SYBASE_DB_DRIVER_DESC= }" #) @@ -94,7 +94,7 @@ endif() #find_package(XBase) #set_package_properties(XBase PROPERTIES # DESCRIPTION "XBase compatible C++ class library" -# URL "http://linux.techass.com/projects/xdb" +# URL "https://linux.techass.com/projects/xdb" # TYPE OPTIONAL # PURPOSE "Required by ${BUILD_XBASE_DB_DRIVER_DESC}" #) diff --git a/src/drivers/mysql/MysqlConnection.cpp b/src/drivers/mysql/Mysq= lConnection.cpp index d6d5e4d7..9c9e5755 100644 --- a/src/drivers/mysql/MysqlConnection.cpp +++ b/src/drivers/mysql/MysqlConnection.cpp @@ -52,7 +52,7 @@ bool MysqlConnection::drv_connect() } = // Get lower_case_table_name value so we know if there's case sensitiv= ity supported - // See http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitiv= ity.html + // See https://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensiti= vity.html int intLowerCaseTableNames =3D 0; const tristate res =3D querySingleNumber( KDbEscapedString("SHOW VARIABLES LIKE 'lower_case_table_name'"), &= intLowerCaseTableNames, @@ -66,12 +66,12 @@ bool MysqlConnection::drv_connect() = bool MysqlConnection::drv_getServerVersion(KDbServerVersionInfo* version) { - // http://dev.mysql.com/doc/refman/5.1/en/mysql-get-server-info.html + // https://dev.mysql.com/doc/refman/5.1/en/mysql-get-server-info.html version->setString(QLatin1String(mysql_get_server_info(d->mysql))); = // get the version info using 'version' built-in variable: //! @todo this is hardcoded for now; define api for retrieving variables a= nd use this API... - // http://dev.mysql.com/doc/refman/5.1/en/mysql-get-server-version.html + // https://dev.mysql.com/doc/refman/5.1/en/mysql-get-server-version.ht= ml QString versionString; tristate res =3D querySingleString(KDbEscapedString("SELECT @@version"= ), &versionString, /*column*/ 0, diff --git a/src/drivers/mysql/MysqlDriver.cpp b/src/drivers/mysql/MysqlDri= ver.cpp index 0d3e8d08..1671b41b 100644 --- a/src/drivers/mysql/MysqlDriver.cpp +++ b/src/drivers/mysql/MysqlDriver.cpp @@ -123,7 +123,7 @@ bool MysqlDriver::supportsDefaultValue(const KDbField &= field) const = KDbEscapedString MysqlDriver::escapeString(const QString& str) const { - //escape as in http://dev.mysql.com/doc/refman/5.0/en/string-syntax.ht= ml + //escape as in https://dev.mysql.com/doc/refman/5.0/en/string-syntax.h= tml //! @todo support more characters, like %, _ = const int old_length =3D str.length(); @@ -188,7 +188,7 @@ KDbEscapedString MysqlDriver::escapeBLOB(const QByteArr= ay& array) const KDbEscapedString MysqlDriver::escapeString(const QByteArray& str) const { //! @todo optimize using mysql_real_escape_string()? -//! see http://dev.mysql.com/doc/refman/5.0/en/string-syntax.html +//! see https://dev.mysql.com/doc/refman/5.0/en/string-syntax.html = return KDbEscapedString("'") + KDbEscapedString(str) .replace('\\', "\\\\") diff --git a/src/drivers/mysql/MysqlDriver.h b/src/drivers/mysql/MysqlDrive= r.h index fd45d233..871c60af 100644 --- a/src/drivers/mysql/MysqlDriver.h +++ b/src/drivers/mysql/MysqlDriver.h @@ -35,7 +35,7 @@ public: * Constructor sets database features and * maps the types in KDbField::Type to the MySQL types. * - * See: http://dev.mysql.com/doc/mysql/en/Column_types.html + * See: https://dev.mysql.com/doc/mysql/en/Column_types.html */ MysqlDriver(QObject *parent, const QVariantList &args); = diff --git a/src/drivers/mysql/MysqlPreparedStatement.cpp b/src/drivers/mys= ql/MysqlPreparedStatement.cpp index 276a8b84..65255162 100644 --- a/src/drivers/mysql/MysqlPreparedStatement.cpp +++ b/src/drivers/mysql/MysqlPreparedStatement.cpp @@ -22,7 +22,7 @@ = //#include // For example prepared MySQL statement code see: -// http://dev.mysql.com/doc/refman/4.1/en/mysql-stmt-execute.html +// https://dev.mysql.com/doc/refman/4.1/en/mysql-stmt-execute.html = MysqlPreparedStatement::MysqlPreparedStatement(MysqlConnectionInternal* co= nn) : KDbPreparedStatementInterface() diff --git a/src/drivers/mysql/kdb_mysqldriver.json b/src/drivers/mysql/kdb= _mysqldriver.json index 48e8da59..f824054e 100644 --- a/src/drivers/mysql/kdb_mysqldriver.json +++ b/src/drivers/mysql/kdb_mysqldriver.json @@ -62,7 +62,7 @@ "KDb/Driver" ], "Version": "3.1", - "Website": "http://kexi-project.org" + "Website": "https://kexi-project.org" }, "X-KDb-FileBased": "false", "X-KDb-ImportingEnabled": "true" diff --git a/src/drivers/postgresql/PostgresqlConnection.cpp b/src/drivers/= postgresql/PostgresqlConnection.cpp index 643faa56..68651403 100644 --- a/src/drivers/postgresql/PostgresqlConnection.cpp +++ b/src/drivers/postgresql/PostgresqlConnection.cpp @@ -81,7 +81,7 @@ bool PostgresqlConnection::drv_connect() = bool PostgresqlConnection::drv_getServerVersion(KDbServerVersionInfo* vers= ion) { - // http://www.postgresql.org/docs/8.4/static/libpq-status.html + // https://www.postgresql.org/docs/8.4/static/libpq-status.html //postgresqlDebug() << "server_version:" << d->parameter("server_versi= on"); version->setString(QString::fromLatin1(parameter(d->conn, "server_vers= ion"))); const int versionNumber =3D PQserverVersion(d->conn); @@ -171,7 +171,7 @@ bool PostgresqlConnection::drv_useDatabase(const QStrin= g &dbName, bool *cancelle //postgresqlDebug() << conninfo; = //! @todo other parameters: connect_timeout, options, options, sslmode= , sslcert, sslkey, sslrootcert, sslcrl, krbsrvname, gsslib, service - // http://www.postgresql.org/docs/8.4/interactive/libpq-connect.html + // https://www.postgresql.org/docs/8.4/interactive/libpq-connect.html d->conn =3D PQconnectdb(conninfo.constData()); = if (!d->connectionOK()) { diff --git a/src/drivers/postgresql/PostgresqlConnection_p.h b/src/drivers/= postgresql/PostgresqlConnection_p.h index eacf2547..3d221128 100644 --- a/src/drivers/postgresql/PostgresqlConnection_p.h +++ b/src/drivers/postgresql/PostgresqlConnection_p.h @@ -53,7 +53,7 @@ public: void storeResult(KDbResult *result); = //! @return true if status of connection is "OK". - /*! From http://www.postgresql.org/docs/8.4/static/libpq-status.html: + /*! From https://www.postgresql.org/docs/8.4/static/libpq-status.html: "Only two of these are seen outside of an asynchronous connection = procedure: CONNECTION_OK and CONNECTION_BAD." */ inline bool connectionOK() { return CONNECTION_OK =3D=3D PQstatus(conn= ); } diff --git a/src/drivers/postgresql/PostgresqlDriver.cpp b/src/drivers/post= gresql/PostgresqlDriver.cpp index 4c5bbae2..03d78d24 100644 --- a/src/drivers/postgresql/PostgresqlDriver.cpp +++ b/src/drivers/postgresql/PostgresqlDriver.cpp @@ -52,7 +52,7 @@ PostgresqlDriver::PostgresqlDriver(QObject *parent, const= QVariantList &args) beh->CLOSING_QUOTATION_MARK_BEGIN_FOR_IDENTIFIER =3D '"'; beh->LIKE_OPERATOR =3D QLatin1String("ILIKE"); // Use SQL compliant TRUE or FALSE as described - // at http://www.postgresql.org/docs/8.0/interactive/datatype-boolean.= html + // at https://www.postgresql.org/docs/8.0/interactive/datatype-boolean= .html // 1 or 0 does not work. beh->BOOLEAN_TRUE_LITERAL =3D QLatin1String("TRUE"); beh->BOOLEAN_FALSE_LITERAL =3D QLatin1String("FALSE"); @@ -62,7 +62,7 @@ PostgresqlDriver::PostgresqlDriver(QObject *parent, const= QVariantList &args) initPgsqlToKDbMap(); = //predefined properties - //http://www.postgresql.org/docs/9.5/static/libpq-misc.html#LIBPQ-PQLI= BVERSION + //https://www.postgresql.org/docs/9.5/static/libpq-misc.html#LIBPQ-PQL= IBVERSION //! @todo use QLibrary to resolve PQlibVersion beh->properties.insert("client_library_version", PQlibVersion()); //! @todo pgsql default_server_encoding: should be a property of conne= ction @@ -129,7 +129,7 @@ KDbEscapedString PostgresqlDriver::escapeString(const Q= String& str) const { //Cannot use libpq escape functions as they require a db connection //to escape using the char encoding of the database - //see http://www.postgresql.org/docs/8.1/static/libpq-exec.html#LIBPQ-= EXEC-ESCAPE-STRING + //see https://www.postgresql.org/docs/8.1/static/libpq-exec.html#LIBPQ= -EXEC-ESCAPE-STRING return KDbEscapedString("E'") + KDbEscapedString(str).replace("\\", "\\\\").replace("'", "\\\= '") + "'"; @@ -139,7 +139,7 @@ KDbEscapedString PostgresqlDriver::escapeString(const Q= ByteArray& str) const { //Cannot use libpq escape functions as they require a db connection //to escape using the char encoding of the database - //see http://www.postgresql.org/docs/8.1/static/libpq-exec.html#LIBPQ-= EXEC-ESCAPE-STRING + //see https://www.postgresql.org/docs/8.1/static/libpq-exec.html#LIBPQ= -EXEC-ESCAPE-STRING return KDbEscapedString("'") + QByteArray(str).replace("\\", "\\\\").replace("'", "\\\'") + "'"; diff --git a/src/drivers/postgresql/PostgresqlDriver.h b/src/drivers/postgr= esql/PostgresqlDriver.h index c8f47000..f87133f8 100644 --- a/src/drivers/postgresql/PostgresqlDriver.h +++ b/src/drivers/postgresql/PostgresqlDriver.h @@ -100,7 +100,7 @@ public: = //! Generates native (driver-specific) HEX() function call. //! Uses UPPER(ENCODE(val, 'hex')). - //! See http://www.postgresql.org/docs/9.3/static/functions-string.htm= l#FUNCTIONS-STRING-OTHER */ + //! See https://www.postgresql.org/docs/9.3/static/functions-string.ht= ml#FUNCTIONS-STRING-OTHER */ KDbEscapedString hexFunctionToString(const KDbNArgExpression &args, KDbQuerySchemaParameterValueListI= terator* params, KDb::ExpressionCallStack* callSta= ck) const override; diff --git a/src/drivers/postgresql/kdb_postgresqldriver.json b/src/drivers= /postgresql/kdb_postgresqldriver.json index 8d332497..0141a68e 100644 --- a/src/drivers/postgresql/kdb_postgresqldriver.json +++ b/src/drivers/postgresql/kdb_postgresqldriver.json @@ -62,7 +62,7 @@ "KDb/Driver" ], "Version": "3.1", - "Website": "http://kexi-project.org" + "Website": "https://kexi-project.org" }, "X-KDb-FileBased": "false", "X-KDb-ImportingEnabled": "true" diff --git a/src/drivers/sqlite/CMakeLists.txt b/src/drivers/sqlite/CMakeLi= sts.txt index 83ca72c0..5ab3b19a 100644 --- a/src/drivers/sqlite/CMakeLists.txt +++ b/src/drivers/sqlite/CMakeLists.txt @@ -12,7 +12,7 @@ endif () = # Definitions used for the sqlite driver and the shell add_definitions( - # sqlite compile-time options, http://sqlite.org/compile.html + # sqlite compile-time options, https://sqlite.org/compile.html -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA # Some additional APIs that provide co= nvenient access to meta-data # about tables and queries @@ -26,8 +26,8 @@ add_definitions( # to chose a better query plan under certain sit= uations -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT # Optional ORDER BY and LIMIT clau= se on UPDATE and DELETE statements -DSQLITE_ENABLE_UNLOCK_NOTIFY # Enables the sqlite3_unlock_notify() in= terface and its associated functionality - # (http://sqlite.org/unlock_notify.html) - -DSQLITE_SOUNDEX # Enables the soundex() SQL function (http://sqlite.o= rg/lang_corefunc.html#soundex) + # (https://sqlite.org/unlock_notify.html) + -DSQLITE_SOUNDEX # Enables the soundex() SQL function (https://sqlite.= org/lang_corefunc.html#soundex) = # todo -DSQLITE_OMIT_DEPRECATED ) diff --git a/src/drivers/sqlite/SqliteAlter.cpp b/src/drivers/sqlite/Sqlite= Alter.cpp index 8d3bdf0f..a24aa95f 100644 --- a/src/drivers/sqlite/SqliteAlter.cpp +++ b/src/drivers/sqlite/SqliteAlter.cpp @@ -25,7 +25,7 @@ #include #include = -enum SqliteTypeAffinity { //as defined here: 2.1 Determination Of Column A= ffinity (http://sqlite.org/datatype3.html) +enum SqliteTypeAffinity { //as defined here: 2.1 Determination Of Column A= ffinity (https://sqlite.org/datatype3.html) NoAffinity =3D 0, IntAffinity =3D 1, TextAffinity =3D 2, BLOBAffinity = =3D 3 }; = @@ -75,7 +75,7 @@ tristate SqliteConnection::drv_changeFieldProperty(KDbTab= leSchema *table, KDbFie } = /*! - From http://sqlite.org/datatype3.html : + From https://sqlite.org/datatype3.html : Version 3 enhances provides the ability to store integer and real numbers= in a more compact format and the capability to store BLOB data. = diff --git a/src/drivers/sqlite/SqliteConnection.cpp b/src/drivers/sqlite/S= qliteConnection.cpp index 23952a8b..943029f4 100644 --- a/src/drivers/sqlite/SqliteConnection.cpp +++ b/src/drivers/sqlite/SqliteConnection.cpp @@ -169,7 +169,7 @@ bool SqliteConnection::drv_useDatabaseInternal(bool *ca= ncelled, // Set the secure-delete on, so SQLite overwrites deleted content = with zeros. // The default setting is determined by the SQLITE_SECURE_DELETE c= ompile-time option but we overwrite it here. // Works with 3.6.23. Earlier version just ignore this pragma. - // See http://www.sqlite.org/pragma.html#pragma_secure_delete + // See https://www.sqlite.org/pragma.html#pragma_secure_delete //! @todo add connection flags to the driver and global setting to control= the "secure delete" pragma if (!drv_executeSql(KDbEscapedString("PRAGMA secure_delete =3D on"= ))) { drv_closeDatabaseSilently(); diff --git a/src/drivers/sqlite/SqliteDriver.cpp b/src/drivers/sqlite/Sqlit= eDriver.cpp index bef6a1b5..b723f48d 100644 --- a/src/drivers/sqlite/SqliteDriver.cpp +++ b/src/drivers/sqlite/SqliteDriver.cpp @@ -82,7 +82,7 @@ SqliteDriver::SqliteDriver(QObject *parent, const QVarian= tList &args) beh->typeNames[KDbField::BigInteger] =3D QLatin1String("BigInteger"); beh->typeNames[KDbField::Boolean] =3D QLatin1String("Boolean"); beh->typeNames[KDbField::Date] =3D QLatin1String("Date"); // In fact d= ate/time types could be declared as datetext etc. - beh->typeNames[KDbField::DateTime] =3D QLatin1String("DateTime"); // t= o force text affinity..., see http://sqlite.org/datatype3.html + beh->typeNames[KDbField::DateTime] =3D QLatin1String("DateTime"); // t= o force text affinity..., see https://sqlite.org/datatype3.html beh->typeNames[KDbField::Time] =3D QLatin1String("Time"); beh->typeNames[KDbField::Float] =3D QLatin1String("Float"); beh->typeNames[KDbField::Double] =3D QLatin1String("Double"); diff --git a/src/drivers/sqlite/SqliteKeywords.cpp b/src/drivers/sqlite/Sql= iteKeywords.cpp index 62b8acb3..b365bcef 100644 --- a/src/drivers/sqlite/SqliteKeywords.cpp +++ b/src/drivers/sqlite/SqliteKeywords.cpp @@ -21,7 +21,7 @@ #include "SqliteDriver.h" = //! The list is created by hand based on parse.c from SQLite 3.13.0. -//! @todo Proces patterns like this from http://www.sqlite.org/draft/token= req.html +//! @todo Proces patterns like this from https://www.sqlite.org/draft/toke= nreq.html //! to extract tokens automatically: //! "SQLite shall recognize the *-character sequenence "*" in any combinat= ion of upper and lower case letters as the keyword token *." const char* const SqliteDriver::keywords[] =3D { diff --git a/src/drivers/sqlite/icu/README.txt b/src/drivers/sqlite/icu/REA= DME.txt index 02213dc0..db90028e 100644 --- a/src/drivers/sqlite/icu/README.txt +++ b/src/drivers/sqlite/icu/README.txt @@ -34,8 +34,8 @@ SQLite. Documentation follows. "language specific". Refer to ICU documentation for the differences between the two. Specifically: = - http://www.icu-project.org/userguide/caseMappings.html - http://www.icu-project.org/userguide/posix.html#case_mappings + https://www.icu-project.org/userguide/caseMappings.html + https://www.icu-project.org/userguide/posix.html#case_mappings = To utilise "general" case mapping, the upper() or lower() scalar functions are invoked with one argument: diff --git a/src/drivers/sqlite/icu/icu.cpp b/src/drivers/sqlite/icu/icu.cpp index e436b317..d908c652 100644 --- a/src/drivers/sqlite/icu/icu.cpp +++ b/src/drivers/sqlite/icu/icu.cpp @@ -328,7 +328,7 @@ static void icuRegexpFunc(sqlite3_context *p, int nArg,= sqlite3_value **apArg){ ** lower('I', 'en_us') -> 'i' ** lower('I', 'tr_tr') -> '=C4=B1' (small dotless i) ** -** http://www.icu-project.org/userguide/posix.html#case_mappings +** https://www.icu-project.org/userguide/posix.html#case_mappings */ static void icuCaseFunc16(sqlite3_context *p, int nArg, sqlite3_value **ap= Arg){ const UChar *zInput; diff --git a/src/drivers/sqlite/kdb_sqlitedriver.json b/src/drivers/sqlite/= kdb_sqlitedriver.json index 5329b01b..84d39418 100644 --- a/src/drivers/sqlite/kdb_sqlitedriver.json +++ b/src/drivers/sqlite/kdb_sqlitedriver.json @@ -65,7 +65,7 @@ "KDb/Driver" ], "Version": "3.1", - "Website": "http://kexi-project.org" + "Website": "https://kexi-project.org" }, "X-KDb-FileBased": "true", "X-KDb-ImportingEnabled": "false" diff --git a/src/drivers/sybase/kdb_sybasedriver.json b/src/drivers/sybase/= kdb_sybasedriver.json index 480be22a..d799e290 100644 --- a/src/drivers/sybase/kdb_sybasedriver.json +++ b/src/drivers/sybase/kdb_sybasedriver.json @@ -62,7 +62,7 @@ "KDb/Driver" ], "Version": "3.1", - "Website": "http://kexi-project.org" + "Website": "https://kexi-project.org" }, "X-KDb-FileBased": "true", "X-KDb-ImportingEnabled": "false" diff --git a/src/drivers/xbase/XbaseExport.cpp b/src/drivers/xbase/XbaseExp= ort.cpp index 2f536f0f..a547a00d 100644 --- a/src/drivers/xbase/XbaseExport.cpp +++ b/src/drivers/xbase/XbaseExport.cpp @@ -156,7 +156,7 @@ int xBaseExportPrivate::fieldLength(KDbField* f) return f->maxLength(); } // return the max possible (string)length of the types - // see http://linux.techass.com/projects/xdb/xbasedocs/xbase_c3.html + // see https://linux.techass.com/projects/xdb/xbasedocs/xbase_c3.html switch(type(t)) { case XB_CHAR_FLD: return 254; diff --git a/src/drivers/xbase/kdb_xbasedriver.json b/src/drivers/xbase/kdb= _xbasedriver.json index a4443042..26479265 100644 --- a/src/drivers/xbase/kdb_xbasedriver.json +++ b/src/drivers/xbase/kdb_xbasedriver.json @@ -62,7 +62,7 @@ "KDb/Driver" ], "Version": "3.1", - "Website": "http://kexi-project.org" + "Website": "https://kexi-project.org" }, "X-KDb-FileBased": "true", "X-KDb-ImportingEnabled": "false" diff --git a/src/expression/KDbBinaryExpression.cpp b/src/expression/KDbBin= aryExpression.cpp index 8b3e6dea..fc77f7b1 100644 --- a/src/expression/KDbBinaryExpression.cpp +++ b/src/expression/KDbBinaryExpression.cpp @@ -102,7 +102,7 @@ KDbField::Type KDbBinaryExpressionData::typeInternal(KD= b::ExpressionCallStack* c switch (token.value()) { //! @todo add general support, e.g. for "NULL AND (1 =3D=3D 1)"; f= or now we only support //! constants because there's no evaluation and operations with NU= LL depend on whether we have TRUE or FALSE - //! See http://www.postgresql.org/docs/9.4/static/functions-logica= l.html + //! See https://www.postgresql.org/docs/9.4/static/functions-logic= al.html //! https://dev.mysql.com/doc/refman/5.0/en/logical-operators.= html case OR: { const KDbConstExpressionData *leftConst =3D left()->convertCon= st(); diff --git a/src/expression/KDbFunctionExpression.cpp b/src/expression/KDbF= unctionExpression.cpp index d33cf334..b3390519 100644 --- a/src/expression/KDbFunctionExpression.cpp +++ b/src/expression/KDbFunctionExpression.cpp @@ -444,7 +444,7 @@ BuiltInFunctions::BuiltInFunctions() m_functions.insert(QLatin1String("CEILING"), decl =3D new CeilingFloor= FunctionDeclaration); /* ceiling(X) returns the largest integer value not less than X. */ // See also https://dev.mysql.com/doc/refman/5.1/en/mathematical-funct= ions.html#function_ceiling - // See also http://www.postgresql.org/docs/9.5/static/functions-math.h= tml#FUNCTIONS-MATH-FUNC-TABLE + // See also https://www.postgresql.org/docs/9.5/static/functions-math.= html#FUNCTIONS-MATH-FUNC-TABLE // SQLite has no equivalent of ceiling() so this is used: // (CASE WHEN X =3D CAST(X AS INT) THEN CAST(X AS INT) WHEN X >=3D 0 T= HEN CAST(X AS INT) + 1 ELSE CAST(X AS INT) END) //! @todo add a custom function to SQLite to optimize/simplify things @@ -474,7 +474,7 @@ BuiltInFunctions::BuiltInFunctions() m_functions.insert(QLatin1String("FLOOR"), decl =3D new CeilingFloorFu= nctionDeclaration); /* floor(X) returns the largest integer value not greater than X. */ // See also https://dev.mysql.com/doc/refman/5.1/en/mathematical-funct= ions.html#function_floor - // See also http://www.postgresql.org/docs/9.5/static/functions-math.h= tml#FUNCTIONS-MATH-FUNC-TABLE + // See also https://www.postgresql.org/docs/9.5/static/functions-math.= html#FUNCTIONS-MATH-FUNC-TABLE // SQLite has no equivalent of floor() so this is used: // (CASE WHEN X >=3D 0 OR X =3D CAST(X AS INT) THEN CAST(X AS INT) ELS= E CAST(X AS INT) - 1 END) //! @todo add a custom function to SQLite to optimize/simplify things @@ -500,7 +500,7 @@ BuiltInFunctions::BuiltInFunctions() // For pgsql GREATEST() function ignores NULL values, it only returns = NULL // if all the expressions evaluate to NULL. So this is used for MAX(v0= ,..,vN): // (CASE WHEN (v0) IS NULL OR .. OR (vN) IS NULL THEN NULL ELSE GREATE= ST(v0,..,vN) END) - // See also http://www.postgresql.org/docs/9.5/static/functions-condit= ional.html#FUNCTIONS-GREATEST-LEAST + // See also https://www.postgresql.org/docs/9.5/static/functions-condi= tional.html#FUNCTIONS-GREATEST-LEAST //! @todo for pgsql CREATE FUNCTION can be used to speed up and simpli= fy things // For mysql GREATEST() is used. // See https://dev.mysql.com/doc/refman/5.1/en/comparison-operators.ht= ml#function_greatest @@ -520,7 +520,7 @@ BuiltInFunctions::BuiltInFunctions() /* The hex() function interprets its argument as a BLOB and returns a = string which is the upper-case hexadecimal rendering of the content of that blob. */ /* For pgsql UPPER(ENCODE(val, 'hex')) is used, - See http://www.postgresql.org/docs/9.5/static/functions-string.html= #FUNCTIONS-STRING-OTHER */ + See https://www.postgresql.org/docs/9.5/static/functions-string.htm= l#FUNCTIONS-STRING-OTHER */ // example: SELECT HEX(X'BEEF'), HEX('DEAD') // result: "BEEF", "44454144" //! @todo HEX(int) for SQLite is not the same as HEX(int) for MySQL so= we disable it @@ -546,7 +546,7 @@ BuiltInFunctions::BuiltInFunctions() interpreted as strings. If either X or Y are NULL in instr(X,Y) then = the result is NULL. */ //! @todo PostgreSQL does not have instr() but CREATE FUNCTION can be = used, - //! see http://www.postgresql.org/docs/9.5/static/plpgsql-portin= g.html + //! see https://www.postgresql.org/docs/9.5/static/plpgsql-porti= ng.html //! @todo support (BLOB, BLOB)? /* From the same docs: Or, if X and Y are both BLOBs, then instr(X,Y) returns one more than = the number bytes @@ -570,7 +570,7 @@ BuiltInFunctions::BuiltInFunctions() // For pgsql LEAST() function ignores NULL values, it only returns NULL // if all the expressions evaluate to NULL. So this is used for MAX(v0= ,..,vN): // (CASE WHEN (v0) IS NULL OR .. OR (vN) IS NULL THEN NULL ELSE LEAST(= v0,..,vN) END) - // See also http://www.postgresql.org/docs/9.5/static/functions-condit= ional.html#FUNCTIONS-GREATEST-LEAST + // See also https://www.postgresql.org/docs/9.5/static/functions-condi= tional.html#FUNCTIONS-GREATEST-LEAST //! @todo for pgsql CREATE FUNCTION can be used to speed up and simpli= fy things // For mysql LEAST() is used. // See https://dev.mysql.com/doc/refman/5.1/en/comparison-operators.ht= ml#function_least @@ -610,7 +610,7 @@ BuiltInFunctions::BuiltInFunctions() // Note: SQLite such as 3.8 without ICU extension does not convert non= -latin1 characters // too well; Kexi uses ICU extension by default so the results are ver= y good. // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.h= tml#function_lower - // See also http://www.postgresql.org/docs/9.5/static/functions-string= .html#FUNCTIONS-STRING-SQL + // See also https://www.postgresql.org/docs/9.5/static/functions-strin= g.html#FUNCTIONS-STRING-SQL // example: SELECT LOWER("MEGSZENTS=C3=89GTELEN=C3=8DTHETETLENS=C3=89G= ESKED=C3=89SEITEK=C3=89RT") // result: "megszents=C3=A9gtelen=C3=ADthetetlens=C3=A9gesked=C3=A9sei= tek=C3=A9rt" decl->defaultReturnType =3D KDbField::LongText; @@ -624,7 +624,7 @@ BuiltInFunctions::BuiltInFunctions() // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.h= tml#function_ltrim //! @todo MySQL's LTRIM only supports one arg. TRIM() does not work too //! https://dev.mysql.com/doc/refman/5.1/en/string-functions.html#func= tion_trim - // See also http://www.postgresql.org/docs/9.5/static/functions-string= .html#FUNCTIONS-STRING-SQL + // See also https://www.postgresql.org/docs/9.5/static/functions-strin= g.html#FUNCTIONS-STRING-SQL // example: SELECT LTRIM(" John Smith") // result: "John Smith" // example: SELECT LTRIM("a b or c", "ab ") @@ -641,7 +641,7 @@ BuiltInFunctions::BuiltInFunctions() uses that collating function for all string comparisons. If neither a= rgument to nullif() defines a collating function then the BINARY is used. */ // See also https://dev.mysql.com/doc/refman/5.1/en/control-flow-funct= ions.html#function_nullif - // See also http://www.postgresql.org/docs/9.5/static/functions-condit= ional.html#FUNCTIONS-NULLIF + // See also https://www.postgresql.org/docs/9.5/static/functions-condi= tional.html#FUNCTIONS-NULLIF // example: SELECT NULLIF("John", "Smith"), NULLIF(177, 177) // result: "John", NULL decl->copyReturnTypeFromArg =3D 0; @@ -660,7 +660,7 @@ BuiltInFunctions::BuiltInFunctions() // Similarly, RANDOM(X,Y) for SQLite is equal // to (X + CAST((Y - X) * (RANDOM()+9223372036854775807)/1844674407370= 9551615 AS INT)). // See also https://dev.mysql.com/doc/refman/5.1/en/mathematical-funct= ions.html#function_rand - // See also http://www.postgresql.org/docs/9.5/static/functions-math.h= tml#FUNCTIONS-MATH-RANDOM-TABLE + // See also https://www.postgresql.org/docs/9.5/static/functions-math.= html#FUNCTIONS-MATH-RANDOM-TABLE //! @note rand(X) (where X is a seed value to set) isn't portable betw= een MySQL and PostgreSQL, //! and does not exist in SQLite, so we don't support it. // example: SELECT RANDOM(), RANDOM(2, 5) @@ -676,7 +676,7 @@ BuiltInFunctions::BuiltInFunctions() /* The round(X,Y) function returns a floating-point value X rounded to= Y digits to the right of the decimal point. If the Y argument is omitted, it is assum= ed to be 0. */ // See also https://dev.mysql.com/doc/refman/5.1/en/mathematical-funct= ions.html#function_round - // See also http://www.postgresql.org/docs/9.5/static/functions-math.h= tml#FUNCTIONS-MATH-FUNC-TABLE + // See also https://www.postgresql.org/docs/9.5/static/functions-math.= html#FUNCTIONS-MATH-FUNC-TABLE //! @note round(X,Y) where Y < 0 is supported only by MySQL so we igno= re this case // example: SELECT ROUND(-1.13), ROUND(-5.51), ROUND(5.51), ROUND(1.29= 8, 1), ROUND(1.298, 0), ROUND(7) // result: -1, -6, 6, 1.3, 1, 7 @@ -692,7 +692,7 @@ BuiltInFunctions::BuiltInFunctions() // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.h= tml#function_ltrim //! @todo MySQL's RTRIM only supports one arg. TRIM() does not work too //! https://dev.mysql.com/doc/refman/5.1/en/string-functions.html#func= tion_trim - // See also http://www.postgresql.org/docs/9.5/static/functions-string= .html#FUNCTIONS-STRING-SQL + // See also https://www.postgresql.org/docs/9.5/static/functions-strin= g.html#FUNCTIONS-STRING-SQL // example: SELECT RTRIM("John Smith ") // result: "John Smith" // example: SELECT RTRIM("a b or c", "orc ") @@ -707,7 +707,7 @@ BuiltInFunctions::BuiltInFunctions() X. The string "?000" is returned if the argument is NULL or contains = non-ASCII alphabetic characters. */ // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.h= tml#function_soundex - // See also http://www.postgresql.org/docs/9.5/static/fuzzystrmatch.ht= ml#AEN165853 + // See also https://www.postgresql.org/docs/9.5/static/fuzzystrmatch.h= tml#AEN165853 //! @todo we call drv_executeSql("CREATE EXTENSION IF NOT EXISTS fuzzy= strmatch") on connection, //! do that on first use of SOUNDEX() // example: SELECT SOUNDEX("John") @@ -737,7 +737,7 @@ BuiltInFunctions::BuiltInFunctions() // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.= html#function_trim //! @todo MySQL's TRIM only supports one arg. TRIM() does not work too //! https://dev.mysql.com/doc/refman/5.1/en/string-functions.html#fun= ction_trim - // See also http://www.postgresql.org/docs/9.5/static/functions-strin= g.html#FUNCTIONS-STRING-SQL + // See also https://www.postgresql.org/docs/9.5/static/functions-stri= ng.html#FUNCTIONS-STRING-SQL // example: SELECT TRIM(" John Smith ") // result: "John Smith" // example: SELECT TRIM("a b or c", "orca ") @@ -765,7 +765,7 @@ BuiltInFunctions::BuiltInFunctions() // Note: SQLite such as 3.8 without ICU extension does not convert no= n-latin1 characters // too well; Kexi uses ICU extension by default so the results are ve= ry good. // See also https://dev.mysql.com/doc/refman/5.1/en/string-functions.= html#function_upper - // See also http://www.postgresql.org/docs/9.5/static/functions-strin= g.html#FUNCTIONS-STRING-SQL + // See also https://www.postgresql.org/docs/9.5/static/functions-stri= ng.html#FUNCTIONS-STRING-SQL // example: SELECT UPPER("megszents=C3=A9gtelen=C3=ADthetetlens=C3=A9= gesked=C3=A9seitek=C3=A9rt") // result: "MEGSZENTS=C3=89GTELEN=C3=8DTHETETLENS=C3=89GESKED=C3=89SE= ITEK=C3=89RT" decl->defaultReturnType =3D KDbField::LongText; diff --git a/src/parser/KDbSqlParser.y b/src/parser/KDbSqlParser.y index ccf7b587..6b46791f 100644 --- a/src/parser/KDbSqlParser.y +++ b/src/parser/KDbSqlParser.y @@ -762,7 +762,7 @@ WHERE aExpr } ; = -/* todo: support "ORDER BY NULL" as described here http://dev.mysql.com/do= c/refman/5.1/en/select.html */ +/* todo: support "ORDER BY NULL" as described here https://dev.mysql.com/d= oc/refman/5.1/en/select.html */ /* todo: accept expr and position as well */ OrderByClause: OrderByColumnId diff --git a/src/parser/generated/sqlparser.cpp b/src/parser/generated/sqlp= arser.cpp index e40b2cc8..f4e46d8d 100644 --- a/src/parser/generated/sqlparser.cpp +++ b/src/parser/generated/sqlparser.cpp @@ -15,7 +15,7 @@ GNU General Public License for more details. = You should have received a copy of the GNU General Public License - along with this program. If not, see . = */ + along with this program. If not, see . = */ = /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work diff --git a/src/parser/generated/sqlparser.h b/src/parser/generated/sqlpar= ser.h index f91291a6..3fa92ed2 100644 --- a/src/parser/generated/sqlparser.h +++ b/src/parser/generated/sqlparser.h @@ -29,7 +29,7 @@ struct SelectOptionsInternal; GNU General Public License for more details. = You should have received a copy of the GNU General Public License - along with this program. If not, see . = */ + along with this program. If not, see . = */ = /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work diff --git a/src/tools/KDbJsonTrader_p.h b/src/tools/KDbJsonTrader_p.h index 2e0093ce..24ffd6c9 100644 --- a/src/tools/KDbJsonTrader_p.h +++ b/src/tools/KDbJsonTrader_p.h @@ -55,7 +55,7 @@ public: * get all services of the given @p servicetype. * * @return A list of QPluginLoader that satisfy the query - * @see http://techbase.kde.org/Development/Tutorials/Services/Traders= #The_KTrader_Query_Language + * @see https://techbase.kde.org/Development/Tutorials/Services/Trader= s#The_KTrader_Query_Language * * @note Ownership of the QPluginLoader objects is transferred to the = caller. */ diff --git a/tools/sdc.py b/tools/sdc.py index c129a5f9..70f386ee 100755 --- a/tools/sdc.py +++ b/tools/sdc.py @@ -766,13 +766,13 @@ def process(): write(outfile, """/*! @note objects of this class are expl= icitly shared, what means they behave like regular C++ pointers, except that by doing reference counting and not de= leting the shared data object until the reference count is 0, they avoid the dangl= ing pointer problem. - See Qt documentation. + See Qt documentation. */ """) else: write(outfile, """/*! @note objects of this class are impl= icitly shared, what means they have value semantics by offering copy-on-write behaviour to maximize resource usage a= nd minimize copying. - Only a pointer to the data is passed around. See Qt documentation. + Only a pointer to the data is passed around. See Qt documentation. */ """) = diff --git a/tools/test_coverage.sh b/tools/test_coverage.sh index ea654988..0a767e61 100755 --- a/tools/test_coverage.sh +++ b/tools/test_coverage.sh @@ -1,6 +1,6 @@ #!/bin/bash = -# Inspiration from http://itk.org/gitweb?p=3DITK.git;a=3Dblob;f=3DUtilitie= s/Maintenance/computeCodeCoverageLocally.sh;h=3D539e6c62c2dc2ba9f7c16b91512= 0915fe192f67a;hb=3DHEAD +# Inspiration from https://itk.org/gitweb?p=3DITK.git;a=3Dblob;f=3DUtiliti= es/Maintenance/computeCodeCoverageLocally.sh;h=3D539e6c62c2dc2ba9f7c16b9151= 20915fe192f67a;hb=3DHEAD = CMAKE_BINARY_DIR=3D`grep ^CMAKE_BINARY_DIR Makefile | sed 's/.*\=3D //'` CMAKE_SOURCE_DIR=3D`grep ^CMAKE_SOURCE_DIR Makefile | sed 's/.*\=3D //'` diff --git a/tools/update_recommended_sqlite_ver.sh b/tools/update_recommen= ded_sqlite_ver.sh index f80f74bc..ba8c2f6c 100755 --- a/tools/update_recommended_sqlite_ver.sh +++ b/tools/update_recommended_sqlite_ver.sh @@ -3,7 +3,7 @@ set -e = $(git diff --quiet && git diff --cached --quiet) || (echo "There are repo = changes, giving up."; exit 1) = -ver=3D`curl -s http://sqlite.org/news.html | grep '

.* - R= elease ' | \ +ver=3D`curl -s https://sqlite.org/news.html | grep '

.* - = Release ' | \ sed -e 's/.* - Release \(.*\)<\/.*/\1/' | sort -r | head -n1` file=3Dsrc/drivers/CMakeLists.txt perl -pi -e "s/^set\(SQLITE_RECOMMENDED_VERSION.*/set\(SQLITE_RECOMMENDED_= VERSION $ver\)/" $file