From 749a8421cf4108c40eaef3f9e624417eafc28a10 Mon Sep 17 00:00:00 2001 From: Jonny Bekkum Date: Thu, 11 Jun 2015 11:01:11 +0200 Subject: [PATCH] Updated Raw datatype map and unit tests. RAW(MAX) is not a valid datatype --- .../Generators/Oracle/OracleTypeMap.cs | 3 +- .../Generators/Oracle/OracleTypeMapTests.cs | 55 +------------------ 2 files changed, 2 insertions(+), 56 deletions(-) diff --git a/src/FluentMigrator.Runner/Generators/Oracle/OracleTypeMap.cs b/src/FluentMigrator.Runner/Generators/Oracle/OracleTypeMap.cs index 7b462ff2e..f69a5db36 100644 --- a/src/FluentMigrator.Runner/Generators/Oracle/OracleTypeMap.cs +++ b/src/FluentMigrator.Runner/Generators/Oracle/OracleTypeMap.cs @@ -43,8 +43,7 @@ protected override void SetupTypeMaps() SetTypeMap(DbType.AnsiString, "VARCHAR2($size CHAR)", AnsiStringCapacity); SetTypeMap(DbType.AnsiString, "CLOB", AnsiTextCapacity); SetTypeMap(DbType.Binary, "RAW(2000)"); - SetTypeMap(DbType.Binary, "RAW($size)", RawCapacity-1); - SetTypeMap(DbType.Binary, "RAW(MAX)", RawCapacity); + SetTypeMap(DbType.Binary, "RAW($size)", RawCapacity); SetTypeMap(DbType.Binary, "BLOB", BlobCapacity); SetTypeMap(DbType.Boolean, "NUMBER(1,0)"); SetTypeMap(DbType.Byte, "NUMBER(3,0)"); diff --git a/src/FluentMigrator.Tests/Unit/Generators/Oracle/OracleTypeMapTests.cs b/src/FluentMigrator.Tests/Unit/Generators/Oracle/OracleTypeMapTests.cs index affd9e33e..c7e17e5d5 100644 --- a/src/FluentMigrator.Tests/Unit/Generators/Oracle/OracleTypeMapTests.cs +++ b/src/FluentMigrator.Tests/Unit/Generators/Oracle/OracleTypeMapTests.cs @@ -24,54 +24,6 @@ public void SetUp() // See https://docs.oracle.com/cd/B28359_01/server.111/b28320/limits001.htm#i287903 // and http://docs.oracle.com/cd/B19306_01/server.102/b14220/datatype.htm#i13446 // for limits in Oracle data types. - [Test] - public void AnsiStringCapacityIs4000() - { - OracleTypeMap.AnsiStringCapacity.ShouldBe(4000); - } - - [Test] - public void AnsiTextCapacityIsIntMaxValue() - { - OracleTypeMap.AnsiTextCapacity.ShouldBe(int.MaxValue); - } - - [Test] - public void BlobCapacityIsIntMaxValue() - { - OracleTypeMap.BlobCapacity.ShouldBe(int.MaxValue); - } - - [Test] - public void CharStringCapacityIs2000() - { - OracleTypeMap.CharStringCapacity.ShouldBe(2000); - } - - [Test] - public void DecimalCapacityIs38() - { - OracleTypeMap.DecimalCapacity.ShouldBe(38); - } - - [Test] - public void RawCapacityIs2000() - { - OracleTypeMap.RawCapacity.ShouldBe(2000); - } - - [Test] - public void UnicodeStringCapacityIs4000() - { - OracleTypeMap.UnicodeStringCapacity.ShouldBe(4000); - } - - [Test] - public void UnicodeTextCapacityIsIntMaxValue() - { - OracleTypeMap.UnicodeTextCapacity.ShouldBe(int.MaxValue); - } - [Test] public void AnsiStringDefaultIsVarchar2_255() { @@ -112,14 +64,9 @@ public void BinaryDefaultIsRaw_2000() [Test] public void BinaryOfSizeIsRawOfSize() { - _typeMap.GetTypeMap(DbType.Binary, 1999, 0).ShouldBe("RAW(1999)"); + _typeMap.GetTypeMap(DbType.Binary, 2000, 0).ShouldBe("RAW(2000)"); } - [Test] - public void Binary2000IsRawMax() - { - _typeMap.GetTypeMap(DbType.Binary, 2000, 0).ShouldBe("RAW(MAX)"); - } [Test] public void BinaryOver2000IsBlob()