Merge pull request #10156 from dreamsxin/10143

Support for SELECT ALL/SELECT DISTINCT

Author: andresgutierrez

ext/phalcon/mvc/model/query/base.c

@@ -85,6 +85,7 @@ const phql_token_names phql_tokens[] =
   { SL("CAST"),          PHQL_T_CAST },
   { SL("CONVERT"),       PHQL_T_CONVERT },
   { SL("USING"),         PHQL_T_USING },
+  { SL("ALL"),           PHQL_T_ALL },
   { NULL, 0, 0 }
 };
 
@@ -458,6 +459,9 @@ int phql_internal_parse_phql(zval **result, char *phql, unsigned int phql_length
 			case PHQL_T_DISTINCT:
 				phql_(phql_parser, PHQL_DISTINCT, NULL, parser_status);
 				break;
+			case PHQL_T_ALL:
+				phql_(phql_parser, PHQL_ALL, NULL, parser_status);
+				break;
 			case PHQL_T_CAST:
 				phql_(phql_parser, PHQL_CAST, NULL, parser_status);
 				break;

ext/phalcon/mvc/model/query/parser.c

@@ -20,49 +20,50 @@
 #define PHQL_MINUS                          20
 #define PHQL_IS                             21
 #define PHQL_IN                             22
-#define PHQL_DISTINCT                       23
-#define PHQL_NOT                            24
-#define PHQL_BITWISE_NOT                    25
+#define PHQL_NOT                            23
+#define PHQL_BITWISE_NOT                    24
+#define PHQL_COMMA                          25
 #define PHQL_SELECT                         26
 #define PHQL_FROM                           27
-#define PHQL_COMMA                          28
-#define PHQL_IDENTIFIER                     29
-#define PHQL_DOT                            30
-#define PHQL_AS                             31
-#define PHQL_JOIN                           32
+#define PHQL_DISTINCT                       28
+#define PHQL_ALL                            29
+#define PHQL_IDENTIFIER                     30
+#define PHQL_DOT                            31
+#define PHQL_AS                             32
 #define PHQL_INNER                          33
-#define PHQL_CROSS                          34
-#define PHQL_LEFT                           35
-#define PHQL_OUTER                          36
-#define PHQL_RIGHT                          37
-#define PHQL_FULL                           38
-#define PHQL_ON                             39
-#define PHQL_INSERT                         40
-#define PHQL_INTO                           41
-#define PHQL_VALUES                         42
-#define PHQL_PARENTHESES_OPEN               43
-#define PHQL_PARENTHESES_CLOSE              44
-#define PHQL_UPDATE                         45
-#define PHQL_SET                            46
-#define PHQL_DELETE                         47
-#define PHQL_WHERE                          48
-#define PHQL_ORDER                          49
-#define PHQL_BY                             50
-#define PHQL_ASC                            51
-#define PHQL_DESC                           52
-#define PHQL_GROUP                          53
-#define PHQL_HAVING                         54
-#define PHQL_LIMIT                          55
-#define PHQL_OFFSET                         56
-#define PHQL_INTEGER                        57
-#define PHQL_NPLACEHOLDER                   58
-#define PHQL_SPLACEHOLDER                   59
-#define PHQL_CAST                           60
-#define PHQL_CONVERT                        61
-#define PHQL_USING                          62
-#define PHQL_NULL                           63
-#define PHQL_STRING                         64
-#define PHQL_DOUBLE                         65
-#define PHQL_TRUE                           66
-#define PHQL_FALSE                          67
-#define PHQL_COLON                          68
+#define PHQL_JOIN                           34
+#define PHQL_CROSS                          35
+#define PHQL_LEFT                           36
+#define PHQL_OUTER                          37
+#define PHQL_RIGHT                          38
+#define PHQL_FULL                           39
+#define PHQL_ON                             40
+#define PHQL_INSERT                         41
+#define PHQL_INTO                           42
+#define PHQL_VALUES                         43
+#define PHQL_PARENTHESES_OPEN               44
+#define PHQL_PARENTHESES_CLOSE              45
+#define PHQL_UPDATE                         46
+#define PHQL_SET                            47
+#define PHQL_DELETE                         48
+#define PHQL_WHERE                          49
+#define PHQL_ORDER                          50
+#define PHQL_BY                             51
+#define PHQL_ASC                            52
+#define PHQL_DESC                           53
+#define PHQL_GROUP                          54
+#define PHQL_HAVING                         55
+#define PHQL_LIMIT                          56
+#define PHQL_OFFSET                         57
+#define PHQL_INTEGER                        58
+#define PHQL_NPLACEHOLDER                   59
+#define PHQL_SPLACEHOLDER                   60
+#define PHQL_CAST                           61
+#define PHQL_CONVERT                        62
+#define PHQL_USING                          63
+#define PHQL_NULL                           64
+#define PHQL_STRING                         65
+#define PHQL_DOUBLE                         66
+#define PHQL_TRUE                           67
+#define PHQL_FALSE                          68
+#define PHQL_COLON                          69