@@ -12,10 +12,8 @@ |
||
| 12 | 12 | use POData\Providers\Metadata\ResourceTypeKind; |
| 13 | 13 | use POData\Providers\Metadata\ResourcePropertyKind; |
| 14 | 14 | use POData\Providers\Metadata\ResourceProperty; |
| 15 | -use POData\Providers\ProvidersWrapper; |
|
| 16 | 15 | use POData\Providers\Metadata\Type\Binary; |
| 17 | 16 | use POData\Providers\Metadata\Type\Boolean; |
| 18 | -use POData\Providers\Metadata\Type\StringType; |
|
| 19 | 17 | use POData\Providers\Metadata\Type\DateTime; |
| 20 | 18 | use POData\Common\ODataException; |
| 21 | 19 | use POData\Common\Messages; |
@@ -15,12 +15,10 @@ |
||
| 15 | 15 | use POData\Providers\Metadata\Type\SByte; |
| 16 | 16 | use POData\Providers\Metadata\Type\Single; |
| 17 | 17 | use POData\Providers\Metadata\Type\StringType; |
| 18 | -use POData\Providers\Metadata\Type\TypeCode; |
|
| 19 | 18 | use POData\Providers\Metadata\Type\EdmPrimitiveType; |
| 20 | 19 | use POData\Providers\Metadata\Type\IType; |
| 21 | 20 | use POData\Common\Messages; |
| 22 | 21 | use POData\Common\InvalidOperationException; |
| 23 | -use POData\Common; |
|
| 24 | 22 | |
| 25 | 23 | /** |
| 26 | 24 | * Class ResourceType |
@@ -826,102 +826,102 @@ |
||
| 826 | 826 | public static function getPrimitiveResourceType($typeCode) |
| 827 | 827 | { |
| 828 | 828 | switch($typeCode) { |
| 829 | - case EdmPrimitiveType::BINARY: |
|
| 830 | - return new ResourceType( |
|
| 831 | - new Binary(), ResourceTypeKind::PRIMITIVE, |
|
| 832 | - 'Binary', 'Edm' |
|
| 833 | - ); |
|
| 834 | - break; |
|
| 835 | - case EdmPrimitiveType::BOOLEAN: |
|
| 836 | - return new ResourceType( |
|
| 837 | - new Boolean(), |
|
| 838 | - ResourceTypeKind::PRIMITIVE, |
|
| 839 | - 'Boolean', 'Edm' |
|
| 840 | - ); |
|
| 841 | - break; |
|
| 842 | - case EdmPrimitiveType::BYTE: |
|
| 843 | - return new ResourceType( |
|
| 844 | - new Byte(), |
|
| 845 | - ResourceTypeKind::PRIMITIVE, |
|
| 846 | - 'Byte', 'Edm' |
|
| 847 | - ); |
|
| 848 | - break; |
|
| 849 | - case EdmPrimitiveType::DATETIME: |
|
| 850 | - return new ResourceType( |
|
| 851 | - new DateTime(), |
|
| 852 | - ResourceTypeKind::PRIMITIVE, |
|
| 853 | - 'DateTime', 'Edm' |
|
| 854 | - ); |
|
| 855 | - break; |
|
| 856 | - case EdmPrimitiveType::DECIMAL: |
|
| 857 | - return new ResourceType( |
|
| 858 | - new Decimal(), |
|
| 859 | - ResourceTypeKind::PRIMITIVE, |
|
| 860 | - 'Decimal', 'Edm' |
|
| 861 | - ); |
|
| 862 | - break; |
|
| 863 | - case EdmPrimitiveType::DOUBLE: |
|
| 864 | - return new ResourceType( |
|
| 865 | - new Double(), |
|
| 866 | - ResourceTypeKind::PRIMITIVE, |
|
| 867 | - 'Double', 'Edm' |
|
| 868 | - ); |
|
| 869 | - break; |
|
| 870 | - case EdmPrimitiveType::GUID: |
|
| 871 | - return new ResourceType( |
|
| 872 | - new Guid(), |
|
| 873 | - ResourceTypeKind::PRIMITIVE, |
|
| 874 | - 'Guid', 'Edm' |
|
| 875 | - ); |
|
| 876 | - break; |
|
| 877 | - case EdmPrimitiveType::INT16: |
|
| 878 | - return new ResourceType( |
|
| 879 | - new Int16(), |
|
| 880 | - ResourceTypeKind::PRIMITIVE, |
|
| 881 | - 'Int16', 'Edm' |
|
| 882 | - ); |
|
| 883 | - break; |
|
| 884 | - case EdmPrimitiveType::INT32: |
|
| 885 | - return new ResourceType( |
|
| 886 | - new Int32(), |
|
| 887 | - ResourceTypeKind::PRIMITIVE, |
|
| 888 | - 'Int32', 'Edm' |
|
| 889 | - ); |
|
| 890 | - break; |
|
| 891 | - case EdmPrimitiveType::INT64: |
|
| 892 | - return new ResourceType( |
|
| 893 | - new Int64(), |
|
| 894 | - ResourceTypeKind::PRIMITIVE, |
|
| 895 | - 'Int64', 'Edm' |
|
| 896 | - ); |
|
| 897 | - break; |
|
| 898 | - case EdmPrimitiveType::SBYTE: |
|
| 899 | - return new ResourceType( |
|
| 900 | - new SByte(), |
|
| 901 | - ResourceTypeKind::PRIMITIVE, |
|
| 902 | - 'SByte', 'Edm' |
|
| 903 | - ); |
|
| 904 | - break; |
|
| 905 | - case EdmPrimitiveType::SINGLE: |
|
| 906 | - return new ResourceType( |
|
| 907 | - new Single(), |
|
| 908 | - ResourceTypeKind::PRIMITIVE, |
|
| 909 | - 'Single', 'Edm' |
|
| 910 | - ); |
|
| 911 | - break; |
|
| 912 | - case EdmPrimitiveType::STRING: |
|
| 913 | - return new ResourceType( |
|
| 914 | - new StringType(), |
|
| 915 | - ResourceTypeKind::PRIMITIVE, |
|
| 916 | - 'String', 'Edm' |
|
| 917 | - ); |
|
| 918 | - break; |
|
| 919 | - default: |
|
| 920 | - throw new \InvalidArgumentException( |
|
| 921 | - Messages::commonNotValidPrimitiveEDMType( |
|
| 922 | - '$typeCode', 'getPrimitiveResourceType' |
|
| 923 | - ) |
|
| 924 | - ); |
|
| 829 | + case EdmPrimitiveType::BINARY: |
|
| 830 | + return new ResourceType( |
|
| 831 | + new Binary(), ResourceTypeKind::PRIMITIVE, |
|
| 832 | + 'Binary', 'Edm' |
|
| 833 | + ); |
|
| 834 | + break; |
|
| 835 | + case EdmPrimitiveType::BOOLEAN: |
|
| 836 | + return new ResourceType( |
|
| 837 | + new Boolean(), |
|
| 838 | + ResourceTypeKind::PRIMITIVE, |
|
| 839 | + 'Boolean', 'Edm' |
|
| 840 | + ); |
|
| 841 | + break; |
|
| 842 | + case EdmPrimitiveType::BYTE: |
|
| 843 | + return new ResourceType( |
|
| 844 | + new Byte(), |
|
| 845 | + ResourceTypeKind::PRIMITIVE, |
|
| 846 | + 'Byte', 'Edm' |
|
| 847 | + ); |
|
| 848 | + break; |
|
| 849 | + case EdmPrimitiveType::DATETIME: |
|
| 850 | + return new ResourceType( |
|
| 851 | + new DateTime(), |
|
| 852 | + ResourceTypeKind::PRIMITIVE, |
|
| 853 | + 'DateTime', 'Edm' |
|
| 854 | + ); |
|
| 855 | + break; |
|
| 856 | + case EdmPrimitiveType::DECIMAL: |
|
| 857 | + return new ResourceType( |
|
| 858 | + new Decimal(), |
|
| 859 | + ResourceTypeKind::PRIMITIVE, |
|
| 860 | + 'Decimal', 'Edm' |
|
| 861 | + ); |
|
| 862 | + break; |
|
| 863 | + case EdmPrimitiveType::DOUBLE: |
|
| 864 | + return new ResourceType( |
|
| 865 | + new Double(), |
|
| 866 | + ResourceTypeKind::PRIMITIVE, |
|
| 867 | + 'Double', 'Edm' |
|
| 868 | + ); |
|
| 869 | + break; |
|
| 870 | + case EdmPrimitiveType::GUID: |
|
| 871 | + return new ResourceType( |
|
| 872 | + new Guid(), |
|
| 873 | + ResourceTypeKind::PRIMITIVE, |
|
| 874 | + 'Guid', 'Edm' |
|
| 875 | + ); |
|
| 876 | + break; |
|
| 877 | + case EdmPrimitiveType::INT16: |
|
| 878 | + return new ResourceType( |
|
| 879 | + new Int16(), |
|
| 880 | + ResourceTypeKind::PRIMITIVE, |
|
| 881 | + 'Int16', 'Edm' |
|
| 882 | + ); |
|
| 883 | + break; |
|
| 884 | + case EdmPrimitiveType::INT32: |
|
| 885 | + return new ResourceType( |
|
| 886 | + new Int32(), |
|
| 887 | + ResourceTypeKind::PRIMITIVE, |
|
| 888 | + 'Int32', 'Edm' |
|
| 889 | + ); |
|
| 890 | + break; |
|
| 891 | + case EdmPrimitiveType::INT64: |
|
| 892 | + return new ResourceType( |
|
| 893 | + new Int64(), |
|
| 894 | + ResourceTypeKind::PRIMITIVE, |
|
| 895 | + 'Int64', 'Edm' |
|
| 896 | + ); |
|
| 897 | + break; |
|
| 898 | + case EdmPrimitiveType::SBYTE: |
|
| 899 | + return new ResourceType( |
|
| 900 | + new SByte(), |
|
| 901 | + ResourceTypeKind::PRIMITIVE, |
|
| 902 | + 'SByte', 'Edm' |
|
| 903 | + ); |
|
| 904 | + break; |
|
| 905 | + case EdmPrimitiveType::SINGLE: |
|
| 906 | + return new ResourceType( |
|
| 907 | + new Single(), |
|
| 908 | + ResourceTypeKind::PRIMITIVE, |
|
| 909 | + 'Single', 'Edm' |
|
| 910 | + ); |
|
| 911 | + break; |
|
| 912 | + case EdmPrimitiveType::STRING: |
|
| 913 | + return new ResourceType( |
|
| 914 | + new StringType(), |
|
| 915 | + ResourceTypeKind::PRIMITIVE, |
|
| 916 | + 'String', 'Edm' |
|
| 917 | + ); |
|
| 918 | + break; |
|
| 919 | + default: |
|
| 920 | + throw new \InvalidArgumentException( |
|
| 921 | + Messages::commonNotValidPrimitiveEDMType( |
|
| 922 | + '$typeCode', 'getPrimitiveResourceType' |
|
| 923 | + ) |
|
| 924 | + ); |
|
| 925 | 925 | } |
| 926 | 926 | } |
| 927 | 927 | } |
| 928 | 928 | \ No newline at end of file |
@@ -6,7 +6,6 @@ discard block |
||
| 6 | 6 | use POData\Common\Messages; |
| 7 | 7 | use POData\Common\ODataConstants; |
| 8 | 8 | use POData\Providers\Metadata\Type\Null1; |
| 9 | -use POData\Providers\Metadata\Type\INavigationType; |
|
| 10 | 9 | use POData\Providers\Metadata\Type\Int64; |
| 11 | 10 | use POData\Providers\Metadata\Type\Int16; |
| 12 | 11 | use POData\Providers\Metadata\Type\Guid; |
@@ -17,10 +16,8 @@ discard block |
||
| 17 | 16 | use POData\Providers\Metadata\Type\Int32; |
| 18 | 17 | use POData\Providers\Metadata\Type\StringType; |
| 19 | 18 | use POData\Providers\Metadata\Type\Boolean; |
| 20 | -use POData\Providers\Metadata\Type\VoidType; |
|
| 21 | 19 | use POData\Providers\Metadata\Type\Binary; |
| 22 | 20 | use POData\Providers\Metadata\Type\IType; |
| 23 | -use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\ExpressionType; |
|
| 24 | 21 | use POData\UriProcessor\QueryProcessor\ExpressionParser\Expressions\AbstractExpression; |
| 25 | 22 | use POData\UriProcessor\QueryProcessor\ExpressionParser\ExpressionToken; |
| 26 | 23 | |
@@ -2,10 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace POData\UriProcessor\QueryProcessor\SkipTokenParser; |
| 4 | 4 | |
| 5 | -use POData\Providers\Metadata\Type\Guid; |
|
| 6 | 5 | use POData\Providers\Metadata\Type\Null1; |
| 7 | -use POData\Providers\Metadata\Type\DateTime; |
|
| 8 | -use POData\Providers\Metadata\Type\StringType; |
|
| 9 | 6 | use POData\Providers\Metadata\ResourceType; |
| 10 | 7 | use POData\UriProcessor\QueryProcessor\OrderByParser\InternalOrderByInfo; |
| 11 | 8 | use POData\Common\Messages; |
@@ -363,37 +363,37 @@ |
||
| 363 | 363 | private function _parsePrimaryStart() |
| 364 | 364 | { |
| 365 | 365 | switch ($this->_lexer->getCurrentToken()->Id) { |
| 366 | - case ExpressionTokenId::BOOLEAN_LITERAL: |
|
| 367 | - return $this->_parseTypedLiteral(new Boolean()); |
|
| 368 | - case ExpressionTokenId::DATETIME_LITERAL: |
|
| 369 | - return $this->_parseTypedLiteral(new DateTime()); |
|
| 370 | - case ExpressionTokenId::DECIMAL_LITERAL: |
|
| 371 | - return $this->_parseTypedLiteral(new Decimal()); |
|
| 372 | - case ExpressionTokenId::NULL_LITERAL: |
|
| 373 | - return $this->_parseNullLiteral(); |
|
| 374 | - case ExpressionTokenId::IDENTIFIER: |
|
| 375 | - return $this->_parseIdentifier(); |
|
| 376 | - case ExpressionTokenId::STRING_LITERAL: |
|
| 377 | - return $this->_parseTypedLiteral(new StringType()); |
|
| 378 | - case ExpressionTokenId::INT64_LITERAL: |
|
| 379 | - return $this->_parseTypedLiteral(new Int64()); |
|
| 380 | - case ExpressionTokenId::INTEGER_LITERAL: |
|
| 381 | - return $this->_parseTypedLiteral(new Int32()); |
|
| 382 | - case ExpressionTokenId::DOUBLE_LITERAL: |
|
| 383 | - return $this->_parseTypedLiteral(new Double()); |
|
| 384 | - case ExpressionTokenId::SINGLE_LITERAL: |
|
| 385 | - return $this->_parseTypedLiteral(new Single()); |
|
| 386 | - case ExpressionTokenId::GUID_LITERAL: |
|
| 387 | - return $this->_parseTypedLiteral(new Guid()); |
|
| 388 | - case ExpressionTokenId::BINARY_LITERAL: |
|
| 389 | - throw new NotImplementedException( |
|
| 390 | - 'Support for binary is not implemented' |
|
| 391 | - ); |
|
| 392 | - //return $this->_parseTypedLiteral(new Binary()); |
|
| 393 | - case ExpressionTokenId::OPENPARAM: |
|
| 394 | - return $this->_parseParenExpression(); |
|
| 395 | - default: |
|
| 396 | - throw ODataException::createSyntaxError("Expression expected."); |
|
| 366 | + case ExpressionTokenId::BOOLEAN_LITERAL: |
|
| 367 | + return $this->_parseTypedLiteral(new Boolean()); |
|
| 368 | + case ExpressionTokenId::DATETIME_LITERAL: |
|
| 369 | + return $this->_parseTypedLiteral(new DateTime()); |
|
| 370 | + case ExpressionTokenId::DECIMAL_LITERAL: |
|
| 371 | + return $this->_parseTypedLiteral(new Decimal()); |
|
| 372 | + case ExpressionTokenId::NULL_LITERAL: |
|
| 373 | + return $this->_parseNullLiteral(); |
|
| 374 | + case ExpressionTokenId::IDENTIFIER: |
|
| 375 | + return $this->_parseIdentifier(); |
|
| 376 | + case ExpressionTokenId::STRING_LITERAL: |
|
| 377 | + return $this->_parseTypedLiteral(new StringType()); |
|
| 378 | + case ExpressionTokenId::INT64_LITERAL: |
|
| 379 | + return $this->_parseTypedLiteral(new Int64()); |
|
| 380 | + case ExpressionTokenId::INTEGER_LITERAL: |
|
| 381 | + return $this->_parseTypedLiteral(new Int32()); |
|
| 382 | + case ExpressionTokenId::DOUBLE_LITERAL: |
|
| 383 | + return $this->_parseTypedLiteral(new Double()); |
|
| 384 | + case ExpressionTokenId::SINGLE_LITERAL: |
|
| 385 | + return $this->_parseTypedLiteral(new Single()); |
|
| 386 | + case ExpressionTokenId::GUID_LITERAL: |
|
| 387 | + return $this->_parseTypedLiteral(new Guid()); |
|
| 388 | + case ExpressionTokenId::BINARY_LITERAL: |
|
| 389 | + throw new NotImplementedException( |
|
| 390 | + 'Support for binary is not implemented' |
|
| 391 | + ); |
|
| 392 | + //return $this->_parseTypedLiteral(new Binary()); |
|
| 393 | + case ExpressionTokenId::OPENPARAM: |
|
| 394 | + return $this->_parseParenExpression(); |
|
| 395 | + default: |
|
| 396 | + throw ODataException::createSyntaxError("Expression expected."); |
|
| 397 | 397 | } |
| 398 | 398 | } |
| 399 | 399 | |
@@ -470,39 +470,39 @@ |
||
| 470 | 470 | private static function _getTypeAndValidateKeyValue($value, $tokenId, &$outValue, &$outType) |
| 471 | 471 | { |
| 472 | 472 | switch ($tokenId) { |
| 473 | - case ExpressionTokenId::BOOLEAN_LITERAL: |
|
| 474 | - $outType = new Boolean(); |
|
| 475 | - break; |
|
| 476 | - case ExpressionTokenId::DATETIME_LITERAL: |
|
| 477 | - $outType = new DateTime(); |
|
| 478 | - break; |
|
| 479 | - case ExpressionTokenId::GUID_LITERAL: |
|
| 480 | - $outType = new Guid(); |
|
| 481 | - break; |
|
| 482 | - case ExpressionTokenId::STRING_LITERAL: |
|
| 483 | - $outType = new StringType(); |
|
| 484 | - break; |
|
| 485 | - case ExpressionTokenId::INTEGER_LITERAL: |
|
| 486 | - $outType = new Int32(); |
|
| 487 | - break; |
|
| 488 | - case ExpressionTokenId::DECIMAL_LITERAL: |
|
| 489 | - $outType = new Decimal(); |
|
| 490 | - break; |
|
| 491 | - case ExpressionTokenId::DOUBLE_LITERAL: |
|
| 492 | - $outType = new Double(); |
|
| 493 | - break; |
|
| 494 | - case ExpressionTokenId::INT64_LITERAL: |
|
| 495 | - $outType = new Int64(); |
|
| 496 | - break; |
|
| 497 | - case ExpressionTokenId::SINGLE_LITERAL: |
|
| 498 | - $outType = new Single(); |
|
| 499 | - break; |
|
| 500 | - case ExpressionTokenId::NULL_LITERAL: |
|
| 501 | - $outType = new Null1(); |
|
| 502 | - break; |
|
| 503 | - default: |
|
| 504 | - $outType = null; |
|
| 505 | - return false; |
|
| 473 | + case ExpressionTokenId::BOOLEAN_LITERAL: |
|
| 474 | + $outType = new Boolean(); |
|
| 475 | + break; |
|
| 476 | + case ExpressionTokenId::DATETIME_LITERAL: |
|
| 477 | + $outType = new DateTime(); |
|
| 478 | + break; |
|
| 479 | + case ExpressionTokenId::GUID_LITERAL: |
|
| 480 | + $outType = new Guid(); |
|
| 481 | + break; |
|
| 482 | + case ExpressionTokenId::STRING_LITERAL: |
|
| 483 | + $outType = new StringType(); |
|
| 484 | + break; |
|
| 485 | + case ExpressionTokenId::INTEGER_LITERAL: |
|
| 486 | + $outType = new Int32(); |
|
| 487 | + break; |
|
| 488 | + case ExpressionTokenId::DECIMAL_LITERAL: |
|
| 489 | + $outType = new Decimal(); |
|
| 490 | + break; |
|
| 491 | + case ExpressionTokenId::DOUBLE_LITERAL: |
|
| 492 | + $outType = new Double(); |
|
| 493 | + break; |
|
| 494 | + case ExpressionTokenId::INT64_LITERAL: |
|
| 495 | + $outType = new Int64(); |
|
| 496 | + break; |
|
| 497 | + case ExpressionTokenId::SINGLE_LITERAL: |
|
| 498 | + $outType = new Single(); |
|
| 499 | + break; |
|
| 500 | + case ExpressionTokenId::NULL_LITERAL: |
|
| 501 | + $outType = new Null1(); |
|
| 502 | + break; |
|
| 503 | + default: |
|
| 504 | + $outType = null; |
|
| 505 | + return false; |
|
| 506 | 506 | } |
| 507 | 507 | |
| 508 | 508 | if (!$outType->validate($value, $outValue)) { |