Skip to content

Commit 347e323

Browse files
WeihanLiWeihanLi
committed
refactor: rename to NVarchar and some enhancements
1 parent a10b06a commit 347e323

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

‎src/GaussDB/GaussDB.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<ProjectReference Include="../GaussDB.SourceGenerators/GaussDB.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
1919
</ItemGroup>
2020

21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
23+
</ItemGroup>
24+
2125
<ItemGroup>
2226
<None Include="README.md" Pack="true" PackagePath="\" />
2327
</ItemGroup>

‎src/GaussDB/GaussDBParameter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ void HandleSizeTruncation()
645645
return;
646646

647647
var dataTypeName = TypeInfo!.Options.GetDataTypeName(PgTypeId);
648-
if (dataTypeName == DataTypeNames.Text || dataTypeName == DataTypeNames.Varchar || dataTypeName == DataTypeNames.Varchar2 || dataTypeName == DataTypeNames.Nvarchar2 || dataTypeName == DataTypeNames.Bpchar)
648+
if (dataTypeName == DataTypeNames.Text || dataTypeName == DataTypeNames.Varchar || dataTypeName == DataTypeNames.Varchar2 || dataTypeName == DataTypeNames.NVarchar2 || dataTypeName == DataTypeNames.Bpchar)
649649
{
650650
if (value is string s && s.Length > _size)
651651
Value = s.Substring(0, _size);

‎src/GaussDB/GaussDBTypes/GaussDBDbType.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ public enum GaussDBDbType
146146
Varchar = 22,
147147

148148
/// <summary>
149-
/// Variable-length string. It is the alias of the NVARCHAR2(n) type.
149+
/// Variable-length string. For Oracle compatibility.
150150
/// </summary>
151151
Varchar2 = 2223,
152152

153153
/// <summary>
154-
/// Variable-length string.
154+
/// Variable-length string. For Oracle compatibility.
155155
/// </summary>
156-
Nvarchar2 = 2224,
156+
NVarchar2 = 2224,
157157

158158
/// <summary>
159159
/// Corresponds to the PostgreSQL internal "name" type.
@@ -635,7 +635,7 @@ public static DbType ToDbType(this GaussDBDbType gaussdbDbType)
635635
GaussDBDbType.Xml => DbType.Xml,
636636
GaussDBDbType.Varchar => DbType.String,
637637
GaussDBDbType.Varchar2 => DbType.String,
638-
GaussDBDbType.Nvarchar2 => DbType.String,
638+
GaussDBDbType.NVarchar2 => DbType.String,
639639
GaussDBDbType.Char => DbType.String,
640640
GaussDBDbType.Name => DbType.String,
641641
GaussDBDbType.Citext => DbType.String,
@@ -678,7 +678,7 @@ public static DbType ToDbType(this GaussDBDbType gaussdbDbType)
678678
GaussDBDbType.Xml => "xml",
679679
GaussDBDbType.Varchar => "varchar",
680680
GaussDBDbType.Varchar2 => "varchar2",
681-
GaussDBDbType.Nvarchar2 => "nvarchar2",
681+
GaussDBDbType.NVarchar2 => "nvarchar2",
682682
GaussDBDbType.Char => "bpchar",
683683
GaussDBDbType.Name => "name",
684684
GaussDBDbType.Refcursor => "refcursor",
@@ -797,7 +797,7 @@ internal static string ToUnqualifiedDataTypeNameOrThrow(this GaussDBDbType gauss
797797
GaussDBDbType.Xml => DataTypeNames.Xml,
798798
GaussDBDbType.Varchar => DataTypeNames.Varchar,
799799
GaussDBDbType.Varchar2 => DataTypeNames.Varchar2,
800-
GaussDBDbType.Nvarchar2 => DataTypeNames.Nvarchar2,
800+
GaussDBDbType.NVarchar2 => DataTypeNames.NVarchar2,
801801
GaussDBDbType.Char => DataTypeNames.Bpchar,
802802
GaussDBDbType.Name => DataTypeNames.Name,
803803
GaussDBDbType.Refcursor => DataTypeNames.RefCursor,
@@ -907,7 +907,7 @@ _ when gaussdbDbType.HasFlag(GaussDBDbType.Multirange)
907907
"xml" => GaussDBDbType.Xml,
908908
"varchar" => GaussDBDbType.Varchar,
909909
"varchar2" => GaussDBDbType.Varchar2,
910-
"nvarchar2" => GaussDBDbType.Nvarchar2,
910+
"nvarchar2" => GaussDBDbType.NVarchar2,
911911
"bpchar" => GaussDBDbType.Char,
912912
"name" => GaussDBDbType.Name,
913913
"refcursor" => GaussDBDbType.Refcursor,

‎src/GaussDB/Internal/Postgres/DataTypeNames.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static class DataTypeNames
3535
public static DataTypeName Text => ValidatedName("pg_catalog.text");
3636
public static DataTypeName Varchar => ValidatedName("pg_catalog.varchar");
3737
public static DataTypeName Varchar2 => ValidatedName("pg_catalog.varchar2");
38-
public static DataTypeName Nvarchar2 => ValidatedName("pg_catalog.nvarchar2");
38+
public static DataTypeName NVarchar2 => ValidatedName("pg_catalog.nvarchar2");
3939
public static DataTypeName Char => ValidatedName("pg_catalog.char");
4040
public static DataTypeName Name => ValidatedName("pg_catalog.name");
4141
public static DataTypeName Bytea => ValidatedName("pg_catalog.bytea");

‎src/GaussDB/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
9898
MatchRequirement.DataTypeName);
9999

100100
// Alternative text types
101-
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.Nvarchar2,
101+
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
102102
DataTypeNames.Bpchar, DataTypeNames.Json,
103103
DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
104104
{
@@ -375,7 +375,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
375375
mappings.AddArrayType<Stream>(DataTypeNames.Text);
376376

377377
// Alternative text types
378-
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.Nvarchar2,
378+
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
379379
DataTypeNames.Bpchar, DataTypeNames.Json,
380380
DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
381381
{

‎src/GaussDB/Internal/ResolverFactories/ExtraConversionsTypeInfoResolverFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static TypeInfoMappingCollection AddInfos(TypeInfoMappingCollection mappings)
113113
static (options, mapping, _) => mapping.CreateInfo(options, new CharArraySegmentTextConverter(options.TextEncoding), preferredFormat: DataFormat.Text));
114114

115115
// Alternative text types
116-
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.Nvarchar2,
116+
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
117117
DataTypeNames.Bpchar, DataTypeNames.Json,
118118
DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
119119
{
@@ -211,7 +211,7 @@ static TypeInfoMappingCollection AddArrayInfos(TypeInfoMappingCollection mapping
211211
mappings.AddStructArrayType<ArraySegment<char>>(DataTypeNames.Text);
212212

213213
// Alternative text types
214-
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.Nvarchar2,
214+
foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
215215
DataTypeNames.Bpchar, DataTypeNames.Json,
216216
DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
217217
{

‎src/GaussDB/PublicAPI.Shipped.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,6 +1318,8 @@ HuaweiCloud.GaussDBTypes.GaussDBDbType.Unknown = 40 -> HuaweiCloud.GaussDBTypes.
13181318
HuaweiCloud.GaussDBTypes.GaussDBDbType.Uuid = 27 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
13191319
HuaweiCloud.GaussDBTypes.GaussDBDbType.Varbit = 39 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
13201320
HuaweiCloud.GaussDBTypes.GaussDBDbType.Varchar = 22 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
1321+
HuaweiCloud.GaussDBTypes.GaussDBDbType.Varchar2 = 2223 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
1322+
HuaweiCloud.GaussDBTypes.GaussDBDbType.NVarchar2 = 2224 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
13211323
HuaweiCloud.GaussDBTypes.GaussDBDbType.Xid = 42 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
13221324
HuaweiCloud.GaussDBTypes.GaussDBDbType.Xid8 = 64 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
13231325
HuaweiCloud.GaussDBTypes.GaussDBDbType.Xml = 28 -> HuaweiCloud.GaussDBTypes.GaussDBDbType

0 commit comments

Comments
 (0)