Skip to content

Instantly share code, notes, and snippets.

@doctrinebot
Created December 13, 2015 18:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save doctrinebot/4ff43162e76ad99995a0 to your computer and use it in GitHub Desktop.
Save doctrinebot/4ff43162e76ad99995a0 to your computer and use it in GitHub Desktop.
Attachments to Doctrine Jira Issue DDC-1720 - https://github.com/doctrine/doctrine2/issues/2370
# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: C:\Workspaces\MedAdvisor\vendor\doctrine\lib\Doctrine\ORM\Query
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: SqlWalker.php
--- SqlWalker.php Base (BASE)
+++ SqlWalker.php Locally Modified (Based On LOCAL)
@@ -43,62 +43,62 @@
/**
* @var ResultSetMapping
*/
- private $_rsm;
+ protected $_rsm;
/** Counters for generating unique column aliases, table aliases and parameter indexes. */
- private $_aliasCounter = 0;
- private $_tableAliasCounter = 0;
- private $_scalarResultCounter = 1;
- private $_sqlParamIndex = 0;
+ protected $_aliasCounter = 0;
+ protected $_tableAliasCounter = 0;
+ protected $_scalarResultCounter = 1;
+ protected $_sqlParamIndex = 0;
/**
* @var ParserResult
*/
- private $_parserResult;
+ protected $_parserResult;
/**
* @var EntityManager
*/
- private $_em;
+ protected $_em;
/**
* @var \Doctrine\DBAL\Connection
*/
- private $_conn;
+ protected $_conn;
/**
* @var AbstractQuery
*/
- private $_query;
+ protected $_query;
- private $_tableAliasMap = array();
+ protected $_tableAliasMap = array();
/** Map from result variable names to their SQL column alias names. */
- private $_scalarResultAliasMap = array();
+ protected $_scalarResultAliasMap = array();
/** Map of all components/classes that appear in the DQL query. */
- private $_queryComponents;
+ protected $_queryComponents;
/** A list of classes that appear in non-scalar SelectExpressions. */
- private $_selectedClasses = array();
+ protected $_selectedClasses = array();
/**
* The DQL alias of the root class of the currently traversed query.
*/
- private $_rootAliases = array();
+ protected $_rootAliases = array();
/**
* Flag that indicates whether to generate SQL table aliases in the SQL.
* These should only be generated for SELECT queries, not for UPDATE/DELETE.
*/
- private $_useSqlTableAliases = true;
+ protected $_useSqlTableAliases = true;
/**
* The database platform abstraction.
*
* @var AbstractPlatform
*/
- private $_platform;
+ protected $_platform;
/**
* {@inheritDoc}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment