From 0244c8037a914283e176b0ebfeab9ecccec128b7 Mon Sep 17 00:00:00 2001 From: "phosco@gmx.de" Date: Tue, 15 Apr 2014 07:56:23 +0000 Subject: [PATCH] MOV: files into subnamespaces git-svn-id: https://php-sql-parser.googlecode.com/svn/trunk@1311 44dcfd11-89b7-3d55-2063-5c365055f77f --- .../org.eclipse.ltk.core.refactoring.prefs | 3 ++ .settings/org.eclipse.php.core.prefs | 4 ++- ...debug.core.Debug_Process_Preferences.prefs | 9 ++++++ .../processors/AbstractProcessor.php | 28 ++++++++++--------- .../processors/BracketProcessor.php | 11 +++++--- .../processors/ColumnDefinitionProcessor.php | 0 .../processors/ColumnListProcessor.php | 0 .../processors/CreateDefinitionProcessor.php | 0 .../processors/CreateProcessor.php | 0 .../processors/DefaultProcessor.php | 0 .../processors/DeleteProcessor.php | 0 .../processors/DescProcessor.php | 0 .../processors/DescribeProcessor.php | 0 .../processors/DropProcessor.php | 0 .../processors/DuplicateProcessor.php | 0 .../processors/ExplainProcessor.php | 0 .../processors/ExpressionListProcessor.php | 0 .../processors/FromProcessor.php | 0 .../processors/GroupByProcessor.php | 0 .../processors/HavingProcessor.php | 0 .../processors/IndexColumnListProcessor.php | 0 .../processors/IndexProcessor.php | 0 .../processors/InsertProcessor.php | 0 .../processors/IntoProcessor.php | 0 .../processors/LimitProcessor.php | 0 .../processors/OptionsProcessor.php | 0 .../processors/OrderByProcessor.php | 0 .../PartitionDefinitionProcessor.php | 0 .../processors/PartitionOptionsProcessor.php | 0 .../processors/RecordProcessor.php | 0 .../ReferenceDefinitionProcessor.php | 0 .../processors/RenameProcessor.php | 0 .../processors/ReplaceProcessor.php | 0 .../processors/SQLChunkProcessor.php | 0 .../processors/SQLProcessor.php | 0 .../processors/SelectExpressionProcessor.php | 0 .../processors/SelectProcessor.php | 0 .../processors/SetProcessor.php | 0 .../processors/ShowProcessor.php | 0 .../SubpartitionDefinitionProcessor.php | 0 .../processors/TableProcessor.php | 0 .../processors/UnionProcessor.php | 0 .../processors/UpdateProcessor.php | 0 .../processors/UsingProcessor.php | 0 .../processors/ValuesProcessor.php | 0 .../processors/WhereProcessor.php | 0 46 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs create mode 100644 .settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs rename src/{ => PHPSQLParser}/processors/AbstractProcessor.php (91%) rename src/{ => PHPSQLParser}/processors/BracketProcessor.php (87%) rename src/{ => PHPSQLParser}/processors/ColumnDefinitionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ColumnListProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/CreateDefinitionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/CreateProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DefaultProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DeleteProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DescProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DescribeProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DropProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/DuplicateProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ExplainProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ExpressionListProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/FromProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/GroupByProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/HavingProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/IndexColumnListProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/IndexProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/InsertProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/IntoProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/LimitProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/OptionsProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/OrderByProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/PartitionDefinitionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/PartitionOptionsProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/RecordProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ReferenceDefinitionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/RenameProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ReplaceProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SQLChunkProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SQLProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SelectExpressionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SelectProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SetProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ShowProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/SubpartitionDefinitionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/TableProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/UnionProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/UpdateProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/UsingProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/ValuesProcessor.php (100%) rename src/{ => PHPSQLParser}/processors/WhereProcessor.php (100%) diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..7b5628a0 --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,3 @@ +#Tue Apr 15 09:40:02 CEST 2014 +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs index 34700d2a..a5750920 100644 --- a/.settings/org.eclipse.php.core.prefs +++ b/.settings/org.eclipse.php.core.prefs @@ -1,4 +1,6 @@ -#Mon Dec 16 10:31:31 CET 2013 +#Tue Apr 15 09:40:02 CEST 2014 eclipse.preferences.version=1 include_path=0;/PHP-SQL-Parser org.eclipse.php.core.phpDoc=false +phpVersion=php5.3 +useShortTags=true diff --git a/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs b/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs new file mode 100644 index 00000000..9c260028 --- /dev/null +++ b/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs @@ -0,0 +1,9 @@ +#Tue Apr 15 09:40:02 CEST 2014 +DefaultProjectBasePath=/PHP-SQL-Parser +eclipse.preferences.version=1 +org.eclipse.php.debug.core.use-project-settings=true +org.eclipse.php.debug.coredefaultPHP=PHP 5.3.2 (CGI) +org.eclipse.php.debug.coreoutput_encoding=UTF-8 +org.eclipse.php.debug.corephp_debugger_id=org.eclipse.php.debug.core.zendDebugger +org.eclipse.php.debug.corestop_at_first_line_string=true +org.eclipse.php.debug.coretransfer_encoding=UTF-8 diff --git a/src/processors/AbstractProcessor.php b/src/PHPSQLParser/processors/AbstractProcessor.php similarity index 91% rename from src/processors/AbstractProcessor.php rename to src/PHPSQLParser/processors/AbstractProcessor.php index 8aa4d2bc..f9899420 100644 --- a/src/processors/AbstractProcessor.php +++ b/src/PHPSQLParser/processors/AbstractProcessor.php @@ -39,6 +39,8 @@ * */ +namespace PHPSQLParser\processors; + require_once dirname(__FILE__) . '/../utils/ExpressionType.php'; require_once dirname(__FILE__) . '/../lexer/PHPSQLLexer.php'; @@ -62,7 +64,7 @@ public abstract function process($tokens); * tokens for the SQL processor */ public function splitSQLIntoTokens($sql) { - $lexer = new PHPSQLLexer(); + $lexer = new PHPSQLParser\lexer\PHPSQLLexer(); return $lexer->split($sql); } @@ -201,14 +203,14 @@ protected function getVariableType($expression) { switch ($type) { case 'GLOBAL': - $type = ExpressionType::GLOBAL_VARIABLE; + $type = PHPSQLParser\utils\ExpressionType::GLOBAL_VARIABLE; break; case 'LOCAL': - $type = ExpressionType::LOCAL_VARIABLE; + $type = PHPSQLParser\utils\ExpressionType::LOCAL_VARIABLE; break; case 'SESSION': default: - $type = ExpressionType::SESSION_VARIABLE; + $type = PHPSQLParser\utils\ExpressionType::SESSION_VARIABLE; break; } return $type; @@ -228,39 +230,39 @@ protected function isCommentToken($token) { } protected function isColumnReference($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::COLREF); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::COLREF); } protected function isReserved($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::RESERVED); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::RESERVED); } protected function isConstant($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::CONSTANT); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::CONSTANT); } protected function isAggregateFunction($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::AGGREGATE_FUNCTION); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::AGGREGATE_FUNCTION); } protected function isCustomFunction($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::CUSTOM_FUNCTION); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::CUSTOM_FUNCTION); } protected function isFunction($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::SIMPLE_FUNCTION); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::SIMPLE_FUNCTION); } protected function isExpression($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::EXPRESSION); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::EXPRESSION); } protected function isBracketExpression($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::BRACKET_EXPRESSION); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::BRACKET_EXPRESSION); } protected function isSubQuery($out) { - return (isset($out['expr_type']) && $out['expr_type'] === ExpressionType::SUBQUERY); + return (isset($out['expr_type']) && $out['expr_type'] === PHPSQLParser\utils\ExpressionType::SUBQUERY); } /** diff --git a/src/processors/BracketProcessor.php b/src/PHPSQLParser/processors/BracketProcessor.php similarity index 87% rename from src/processors/BracketProcessor.php rename to src/PHPSQLParser/processors/BracketProcessor.php index 2f31a8d4..5f71c9d7 100644 --- a/src/processors/BracketProcessor.php +++ b/src/PHPSQLParser/processors/BracketProcessor.php @@ -39,6 +39,7 @@ * */ +namespace PHPSQLParser\processors; require_once dirname(__FILE__) . '/../utils/ExpressionType.php'; require_once dirname(__FILE__) . '/DefaultProcessor.php'; require_once dirname(__FILE__) . '/AbstractProcessor.php'; @@ -56,7 +57,7 @@ protected function processTopLevel($sql) { $processor = new DefaultProcessor(); return $processor->process($sql); } - + public function process($tokens) { $token = $this->removeParenthesisFromStart($tokens[0]); @@ -68,12 +69,14 @@ public function process($tokens) { } if (isset($subtree['SELECT'])) { - $subtree = array(array('expr_type' => ExpressionType::QUERY, 'base_expr' => $token, 'sub_tree' => $subtree)); + $subtree = array( + array('expr_type' => PHPSQLParser\utils\ExpressionType::QUERY, 'base_expr' => $token, + 'sub_tree' => $subtree)); } return array( - array('expr_type' => ExpressionType::BRACKET_EXPRESSION, 'base_expr' => trim($tokens[0]), - 'sub_tree' => $subtree)); + array('expr_type' => PHPSQLParser\utils\ExpressionType::BRACKET_EXPRESSION, + 'base_expr' => trim($tokens[0]), 'sub_tree' => $subtree)); } } diff --git a/src/processors/ColumnDefinitionProcessor.php b/src/PHPSQLParser/processors/ColumnDefinitionProcessor.php similarity index 100% rename from src/processors/ColumnDefinitionProcessor.php rename to src/PHPSQLParser/processors/ColumnDefinitionProcessor.php diff --git a/src/processors/ColumnListProcessor.php b/src/PHPSQLParser/processors/ColumnListProcessor.php similarity index 100% rename from src/processors/ColumnListProcessor.php rename to src/PHPSQLParser/processors/ColumnListProcessor.php diff --git a/src/processors/CreateDefinitionProcessor.php b/src/PHPSQLParser/processors/CreateDefinitionProcessor.php similarity index 100% rename from src/processors/CreateDefinitionProcessor.php rename to src/PHPSQLParser/processors/CreateDefinitionProcessor.php diff --git a/src/processors/CreateProcessor.php b/src/PHPSQLParser/processors/CreateProcessor.php similarity index 100% rename from src/processors/CreateProcessor.php rename to src/PHPSQLParser/processors/CreateProcessor.php diff --git a/src/processors/DefaultProcessor.php b/src/PHPSQLParser/processors/DefaultProcessor.php similarity index 100% rename from src/processors/DefaultProcessor.php rename to src/PHPSQLParser/processors/DefaultProcessor.php diff --git a/src/processors/DeleteProcessor.php b/src/PHPSQLParser/processors/DeleteProcessor.php similarity index 100% rename from src/processors/DeleteProcessor.php rename to src/PHPSQLParser/processors/DeleteProcessor.php diff --git a/src/processors/DescProcessor.php b/src/PHPSQLParser/processors/DescProcessor.php similarity index 100% rename from src/processors/DescProcessor.php rename to src/PHPSQLParser/processors/DescProcessor.php diff --git a/src/processors/DescribeProcessor.php b/src/PHPSQLParser/processors/DescribeProcessor.php similarity index 100% rename from src/processors/DescribeProcessor.php rename to src/PHPSQLParser/processors/DescribeProcessor.php diff --git a/src/processors/DropProcessor.php b/src/PHPSQLParser/processors/DropProcessor.php similarity index 100% rename from src/processors/DropProcessor.php rename to src/PHPSQLParser/processors/DropProcessor.php diff --git a/src/processors/DuplicateProcessor.php b/src/PHPSQLParser/processors/DuplicateProcessor.php similarity index 100% rename from src/processors/DuplicateProcessor.php rename to src/PHPSQLParser/processors/DuplicateProcessor.php diff --git a/src/processors/ExplainProcessor.php b/src/PHPSQLParser/processors/ExplainProcessor.php similarity index 100% rename from src/processors/ExplainProcessor.php rename to src/PHPSQLParser/processors/ExplainProcessor.php diff --git a/src/processors/ExpressionListProcessor.php b/src/PHPSQLParser/processors/ExpressionListProcessor.php similarity index 100% rename from src/processors/ExpressionListProcessor.php rename to src/PHPSQLParser/processors/ExpressionListProcessor.php diff --git a/src/processors/FromProcessor.php b/src/PHPSQLParser/processors/FromProcessor.php similarity index 100% rename from src/processors/FromProcessor.php rename to src/PHPSQLParser/processors/FromProcessor.php diff --git a/src/processors/GroupByProcessor.php b/src/PHPSQLParser/processors/GroupByProcessor.php similarity index 100% rename from src/processors/GroupByProcessor.php rename to src/PHPSQLParser/processors/GroupByProcessor.php diff --git a/src/processors/HavingProcessor.php b/src/PHPSQLParser/processors/HavingProcessor.php similarity index 100% rename from src/processors/HavingProcessor.php rename to src/PHPSQLParser/processors/HavingProcessor.php diff --git a/src/processors/IndexColumnListProcessor.php b/src/PHPSQLParser/processors/IndexColumnListProcessor.php similarity index 100% rename from src/processors/IndexColumnListProcessor.php rename to src/PHPSQLParser/processors/IndexColumnListProcessor.php diff --git a/src/processors/IndexProcessor.php b/src/PHPSQLParser/processors/IndexProcessor.php similarity index 100% rename from src/processors/IndexProcessor.php rename to src/PHPSQLParser/processors/IndexProcessor.php diff --git a/src/processors/InsertProcessor.php b/src/PHPSQLParser/processors/InsertProcessor.php similarity index 100% rename from src/processors/InsertProcessor.php rename to src/PHPSQLParser/processors/InsertProcessor.php diff --git a/src/processors/IntoProcessor.php b/src/PHPSQLParser/processors/IntoProcessor.php similarity index 100% rename from src/processors/IntoProcessor.php rename to src/PHPSQLParser/processors/IntoProcessor.php diff --git a/src/processors/LimitProcessor.php b/src/PHPSQLParser/processors/LimitProcessor.php similarity index 100% rename from src/processors/LimitProcessor.php rename to src/PHPSQLParser/processors/LimitProcessor.php diff --git a/src/processors/OptionsProcessor.php b/src/PHPSQLParser/processors/OptionsProcessor.php similarity index 100% rename from src/processors/OptionsProcessor.php rename to src/PHPSQLParser/processors/OptionsProcessor.php diff --git a/src/processors/OrderByProcessor.php b/src/PHPSQLParser/processors/OrderByProcessor.php similarity index 100% rename from src/processors/OrderByProcessor.php rename to src/PHPSQLParser/processors/OrderByProcessor.php diff --git a/src/processors/PartitionDefinitionProcessor.php b/src/PHPSQLParser/processors/PartitionDefinitionProcessor.php similarity index 100% rename from src/processors/PartitionDefinitionProcessor.php rename to src/PHPSQLParser/processors/PartitionDefinitionProcessor.php diff --git a/src/processors/PartitionOptionsProcessor.php b/src/PHPSQLParser/processors/PartitionOptionsProcessor.php similarity index 100% rename from src/processors/PartitionOptionsProcessor.php rename to src/PHPSQLParser/processors/PartitionOptionsProcessor.php diff --git a/src/processors/RecordProcessor.php b/src/PHPSQLParser/processors/RecordProcessor.php similarity index 100% rename from src/processors/RecordProcessor.php rename to src/PHPSQLParser/processors/RecordProcessor.php diff --git a/src/processors/ReferenceDefinitionProcessor.php b/src/PHPSQLParser/processors/ReferenceDefinitionProcessor.php similarity index 100% rename from src/processors/ReferenceDefinitionProcessor.php rename to src/PHPSQLParser/processors/ReferenceDefinitionProcessor.php diff --git a/src/processors/RenameProcessor.php b/src/PHPSQLParser/processors/RenameProcessor.php similarity index 100% rename from src/processors/RenameProcessor.php rename to src/PHPSQLParser/processors/RenameProcessor.php diff --git a/src/processors/ReplaceProcessor.php b/src/PHPSQLParser/processors/ReplaceProcessor.php similarity index 100% rename from src/processors/ReplaceProcessor.php rename to src/PHPSQLParser/processors/ReplaceProcessor.php diff --git a/src/processors/SQLChunkProcessor.php b/src/PHPSQLParser/processors/SQLChunkProcessor.php similarity index 100% rename from src/processors/SQLChunkProcessor.php rename to src/PHPSQLParser/processors/SQLChunkProcessor.php diff --git a/src/processors/SQLProcessor.php b/src/PHPSQLParser/processors/SQLProcessor.php similarity index 100% rename from src/processors/SQLProcessor.php rename to src/PHPSQLParser/processors/SQLProcessor.php diff --git a/src/processors/SelectExpressionProcessor.php b/src/PHPSQLParser/processors/SelectExpressionProcessor.php similarity index 100% rename from src/processors/SelectExpressionProcessor.php rename to src/PHPSQLParser/processors/SelectExpressionProcessor.php diff --git a/src/processors/SelectProcessor.php b/src/PHPSQLParser/processors/SelectProcessor.php similarity index 100% rename from src/processors/SelectProcessor.php rename to src/PHPSQLParser/processors/SelectProcessor.php diff --git a/src/processors/SetProcessor.php b/src/PHPSQLParser/processors/SetProcessor.php similarity index 100% rename from src/processors/SetProcessor.php rename to src/PHPSQLParser/processors/SetProcessor.php diff --git a/src/processors/ShowProcessor.php b/src/PHPSQLParser/processors/ShowProcessor.php similarity index 100% rename from src/processors/ShowProcessor.php rename to src/PHPSQLParser/processors/ShowProcessor.php diff --git a/src/processors/SubpartitionDefinitionProcessor.php b/src/PHPSQLParser/processors/SubpartitionDefinitionProcessor.php similarity index 100% rename from src/processors/SubpartitionDefinitionProcessor.php rename to src/PHPSQLParser/processors/SubpartitionDefinitionProcessor.php diff --git a/src/processors/TableProcessor.php b/src/PHPSQLParser/processors/TableProcessor.php similarity index 100% rename from src/processors/TableProcessor.php rename to src/PHPSQLParser/processors/TableProcessor.php diff --git a/src/processors/UnionProcessor.php b/src/PHPSQLParser/processors/UnionProcessor.php similarity index 100% rename from src/processors/UnionProcessor.php rename to src/PHPSQLParser/processors/UnionProcessor.php diff --git a/src/processors/UpdateProcessor.php b/src/PHPSQLParser/processors/UpdateProcessor.php similarity index 100% rename from src/processors/UpdateProcessor.php rename to src/PHPSQLParser/processors/UpdateProcessor.php diff --git a/src/processors/UsingProcessor.php b/src/PHPSQLParser/processors/UsingProcessor.php similarity index 100% rename from src/processors/UsingProcessor.php rename to src/PHPSQLParser/processors/UsingProcessor.php diff --git a/src/processors/ValuesProcessor.php b/src/PHPSQLParser/processors/ValuesProcessor.php similarity index 100% rename from src/processors/ValuesProcessor.php rename to src/PHPSQLParser/processors/ValuesProcessor.php diff --git a/src/processors/WhereProcessor.php b/src/PHPSQLParser/processors/WhereProcessor.php similarity index 100% rename from src/processors/WhereProcessor.php rename to src/PHPSQLParser/processors/WhereProcessor.php