From: <cin...@us...> - 2008-03-20 21:12:57
|
Revision: 529 http://firebird.svn.sourceforge.net/firebird/?rev=529&view=rev Author: cincura_net Date: 2008-03-20 14:12:59 -0700 (Thu, 20 Mar 2008) Log Message: ----------- More work on EntityFW. Modified Paths: -------------- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ConceptualSchemaDefinition.csdl NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ProviderManifest.xml NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/StoreSchemaDefinition.ssdl NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdSql.Data.FirebirdClient.csproj Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ConceptualSchemaDefinition.csdl =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ConceptualSchemaDefinition.csdl 2008-03-19 22:59:23 UTC (rev 528) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ConceptualSchemaDefinition.csdl 2008-03-20 21:12:59 UTC (rev 529) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Schema xmlns="http://schemas.microsoft.com/ado/2006/04/edm" xmlns:edm="http://schemas.microsoft.com/ado/2006/04/edm" xmlns:cg="http://schemas.microsoft.com/ado/2006/04/codegeneration" Namespace="Provider" Alias="Self"> - + <EntityContainer Name="SchemaInformation"> - <EntitySet EntityType="Self.Table" Name="Tables" /> - <EntitySet EntityType="Self.View" Name="Views" /> - <EntitySet EntityType="Self.Function" Name="Functions" /> - <EntitySet EntityType="Self.FunctionParameter" Name="FunctionParameters" /> + <EntitySet EntityType="Self.Table" Name="Tables" /> + <EntitySet EntityType="Self.View" Name="Views" /> + <EntitySet EntityType="Self.Function" Name="Functions" /> + <EntitySet EntityType="Self.FunctionParameter" Name="FunctionParameters" /> <EntitySet EntityType="Self.TableColumn" Name="TableColumns" /> <EntitySet EntityType="Self.ViewColumn" Name="ViewColumns" /> <EntitySet EntityType="Self.PrimaryKey" Name="PrimaryKeys" /> @@ -17,7 +17,7 @@ <AssociationSet Association="Self.ToColumnRelationshipColumnMap" Name="ToColumnRelationshipColumnMaps" /> <AssociationSet Association="Self.TableTableColumn" Name="TableTableColumns" /> <AssociationSet Association="Self.ViewViewColumn" Name="ViewViewColumns" /> - <AssociationSet Association="Self.FunctionFunctionParameter" Name="FunctionFunctionParameters" /> + <AssociationSet Association="Self.FunctionFunctionParameter" Name="FunctionFunctionParameters" /> </EntityContainer> <EntityType Name="Table"> @@ -30,8 +30,8 @@ <Property Name="Name" Nullable="false" Type="String" MaxLength="256" /> <NavigationProperty Relationship="Self.TableTableColumn" Name="Columns" FromRole="Table" ToRole="Column" /> </EntityType> - - <EntityType Name="View"> + + <EntityType Name="View"> <Key> <PropertyRef Name="Id" /> </Key> @@ -62,7 +62,7 @@ <Property Name="IsNiladic" Type="Boolean" /> <NavigationProperty Relationship="Self.FunctionFunctionParameter" Name="Parameters" FromRole="Function" ToRole="Parameter" /> </EntityType> - + <EntityType Name="TableColumn"> <Key> <PropertyRef Name="Id" /> @@ -174,19 +174,19 @@ <End Type="Self.RelationshipColumnMap" Role="RelationshipColumnMap" Multiplicity="*" /> </Association> - <Association Name="TableTableColumn"> + <Association Name="TableTableColumn"> <End Type="Self.Table" Role="Table" Multiplicity="1" /> <End Type="Self.TableColumn" Role="Column" Multiplicity="*" /> </Association> - <Association Name="ViewViewColumn"> + <Association Name="ViewViewColumn"> <End Type="Self.View" Role="View" Multiplicity="1" /> <End Type="Self.ViewColumn" Role="ViewColumn" Multiplicity="*" /> </Association> - + <Association Name="FunctionFunctionParameter"> <End Type="Self.Function" Role="Function" Multiplicity="1" /> <End Type="Self.FunctionParameter" Role="Parameter" Multiplicity="*" /> </Association> - + </Schema> \ No newline at end of file Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ProviderManifest.xml =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ProviderManifest.xml 2008-03-19 22:59:23 UTC (rev 528) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/ProviderManifest.xml 2008-03-20 21:12:59 UTC (rev 529) @@ -33,56 +33,14 @@ <Scale Minimum="0" Maximum="38" Default="0" Constant="false" /> </FacetDescriptions> </Type> - <!--<Type Name="smallmoney" PrimitiveTypeKind="Decimal"> - <FacetDescriptions> - <Precision Default="10" Constant="true" /> - <Scale Default="4" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="money" PrimitiveTypeKind="Decimal"> - <FacetDescriptions> - <Precision Default="19" Constant="true" /> - <Scale Default="4" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="binary" PrimitiveTypeKind="Binary"> - <FacetDescriptions> - <MaxLength Minimum="1" Maximum="8000" Default="8000" Constant="false" /> - <FixedLength Default="true" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="varbinary" PrimitiveTypeKind="Binary"> - <FacetDescriptions> - <MaxLength Minimum="1" Maximum="8000" Default="8000" Constant="false" /> - <FixedLength Default="false" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="varbinary(max)" PrimitiveTypeKind="Binary"> - <FacetDescriptions> - <MaxLength Default="2147483647" Constant="true" /> - <FixedLength Default="false" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="image" PrimitiveTypeKind="Binary" > - <FacetDescriptions> - <MaxLength Default="2147483647" Constant="true" /> - <FixedLength Default="false" Constant="true" /> - </FacetDescriptions> - </Type>--> <Type Name="timestamp" PrimitiveTypeKind="DateTime"> <FacetDescriptions> <PreserveSeconds Default="true" Constant="true" /> <DateTimeKind Default="Unspecified" Constant="true" /> </FacetDescriptions> </Type> - <!--<Type Name="rowversion" PrimitiveTypeKind="Binary"> - <FacetDescriptions> - <MaxLength Default="8" Constant="true" /> - <FixedLength Default="true" Constant="true" /> - </FacetDescriptions> - </Type>--> - <!--<Type Name="bit" PrimitiveTypeKind="Boolean"> - </Type>--> + <Type Name="smallint_bool" PrimitiveTypeKind="Boolean"> + </Type> <!--<Type Name="smalldatetime" PrimitiveTypeKind="DateTime"> <FacetDescriptions> <PreserveSeconds Default="false" Constant="true" /> @@ -102,17 +60,17 @@ <FixedLength Default="false" Constant="true" /> </FacetDescriptions> </Type>--> - <Type Name="varchar" PrimitiveTypeKind="String"> + <!--<Type Name="varchar" PrimitiveTypeKind="String"> <FacetDescriptions> <MaxLength Minimum="1" Maximum="8000" Default="8000" Constant="false" /> <Unicode Default="false" Constant="true" /> <FixedLength Default="false" Constant="true" /> </FacetDescriptions> - </Type> + </Type>--> <Type Name="char" PrimitiveTypeKind="String"> <FacetDescriptions> <MaxLength Minimum="1" Maximum="8000" Default="8000" Constant="false" /> - <Unicode Default="false" Constant="true" /> + <Unicode Default="false" Constant="false" /> <FixedLength Default="true" Constant="true" /> </FacetDescriptions> </Type> @@ -130,13 +88,13 @@ <FixedLength Default="false" Constant="true" /> </FacetDescriptions> </Type>--> - <!--<Type Name="nvarchar(max)" PrimitiveTypeKind="String"> + <Type Name="varchar" PrimitiveTypeKind="String"> <FacetDescriptions> - <MaxLength Default="1073741823" Constant="true" /> - <Unicode Default="true" Constant="true" /> + <MaxLength Default="8000" Minimum="1" Maximum="8000" Constant="false" /> + <Unicode Default="true" Constant="false" /> <FixedLength Default="false" Constant="true" /> </FacetDescriptions> - </Type>--> + </Type> <!--<Type Name="ntext" PrimitiveTypeKind="String" > <FacetDescriptions> <MaxLength Default="1073741823" Constant="true" /> @@ -151,15 +109,6 @@ <FixedLength Default="false" Constant="true" /> </FacetDescriptions> </Type>--> - <!--<Type Name="uniqueidentifier" PrimitiveTypeKind="Guid"> - </Type>--> - <!--<Type Name="xml" PrimitiveTypeKind="String" > - <FacetDescriptions> - <MaxLength Default="1073741823" Constant="true" /> - <Unicode Default="true" Constant="true" /> - <FixedLength Default="false" Constant="true" /> - </FacetDescriptions> - </Type>--> </Types> <Functions> Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/StoreSchemaDefinition.ssdl =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/StoreSchemaDefinition.ssdl 2008-03-19 22:59:23 UTC (rev 528) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/Entity/StoreSchemaDefinition.ssdl 2008-03-20 21:12:59 UTC (rev 529) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<Schema Namespace="FirebirdClient" Alias="Self" xmlns="http://schemas.microsoft.com/ado/2006/04/edm/ssdl"> +<Schema Namespace="FirebirdClient_EF" Alias="Self" + xmlns="http://schemas.microsoft.com/ado/2006/04/edm/ssdl"> <EntityContainer Name="Schema"> <EntitySet Name="STables" EntityType="Self.Table"> <DefiningQuery> @@ -20,27 +21,27 @@ , rf.rdb$relation_name as "TableId" , rf.rdb$field_name as "Name" , rf.rdb$field_position as "Ordinal" - , CASE WHEN COALESCE(rf.rdb$null_flag, f.rdb$null_flag) IS NULL THEN '1' ELSE '0' END as "IsNullable" + , CASE WHEN COALESCE(rf.rdb$null_flag, f.rdb$null_flag) IS NULL THEN '1' ELSE '0' END as "IsNullable" , CASE f.rdb$field_type - WHEN 7 THEN 'smallint' - WHEN 8 THEN 'int' - WHEN 16 THEN 'bigint' - WHEN 10 THEN 'float' - WHEN 27 THEN 'double' - WHEN 12 THEN 'date' - WHEN 13 THEN 'time' - WHEN 35 THEN 'timestamp' - WHEN 261 THEN 'blob' - WHEN 37 THEN 'varchar' - WHEN 14 THEN 'char' - WHEN 40 THEN 'cstring' - END as "TypeName" + WHEN 7 THEN 'smallint' + WHEN 8 THEN 'int' + WHEN 16 THEN 'bigint' + WHEN 10 THEN 'float' + WHEN 27 THEN 'double' + WHEN 12 THEN 'date' + WHEN 13 THEN 'time' + WHEN 35 THEN 'timestamp' + WHEN 261 THEN 'blob' + WHEN 37 THEN 'varchar' + WHEN 14 THEN 'char' + WHEN 40 THEN 'cstring' + END as "TypeName" , f.rdb$character_length as "MaxLength" - , f.rdb$field_precision as "Precision" + , f.rdb$field_precision as "Precision" , f.rdb$field_scale as "Scale" , '0' as "IsIdentity" , CASE WHEN f.rdb$computed_blr IS NULL THEN '0' ELSE '1' END as "IsComputed" - , '0' as "IsStoreGenerated" + , '0' as "IsStoreGenerated" FROM rdb$relation_fields rf LEFT JOIN rdb$fields f ON (rf.rdb$field_source = f.rdb$field_name) </DefiningQuery> @@ -112,9 +113,9 @@ , is2.rdb$field_position as "MapOrdinal" FROM rdb$ref_constraints refc LEFT JOIN rdb$relation_constraints relc1 ON (refc.rdb$constraint_name = relc1.rdb$constraint_name) - INNER JOIN rdb$index_segments is1 ON (relc1.rdb$index_name = is1.rdb$index_name) + INNER JOIN rdb$index_segments is1 ON (relc1.rdb$index_name = is1.rdb$index_name) LEFT JOIN rdb$relation_constraints relc2 ON (refc.rdb$const_name_uq = relc2.rdb$constraint_name) - INNER JOIN rdb$index_segments is2 ON (relc2.rdb$index_name = is2.rdb$index_name) + INNER JOIN rdb$index_segments is2 ON (relc2.rdb$index_name = is2.rdb$index_name) WHERE is1.rdb$field_position = is2.rdb$field_position </DefiningQuery> </EntitySet> @@ -201,72 +202,72 @@ <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)" /> - <Property Name="Catalog" Type="nvarchar" MaxLength="256" /> - <Property Name="Schema" Nullable="false" Type="nvarchar" MaxLength="256" /> - <Property Name="Name" Nullable="false" Type="nvarchar" MaxLength="256" /> + <Property Name="Id" Nullable="false" Type="varchar" /> + <Property Name="Catalog" Type="varchar" MaxLength="256" /> + <Property Name="Schema" Nullable="false" Type="varchar" MaxLength="256" /> + <Property Name="Name" Nullable="false" Type="varchar" MaxLength="256" /> </EntityType> <EntityType Name="View"> <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)" /> - <Property Name="Catalog" Type="nvarchar" MaxLength="256" /> - <Property Name="Schema" Nullable="false" Type="nvarchar" MaxLength="256" /> - <Property Name="Name" Nullable="false" Type="nvarchar" MaxLength="256" /> - <Property Name="ViewDefinition" Nullable="false" Type="nvarchar(max)" /> - <Property Name="IsUpdatable" Nullable="false" Type="bit" /> + <Property Name="Id" Nullable="false" Type="varchar" /> + <Property Name="Catalog" Type="varchar" MaxLength="256" /> + <Property Name="Schema" Nullable="false" Type="varchar" MaxLength="256" /> + <Property Name="Name" Nullable="false" Type="varchar" MaxLength="256" /> + <Property Name="ViewDefinition" Nullable="false" Type="varchar" /> + <Property Name="IsUpdatable" Nullable="false" Type="smallint_bool" /> </EntityType> <EntityType Name="Function"> <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)"/> - <Property Name="Catalog" Type="nvarchar" MaxLength="256"/> - <Property Name="Schema" Nullable="false" Type="nvarchar" MaxLength="256"/> - <Property Name="Name" Nullable="false" Type="nvarchar" MaxLength="256"/> - <Property Name="ReturnTypeName" Type="nvarchar" MaxLength="256" /> + <Property Name="Id" Nullable="false" Type="varchar"/> + <Property Name="Catalog" Type="varchar" MaxLength="256"/> + <Property Name="Schema" Nullable="false" Type="varchar" MaxLength="256"/> + <Property Name="Name" Nullable="false" Type="varchar" MaxLength="256"/> + <Property Name="ReturnTypeName" Type="varchar" MaxLength="256" /> <Property Name="ReturnMaxLength" Type="int" /> <Property Name="ReturnPrecision" Type="int" /> <Property Name="ReturnScale" Type="int" /> - <Property Name="IsAggregate" Type="bit" /> - <Property Name="IsComposable" Type="bit" /> - <Property Name="IsBuiltIn" Type="bit" /> - <Property Name="IsNiladic" Type="bit" /> + <Property Name="IsAggregate" Type="smallint_bool" /> + <Property Name="IsComposable" Type="smallint_bool" /> + <Property Name="IsBuiltIn" Type="smallint_bool" /> + <Property Name="IsNiladic" Type="smallint_bool" /> </EntityType> <EntityType Name="FunctionParameter"> <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)"/> - <Property Name="FunctionId" Nullable="false" Type="nvarchar(max)"/> - <Property Name="Name" Nullable="false" Type="nvarchar(max)" /> + <Property Name="Id" Nullable="false" Type="varchar" MaxLength="256" /> + <Property Name="FunctionId" Nullable="false" Type="varchar"/> + <Property Name="Name" Nullable="false" Type="varchar" /> <Property Name="Ordinal" Nullable="false" Type="int"/> - <Property Name="TypeName" Nullable="false" Type="nvarchar" MaxLength="256" /> + <Property Name="TypeName" Nullable="false" Type="varchar" MaxLength="256" /> <Property Name="MaxLength" Nullable="true" Type="int" /> <Property Name="Precision" Nullable="true" Type="int" /> <Property Name="Scale" Nullable="true" Type="int" /> - <Property Name="Mode" Type="nvarchar" MaxLength="16" /> + <Property Name="Mode" Type="varchar" MaxLength="16" /> </EntityType> <EntityType Name="TableColumn"> <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)"/> - <Property Name="TableId" Nullable="false" Type="nvarchar(max)"/> - <Property Name="Name" Nullable="false" Type="nvarchar" MaxLength="256"/> + <Property Name="Id" Nullable="false" Type="varchar"/> + <Property Name="TableId" Nullable="false" Type="varchar"/> + <Property Name="Name" Nullable="false" Type="varchar" MaxLength="256"/> <Property Name="Ordinal" Nullable="false" Type="int" /> - <Property Name="IsNullable" Nullable="false" Type="bit" /> - <Property Name="TypeName" Nullable="false" Type="nvarchar" MaxLength="256" /> + <Property Name="IsNullable" Nullable="false" Type="smallint_bool" /> + <Property Name="TypeName" Nullable="false" Type="varchar" MaxLength="256" /> <Property Name="MaxLength" Type="int" /> <Property Name="Precision" Type="int" /> <Property Name="Scale" Type="int" /> - <Property Name="IsIdentity" Nullable="false" Type="bit" /> - <Property Name="IsStoreGenerated" Nullable="false" Type="bit" /> + <Property Name="IsIdentity" Nullable="false" Type="smallint_bool" /> + <Property Name="IsStoreGenerated" Nullable="false" Type="smallint_bool" /> </EntityType> @@ -274,17 +275,17 @@ <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)"/> - <Property Name="ViewId" Nullable="false" Type="nvarchar(max)"/> - <Property Name="Name" Nullable="false" Type="nvarchar" MaxLength="256"/> + <Property Name="Id" Nullable="false" Type="varchar"/> + <Property Name="ViewId" Nullable="false" Type="varchar"/> + <Property Name="Name" Nullable="false" Type="varchar" MaxLength="256"/> <Property Name="Ordinal" Nullable="false" Type="int" /> - <Property Name="IsNullable" Nullable="false" Type="bit" /> - <Property Name="TypeName" Nullable="false" Type="nvarchar" MaxLength="256" /> + <Property Name="IsNullable" Nullable="false" Type="smallint_bool" /> + <Property Name="TypeName" Nullable="false" Type="varchar" MaxLength="256" /> <Property Name="MaxLength" Type="int" /> <Property Name="Precision" Type="int" /> <Property Name="Scale" Type="int" /> - <Property Name="IsIdentity" Nullable="false" Type="bit" /> - <Property Name="IsStoreGenerated" Nullable="false" Type="bit" /> + <Property Name="IsIdentity" Nullable="false" Type="smallint_bool" /> + <Property Name="IsStoreGenerated" Nullable="false" Type="smallint_bool" /> </EntityType> @@ -292,8 +293,8 @@ <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)" /> - <Property Name="Name" Nullable="false" MaxLength="256" Type="nvarchar" /> + <Property Name="Id" Nullable="false" Type="varchar" /> + <Property Name="Name" Nullable="false" MaxLength="256" Type="varchar" /> <Property Name="Ordinal" Nullable="false" Type="int" /> <NavigationProperty Relationship="Self.ColumnPrimaryKey" Name="Column" FromRole="PrimaryKey" ToRole="Column" /> </EntityType> @@ -302,20 +303,20 @@ <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)" /> - <Property Name="Name" Nullable="false" MaxLength="256" Type="nvarchar" /> - <Property Name="IsCascadeDelete" Nullable="false" Type="bit" /> + <Property Name="Id" Nullable="false" Type="varchar" /> + <Property Name="Name" Nullable="false" MaxLength="256" Type="varchar" /> + <Property Name="IsCascadeDelete" Nullable="false" Type="smallint_bool" /> </EntityType> <EntityType Name="RelationshipColumnMap"> <Key> <PropertyRef Name="Id" /> </Key> - <Property Name="Id" Nullable="false" Type="nvarchar(max)" /> + <Property Name="Id" Nullable="false" Type="varchar" /> <Property Name="MapOrdinal" Nullable="false" Type="int" /> - <Property Name="RelationshipId" Nullable="false" Type="nvarchar(max)" /> - <Property Name="FromColumnId" Nullable="false" Type="nvarchar(max)" /> - <Property Name="ToColumnId" Nullable="false" Type="nvarchar(max)" /> + <Property Name="RelationshipId" Nullable="false" Type="varchar" /> + <Property Name="FromColumnId" Nullable="false" Type="varchar" /> + <Property Name="ToColumnId" Nullable="false" Type="varchar" /> </EntityType> <Association Name="ColumnPrimaryKey"> Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs 2008-03-19 22:59:23 UTC (rev 528) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdClient/FbProviderManifest.cs 2008-03-20 21:12:59 UTC (rev 529) @@ -99,7 +99,12 @@ public override string Token { - get { return _serverVersion; } + get + { +#warning Finish this for real + return "FB"; + return _serverVersion; + } } internal static XmlReader GetProviderManifest(DbConnection connection) @@ -211,7 +216,7 @@ //case "tinyint": case "smallint": case "bigint": - //case "bit": + case "smallint_bool": //case "uniqueidentifier": case "int": return TypeUsage.CreateDefaultTypeUsage(edmPrimitiveType); @@ -219,7 +224,7 @@ case "varchar": newPrimitiveTypeKind = PrimitiveTypeKind.String; isUnbounded = !TypeHelpers.TryGetMaxLength(storeType, out maxLength); - isUnicode = false; + isUnicode = true; //TODO: hardcoded isFixedLen = false; break; @@ -303,12 +308,6 @@ } } - //case "money": - // return TypeUsage.CreateDecimalTypeUsage(edmPrimitiveType, 19, 4); - - //case "smallmoney": - // return TypeUsage.CreateDecimalTypeUsage(edmPrimitiveType, 10, 4); - case "datetime": return TypeUsage.CreateDateTimeTypeUsage(edmPrimitiveType, true, DateTimeKind.Unspecified); @@ -370,8 +369,8 @@ switch (primitiveType.PrimitiveTypeKind) { - //case PrimitiveTypeKind.Boolean: - // return TypeUsage.CreateDefaultTypeUsage(StoreTypeNameToStorePrimitiveType["bit"]); + case PrimitiveTypeKind.Boolean: + return TypeUsage.CreateDefaultTypeUsage(StoreTypeNameToStorePrimitiveType["smallint_bool"]); //case PrimitiveTypeKind.Byte: // return TypeUsage.CreateDefaultTypeUsage(StoreTypeNameToStorePrimitiveType["tinyint"]); @@ -456,17 +455,17 @@ { if (isFixedLength) { - tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["nchar"], true, true, maxLength); + tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["char"], true, true, maxLength); } else { if (isMaxLength) { - tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["nvarchar(max)"], true, false); + tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["varchar"], true, false); } else { - tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["nvarchar"], true, false, maxLength); + tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["varchar"], true, false, maxLength); } } } @@ -480,7 +479,7 @@ { if (isMaxLength) { - tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["varchar(max)"], false, false); + tu = TypeUsage.CreateStringTypeUsage(StoreTypeNameToStorePrimitiveType["varchar"], false, false); } else { Modified: NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdSql.Data.FirebirdClient.csproj =================================================================== --- NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdSql.Data.FirebirdClient.csproj 2008-03-19 22:59:23 UTC (rev 528) +++ NETProvider/trunk/NETProvider/source/FirebirdSql/Data/FirebirdSql.Data.FirebirdClient.csproj 2008-03-20 21:12:59 UTC (rev 529) @@ -281,7 +281,7 @@ <EmbeddedResource Include="Entity\ProviderManifest.xsd" /> <EmbeddedResource Include="Entity\StoreSchemaDefinition.ssdl" /> <EmbeddedResource Include="Entity\StoreSchemaMapping.msl" /> - <EmbeddedResource Include="Entity\ConceptualSchemaDefinition.csdl" /> + <None Include="Entity\ConceptualSchemaDefinition.csdl" /> <None Include="Properties\FirebirdSql.Data.FirebirdClient.snk" /> </ItemGroup> <ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |