Redo Merge tag 'v5.21.1'

# Conflicts:
#	adodb.inc.php
#	docs/changelog.md
#	drivers/adodb-mssqlnative.inc.php
#	drivers/adodb-mysqli.inc.php

Fixes #751

2 files changed, 72 insertions, 12 deletions

diff --git a/tests/LibTest.php b/tests/LibTest.php
new file mode 100644
index 00000000..2f02e00e
--- /dev/null
+++ b/tests/LibTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Tests cases for adodb-lib.inc.php
+ *
+ * This file is part of ADOdb, a Database Abstraction Layer library for PHP.
+ *
+ * @package ADOdb
+ * @link https://adodb.org Project's web site and documentation
+ * @link https://github.com/ADOdb/ADOdb Source code and issue tracker
+ *
+ * The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
+ * and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
+ * any later version. This means you can use it in proprietary products.
+ * See the LICENSE.md file distributed with this source code for details.
+ * @license BSD-3-Clause
+ * @license LGPL-2.1-or-later
+ *
+ * @copyright 2000-2013 John Lim
+ * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
+ */
+
+use PHPUnit\Framework\TestCase;
+
+require_once dirname(__FILE__) . '/../adodb.inc.php';
+require_once dirname(__FILE__) . '/../adodb-lib.inc.php';
+
+/**
+ * Class LibTest.
+ *
+ * Test cases for adodb-lib.inc.php
+ */
+class LibTest extends TestCase
+{
+	/** @var ADOConnection Database connection for tests */
+	private $db;
+
+	public function setUp(): void
+	{
+		$this->db = ADONewConnection('mysqli');
+	}
+
+	/**
+	 * Test for {@see _adodb_quote_fieldname()}
+	 *
+	 * @dataProvider quoteProvider
+	 */
+	public function testQuoteFieldNames($method, $field, $expected)
+	{
+		global $ADODB_QUOTE_FIELDNAMES;
+		$ADODB_QUOTE_FIELDNAMES = $method;
+		$this->assertSame($expected, _adodb_quote_fieldname($this->db, $field));
+	}
+
+	/**
+	 * Data provider for {@see testQuoteFieldNames()}
+	 * @return array
+	 */
+	public function quoteProvider()
+	{
+		return [
+			'No quoting, single-word field name' => [false, 'Field', 'FIELD'],
+			'No quoting, field name with space' => [false, 'Field Name', '`FIELD NAME`'],
+			'Quoting `true`' => [true, 'Field', '`FIELD`'],
+			'Quoting `UPPER`' => ['UPPER', 'Field', '`FIELD`'],
+			'Quoting `LOWER`' => ['LOWER', 'Field', '`field`'],
+			'Quoting `NATIVE`' => ['NATIVE', 'Field', '`Field`'],
+			'Quoting `BRACKETS`' => ['BRACKETS', 'Field', '[FIELD]'],
+			'Unknown value defaults to UPPER' => ['XXX', 'Field', '`FIELD`'],
+		];
+	}
+
+}
diff --git a/tests/testsessions.php b/tests/testsessions.php
index 634da61c..2eca41bb 100644
--- a/tests/testsessions.php
+++ b/tests/testsessions.php
@@ -19,18 +19,6 @@
  * @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
  */
 
-/*
-@version   v5.21.1-dev  Unreleased
-@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
-@copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-  Released under both BSD license and Lesser GPL library license.
-  Whenever there is any discrepancy between the two licenses,
-  the BSD license will take precedence.
-  Set tabs to 4 for best viewing.
-
-  Latest version is available at https://adodb.org/
-*/
-
 function NotifyExpire($ref,$key)
 {
 	print "<p><b>Notify Expiring=$ref, sessionkey=$key</b></p>";