Merge pull request #3769 from michalsn/fix/sqlite_rand

Fix orderBy() random for SQLite3

system/Database/SQLite3/Builder.php

@@ -63,6 +63,15 @@ class Builder extends BaseBuilder
 	 */
 	protected $canLimitWhereUpdates = false;
 
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'RANDOM()',
+	];
+
 	/**
 	 * @var array
 	 */

system/Database/SQLite3/Connection.php

@@ -69,17 +69,6 @@ class Connection extends BaseConnection implements ConnectionInterface
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $_random_keyword = [
-		'RANDOM()',
-	];
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Connect to the database.
 	 *

tests/system/Database/Live/OrderTest.php

@@ -60,4 +60,24 @@ public function testMultipleOrderValues()
 
 	//--------------------------------------------------------------------
 
+	public function testOrderRandom()
+	{
+		$sql = $this->db->table('job')
+			->orderBy('name', 'random')
+			->getCompiledSelect();
+
+		$key = 'RANDOM()';
+
+		if ($this->db->DBDriver === 'MySQLi')
+		{
+			$key = 'RAND()';
+		}
+
+		$expected = 'SELECT * FROM ' . $this->db->protectIdentifiers('job', true) . ' ORDER BY ' . $key;
+
+		$this->assertEquals($expected, str_replace("\n", ' ', $sql));
+	}
+
+	//--------------------------------------------------------------------
+
 }