From 957b4e566a91ff15a2497ba111b2507212505a79 Mon Sep 17 00:00:00 2001
From: Val Bancer <valerij.bancer@gmail.com>
Date: Sat, 25 Aug 2018 22:39:26 +0200
Subject: [PATCH] Move declaration of $map to DboSource

---
 lib/Cake/Model/Datasource/Database/Mysql.php     | 7 -------
 lib/Cake/Model/Datasource/Database/Postgres.php  | 7 -------
 lib/Cake/Model/Datasource/Database/Sqlite.php    | 7 -------
 lib/Cake/Model/Datasource/Database/Sqlserver.php | 7 -------
 lib/Cake/Model/Datasource/DboSource.php          | 7 +++++++
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/lib/Cake/Model/Datasource/Database/Mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
index b228f61a2..e2b164492 100644
--- a/lib/Cake/Model/Datasource/Database/Mysql.php
+++ b/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -141,13 +141,6 @@ class Mysql extends DboSource {
  */
 	protected $_charsets = array();
 
-/**
- * Map of the columns contained in a result.
- *
- * @var array
- */
-	public $map;
-
 /**
  * Connects to the database using options in the given configuration array.
  *
diff --git a/lib/Cake/Model/Datasource/Database/Postgres.php b/lib/Cake/Model/Datasource/Database/Postgres.php
index 4f48304a5..2bf200fee 100644
--- a/lib/Cake/Model/Datasource/Database/Postgres.php
+++ b/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -104,13 +104,6 @@ class Postgres extends DboSource {
  */
 	protected $_sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', '~', '~\*', '\!~', '\!~\*', 'similar to');
 
-/**
- * Map of the columns contained in a result.
- *
- * @var array
- */
-	public $map;
-
 /**
  * Connects to the database using options in the given configuration array.
  *
diff --git a/lib/Cake/Model/Datasource/Database/Sqlite.php b/lib/Cake/Model/Datasource/Database/Sqlite.php
index 221c18f05..2cf39c356 100644
--- a/lib/Cake/Model/Datasource/Database/Sqlite.php
+++ b/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -102,13 +102,6 @@ class Sqlite extends DboSource {
 		),
 	);
 
-/**
- * Map of the columns contained in a result.
- *
- * @var array
- */
-	public $map;
-
 /**
  * Connects to the database using config['database'] as a filename.
  *
diff --git a/lib/Cake/Model/Datasource/Database/Sqlserver.php b/lib/Cake/Model/Datasource/Database/Sqlserver.php
index 81b40feda..c25934409 100644
--- a/lib/Cake/Model/Datasource/Database/Sqlserver.php
+++ b/lib/Cake/Model/Datasource/Database/Sqlserver.php
@@ -106,13 +106,6 @@ class Sqlserver extends DboSource {
 		'boolean' => array('name' => 'bit')
 	);
 
-/**
- * Map of the columns contained in a result.
- *
- * @var array
- */
-	public $map;
-
 /**
  * Magic column name used to provide pagination support for SQLServer 2008
  * which lacks proper limit/offset support.
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index cc59edbb3..948933dd4 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -247,6 +247,13 @@ class DboSource extends DataSource {
  */
 	protected $_methodCacheChange = false;
 
+/**
+ * Map of the columns contained in a result.
+ *
+ * @var array
+ */
+	public $map;
+
 /**
  * Constructor
  *