Merge pull request #31 from HuaweiCloudDeveloper/copilot/fix-107914163-935255308-db418157-4484-4b8f-9756-befc7b1bf9f4

szlele · web-flow · commit 19eeaeadd412 · 2025-11-11T14:22:39.000+08:00
Add VARCHAR2/NVARCHAR2 type support for Oracle migration compatibility
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,6 +22,7 @@ jobs:
   test:
     runs-on: "ubuntu-latest"
     env:
+      # do not specify IncludeErrorDetail=true in connection string directly, it would affect the unit tests
       NPGSQL_TEST_DB: "Host=localhost;Port=5432;Username=gaussdb;Password=Password@1234;Database=gaussdb_tests;"
 
     # Service containers to run with `container-job`
@@ -45,6 +46,7 @@ jobs:
           --health-retries 10
 
     strategy:
+      max-parallel: 1
       matrix:
         include:
           - config: Release
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>0.1.0</VersionPrefix>
+    <VersionPrefix>0.1.1</VersionPrefix>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
diff --git a/example/GetStarted/Program.cs b/example/GetStarted/Program.cs
@@ -17,18 +17,18 @@
 
 await ConnectionTest();
 
-var tableName = "employees";
-// id int, name varchar(128), age int
+var tableName = $"employees_{Guid.NewGuid():N}";
+
 {
     await ExecuteTableScript(async () =>
     {
         // insert
         {
             var insertSql = $"""
-                             INSERT INTO {tableName} (id, name, age) VALUES
-                             (1, 'John', 30),
-                             (2, 'Alice', 16),
-                             (3, 'Mike', 24)
+                             INSERT INTO {tableName} (id, name, age, bio, description) VALUES
+                             (1, 'John', 30, 'j', 'Manager'),
+                             (2, 'Alice', 16, 'a', 'Intern'),
+                             (3, 'Mike', 24, 'm', 'Developer')
                              """;
             await using var cmd = new GaussDBCommand(insertSql, conn);
             await cmd.ExecuteNonQueryAsync();
@@ -99,6 +99,8 @@ CREATE TABLE {tableName}
                (
                    id INT PRIMARY KEY,
                    name VARCHAR(128),
+                   bio VARCHAR2(512),
+                   description NVARCHAR2(1024),
                    age INT
                );
                """;
@@ -108,6 +110,7 @@ age INT
     {
         await using var createTableCommand = new GaussDBCommand(createTableSql, conn);
         await createTableCommand.ExecuteNonQueryAsync();
+        Console.WriteLine($@"Table {tableName} created");
 
         await func();
     }
@@ -121,6 +124,7 @@ age INT
         {
             await using var dropTableCommand = new GaussDBCommand(dropTableSql, conn);
             await dropTableCommand.ExecuteNonQueryAsync();
+            Console.WriteLine($@"Table {tableName} dropped");
         }
         catch (Exception e)
         {
@@ -146,8 +150,10 @@ async Task QueryTest(string? condition = null)
             var id = reader.GetInt32("id");
             var name = reader.GetString("name");
             var age = reader.GetInt32("age");
+            var bio = reader.GetString("bio");
+            var description = reader.GetString("description");
 
-            Console.WriteLine($@"ID: {id}, Name: {name}, Age: {age}");
+            Console.WriteLine($@"ID: {id}, Name: {name}, Age: {age}, Bio: {bio}, Description: {description}");
         }
     }
 }
diff --git a/src/GaussDB/GaussDB.csproj b/src/GaussDB/GaussDB.csproj
@@ -18,7 +18,7 @@
     <ProjectReference Include="../GaussDB.SourceGenerators/GaussDB.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+  <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/src/GaussDB/GaussDBParameter.cs b/src/GaussDB/GaussDBParameter.cs
@@ -645,7 +645,7 @@ void HandleSizeTruncation()
                 return;
 
             var dataTypeName = TypeInfo!.Options.GetDataTypeName(PgTypeId);
-            if (dataTypeName == DataTypeNames.Text || dataTypeName == DataTypeNames.Varchar || dataTypeName == DataTypeNames.Bpchar)
+            if (dataTypeName == DataTypeNames.Text || dataTypeName == DataTypeNames.Varchar || dataTypeName == DataTypeNames.Varchar2 || dataTypeName == DataTypeNames.NVarchar2 || dataTypeName == DataTypeNames.Bpchar)
             {
                 if (value is string s && s.Length > _size)
                     Value = s.Substring(0, _size);
diff --git a/src/GaussDB/GaussDBSchema.cs b/src/GaussDB/GaussDBSchema.cs
@@ -945,6 +945,8 @@ static void PopulateHardcodedDataTypeInfo(DataRow row, PostgresType type)
         switch (type.Name)
         {
         case "varchar":
+        case "varchar2":
+        case "nvarchar2":
         case "char":
             row["DataType"] = "String";
             row["IsBestMatch"] = false;
diff --git a/src/GaussDB/GaussDBTypes/GaussDBDbType.cs b/src/GaussDB/GaussDBTypes/GaussDBDbType.cs
@@ -145,6 +145,16 @@ public enum GaussDBDbType
     /// <remarks>See https://www.postgresql.org/docs/current/static/datatype-character.html</remarks>
     Varchar = 22,
 
+    /// <summary>
+    /// Variable-length string. For Oracle compatibility.
+    /// </summary>
+    Varchar2 = 2223,
+
+    /// <summary>
+    /// Variable-length string. For Oracle compatibility.
+    /// </summary>
+    NVarchar2 = 2224,
+
     /// <summary>
     /// Corresponds to the PostgreSQL internal "name" type.
     /// </summary>
@@ -624,6 +634,8 @@ public static DbType ToDbType(this GaussDBDbType gaussdbDbType)
             GaussDBDbType.Text => DbType.String,
             GaussDBDbType.Xml => DbType.Xml,
             GaussDBDbType.Varchar => DbType.String,
+            GaussDBDbType.Varchar2 => DbType.String,
+            GaussDBDbType.NVarchar2 => DbType.String,
             GaussDBDbType.Char => DbType.String,
             GaussDBDbType.Name => DbType.String,
             GaussDBDbType.Citext => DbType.String,
@@ -665,6 +677,8 @@ public static DbType ToDbType(this GaussDBDbType gaussdbDbType)
             GaussDBDbType.Text      => "text",
             GaussDBDbType.Xml       => "xml",
             GaussDBDbType.Varchar   => "varchar",
+            GaussDBDbType.Varchar2   => "varchar2",
+            GaussDBDbType.NVarchar2  => "nvarchar2",
             GaussDBDbType.Char      => "bpchar",
             GaussDBDbType.Name      => "name",
             GaussDBDbType.Refcursor => "refcursor",
@@ -782,6 +796,8 @@ internal static string ToUnqualifiedDataTypeNameOrThrow(this GaussDBDbType gauss
             GaussDBDbType.Text => DataTypeNames.Text,
             GaussDBDbType.Xml => DataTypeNames.Xml,
             GaussDBDbType.Varchar => DataTypeNames.Varchar,
+            GaussDBDbType.Varchar2 => DataTypeNames.Varchar2,
+            GaussDBDbType.NVarchar2 => DataTypeNames.NVarchar2,
             GaussDBDbType.Char => DataTypeNames.Bpchar,
             GaussDBDbType.Name => DataTypeNames.Name,
             GaussDBDbType.Refcursor => DataTypeNames.RefCursor,
@@ -890,6 +906,8 @@ _ when gaussdbDbType.HasFlag(GaussDBDbType.Multirange)
                 "text" => GaussDBDbType.Text,
                 "xml" => GaussDBDbType.Xml,
                 "varchar" => GaussDBDbType.Varchar,
+                "varchar2" => GaussDBDbType.Varchar2,
+                "nvarchar2" => GaussDBDbType.NVarchar2,
                 "bpchar" => GaussDBDbType.Char,
                 "name" => GaussDBDbType.Name,
                 "refcursor" => GaussDBDbType.Refcursor,
diff --git a/src/GaussDB/Internal/Postgres/DataTypeNames.cs b/src/GaussDB/Internal/Postgres/DataTypeNames.cs
@@ -34,6 +34,8 @@ static class DataTypeNames
     public static DataTypeName Bpchar => ValidatedName("pg_catalog.bpchar");
     public static DataTypeName Text => ValidatedName("pg_catalog.text");
     public static DataTypeName Varchar => ValidatedName("pg_catalog.varchar");
+    public static DataTypeName Varchar2 => ValidatedName("pg_catalog.varchar2");
+    public static DataTypeName NVarchar2 => ValidatedName("pg_catalog.nvarchar2");
     public static DataTypeName Char => ValidatedName("pg_catalog.char");
     public static DataTypeName Name => ValidatedName("pg_catalog.name");
     public static DataTypeName Bytea => ValidatedName("pg_catalog.bytea");
diff --git a/src/GaussDB/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs b/src/GaussDB/Internal/ResolverFactories/AdoTypeInfoResolverFactory.cs
@@ -98,7 +98,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
                 MatchRequirement.DataTypeName);
 
             // Alternative text types
-            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar,
+            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
                         DataTypeNames.Bpchar, DataTypeNames.Json,
                         DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
             {
@@ -375,7 +375,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
             mappings.AddArrayType<Stream>(DataTypeNames.Text);
 
             // Alternative text types
-            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar,
+            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
                         DataTypeNames.Bpchar, DataTypeNames.Json,
                         DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
             {
diff --git a/src/GaussDB/Internal/ResolverFactories/ExtraConversionsTypeInfoResolverFactory.cs b/src/GaussDB/Internal/ResolverFactories/ExtraConversionsTypeInfoResolverFactory.cs
@@ -113,7 +113,7 @@ static TypeInfoMappingCollection AddInfos(TypeInfoMappingCollection mappings)
                 static (options, mapping, _) => mapping.CreateInfo(options, new CharArraySegmentTextConverter(options.TextEncoding), preferredFormat: DataFormat.Text));
 
             // Alternative text types
-            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar,
+            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
                         DataTypeNames.Bpchar, DataTypeNames.Json,
                         DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
             {
@@ -211,7 +211,7 @@ static TypeInfoMappingCollection AddArrayInfos(TypeInfoMappingCollection mapping
             mappings.AddStructArrayType<ArraySegment<char>>(DataTypeNames.Text);
 
             // Alternative text types
-            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar,
+            foreach(var dataTypeName in new[] { "citext", DataTypeNames.Varchar, DataTypeNames.Varchar2, DataTypeNames.NVarchar2,
                         DataTypeNames.Bpchar, DataTypeNames.Json,
                         DataTypeNames.Xml, DataTypeNames.Name, DataTypeNames.RefCursor })
             {
diff --git a/src/GaussDB/PublicAPI.Shipped.txt b/src/GaussDB/PublicAPI.Shipped.txt
@@ -1318,6 +1318,8 @@ HuaweiCloud.GaussDBTypes.GaussDBDbType.Unknown = 40 -> HuaweiCloud.GaussDBTypes.
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Uuid = 27 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Varbit = 39 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Varchar = 22 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
+HuaweiCloud.GaussDBTypes.GaussDBDbType.Varchar2 = 2223 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
+HuaweiCloud.GaussDBTypes.GaussDBDbType.NVarchar2 = 2224 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Xid = 42 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Xid8 = 64 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
 HuaweiCloud.GaussDBTypes.GaussDBDbType.Xml = 28 -> HuaweiCloud.GaussDBTypes.GaussDBDbType
diff --git a/test/GaussDB.Tests/Types/TextTests.cs b/test/GaussDB.Tests/Types/TextTests.cs
@@ -150,4 +150,88 @@ public async Task Internal_char()
             Assert.AreEqual(testArr2[i], arr2[i]);
         }
     }
+
+    [Test, Description("Tests VARCHAR2 and NVARCHAR2 column types with table creation and insert/query operations")]
+    public async Task Varchar2_and_nvarchar2_table_operations()
+    {
+        await using var conn = await OpenConnectionAsync();
+        var tableName = await GetTempTableName(conn);
+
+        try
+        {
+            // Create table with VARCHAR2 and NVARCHAR2 columns
+            await conn.ExecuteNonQueryAsync($@"
+                CREATE TABLE {tableName} (
+                    id INT PRIMARY KEY,
+                    name VARCHAR2(100),
+                    description NVARCHAR2(200)
+                )");
+
+            // Insert data
+            await using (var cmd = new GaussDBCommand($@"
+                INSERT INTO {tableName} (id, name, description)
+                VALUES (@id, @name, @description)", conn))
+            {
+                cmd.Parameters.AddWithValue("id", 1);
+                cmd.Parameters.AddWithValue("name", "Test Name");
+                cmd.Parameters.AddWithValue("description", "Test Description");
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            // Insert data with longer strings
+            await using (var cmd = new GaussDBCommand($@"
+                INSERT INTO {tableName} (id, name, description)
+                VALUES (@id, @name, @description)", conn))
+            {
+                cmd.Parameters.AddWithValue("id", 2);
+                cmd.Parameters.AddWithValue("name", "Another Test Name");
+                cmd.Parameters.AddWithValue("description", "A much longer description to test NVARCHAR2 column handling");
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            // Query data and verify
+            await using (var cmd = new GaussDBCommand($"SELECT id, name, description FROM {tableName} ORDER BY id", conn))
+            await using (var reader = await cmd.ExecuteReaderAsync())
+            {
+                // First row
+                Assert.That(await reader.ReadAsync(), Is.True);
+                Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+                Assert.That(reader.GetString(1), Is.EqualTo("Test Name"));
+                Assert.That(reader.GetString(2), Is.EqualTo("Test Description"));
+
+                // Second row
+                Assert.That(await reader.ReadAsync(), Is.True);
+                Assert.That(reader.GetInt32(0), Is.EqualTo(2));
+                Assert.That(reader.GetString(1), Is.EqualTo("Another Test Name"));
+                Assert.That(reader.GetString(2), Is.EqualTo("A much longer description to test NVARCHAR2 column handling"));
+
+                Assert.That(await reader.ReadAsync(), Is.False);
+            }
+
+            // Test NULL values
+            await using (var cmd = new GaussDBCommand($@"
+                INSERT INTO {tableName} (id, name, description)
+                VALUES (@id, @name, @description)", conn))
+            {
+                cmd.Parameters.AddWithValue("id", 3);
+                cmd.Parameters.AddWithValue("name", DBNull.Value);
+                cmd.Parameters.AddWithValue("description", DBNull.Value);
+                await cmd.ExecuteNonQueryAsync();
+            }
+
+            // Verify NULL values
+            await using (var cmd = new GaussDBCommand($"SELECT name, description FROM {tableName} WHERE id = 3", conn))
+            await using (var reader = await cmd.ExecuteReaderAsync())
+            {
+                Assert.That(await reader.ReadAsync(), Is.True);
+                Assert.That(reader.IsDBNull(0), Is.True);
+                Assert.That(reader.IsDBNull(1), Is.True);
+            }
+        }
+        finally
+        {
+            // Clean up
+            await conn.ExecuteNonQueryAsync($"DROP TABLE IF EXISTS {tableName}");
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,18 @@`
`17`	`17`
`18`	`18`	`await ConnectionTest();`
`19`	`19`
`20`		`-var tableName = "employees";`
`21`		`-// id int, name varchar(128), age int`
	`20`	`+var tableName = $"employees_{Guid.NewGuid():N}";`
	`21`	`+`
`22`	`22`	`{`
`23`	`23`	`await ExecuteTableScript(async () =>`
`24`	`24`	`{`
`25`	`25`	`// insert`
`26`	`26`	`{`
`27`	`27`	`var insertSql = $"""`
`28`		`- INSERT INTO {tableName} (id, name, age) VALUES`
`29`		`- (1, 'John', 30),`
`30`		`- (2, 'Alice', 16),`
`31`		`- (3, 'Mike', 24)`
	`28`	`+ INSERT INTO {tableName} (id, name, age, bio, description) VALUES`
	`29`	`+ (1, 'John', 30, 'j', 'Manager'),`
	`30`	`+ (2, 'Alice', 16, 'a', 'Intern'),`
	`31`	`+ (3, 'Mike', 24, 'm', 'Developer')`
`32`	`32`	`""";`
`33`	`33`	`await using var cmd = new GaussDBCommand(insertSql, conn);`
`34`	`34`	`await cmd.ExecuteNonQueryAsync();`
`@@ -99,6 +99,8 @@ CREATE TABLE {tableName}`
`99`	`99`	`(`
`100`	`100`	`id INT PRIMARY KEY,`
`101`	`101`	`name VARCHAR(128),`
	`102`	`+ bio VARCHAR2(512),`
	`103`	`+ description NVARCHAR2(1024),`
`102`	`104`	`age INT`
`103`	`105`	`);`
`104`	`106`	`""";`
`@@ -108,6 +110,7 @@ age INT`
`108`	`110`	`{`
`109`	`111`	`await using var createTableCommand = new GaussDBCommand(createTableSql, conn);`
`110`	`112`	`await createTableCommand.ExecuteNonQueryAsync();`
	`113`	`+ Console.WriteLine($@"Table {tableName} created");`
`111`	`114`
`112`	`115`	`await func();`
`113`	`116`	`}`
`@@ -121,6 +124,7 @@ age INT`
`121`	`124`	`{`
`122`	`125`	`await using var dropTableCommand = new GaussDBCommand(dropTableSql, conn);`
`123`	`126`	`await dropTableCommand.ExecuteNonQueryAsync();`
	`127`	`+ Console.WriteLine($@"Table {tableName} dropped");`
`124`	`128`	`}`
`125`	`129`	`catch (Exception e)`
`126`	`130`	`{`
`@@ -146,8 +150,10 @@ async Task QueryTest(string? condition = null)`
`146`	`150`	`var id = reader.GetInt32("id");`
`147`	`151`	`var name = reader.GetString("name");`
`148`	`152`	`var age = reader.GetInt32("age");`
	`153`	`+ var bio = reader.GetString("bio");`
	`154`	`+ var description = reader.GetString("description");`
`149`	`155`
`150`		`- Console.WriteLine($@"ID: {id}, Name: {name}, Age: {age}");`
	`156`	`+ Console.WriteLine($@"ID: {id}, Name: {name}, Age: {age}, Bio: {bio}, Description: {description}");`
`151`	`157`	`}`
`152`	`158`	`}`
`153`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ void HandleSizeTruncation()`
`645`	`645`	`return;`
`646`	`646`
`647`	`647`	`var dataTypeName = TypeInfo!.Options.GetDataTypeName(PgTypeId);`
`648`		`- if (dataTypeName == DataTypeNames.Text \|\| dataTypeName == DataTypeNames.Varchar \|\| dataTypeName == DataTypeNames.Bpchar)`
	`648`	`+ if (dataTypeName == DataTypeNames.Text \|\| dataTypeName == DataTypeNames.Varchar \|\| dataTypeName == DataTypeNames.Varchar2 \|\| dataTypeName == DataTypeNames.NVarchar2 \|\| dataTypeName == DataTypeNames.Bpchar)`
`649`	`649`	`{`
`650`	`650`	`if (value is string s && s.Length > _size)`
`651`	`651`	`Value = s.Substring(0, _size);`
Original file line number	Diff line number	Diff line change
`@@ -945,6 +945,8 @@ static void PopulateHardcodedDataTypeInfo(DataRow row, PostgresType type)`
`945`	`945`	`switch (type.Name)`
`946`	`946`	`{`
`947`	`947`	`case "varchar":`
	`948`	`+ case "varchar2":`
	`949`	`+ case "nvarchar2":`
`948`	`950`	`case "char":`
`949`	`951`	`row["DataType"] = "String";`
`950`	`952`	`row["IsBestMatch"] = false;`