Hcd passing tests

src/DataStax.AstraDB.DataApi/Admin/DatabaseAdminOther.cs

@@ -37,6 +37,7 @@ namespace DataStax.AstraDB.DataApi.Admin
     /// </remarks>
     public class DatabaseAdminOther : IDatabaseAdmin
     {
+        private readonly Guid? _id;
         private readonly Database _database;
         private readonly CommandOptions _adminOptions;
         private readonly DataApiClient _client;

src/DataStax.AstraDB.DataApi/Core/CommandUrlBuilder.cs

@@ -88,7 +88,8 @@ internal EmbeddingCommandUrlBuilder(Database database)
 
     internal override string BuildUrl(CommandOptions options)
     {
-        var url = $"{_database.ApiEndpoint}/api/json/{options.ApiVersion.Value.ToUrlString()}";
+        var prefix = options.Destination == DataApiDestination.ASTRA ? "api/json/" : "";
+        var url = $"{_database.ApiEndpoint}/{prefix}{options.ApiVersion.Value.ToUrlString()}";
         return url;
     }
 }

src/DataStax.AstraDB.DataApi/Core/Database.cs

@@ -99,7 +99,11 @@ internal Database(string apiEndpoint, DataApiClient client, DatabaseCommandOptio
         _apiEndpoint = apiEndpoint;
         _client = client;
         _dbCommandOptions = dbCommandOptions;
-        _id = GetDatabaseIdFromUrl(_apiEndpoint);
+        var maybeId = GetDatabaseIdFromUrl(_apiEndpoint);
+        if (maybeId != null)
+        {
+            _id = (Guid)maybeId;
+        }
     }
 
     /// <summary>

src/DataStax.AstraDB.DataApi/Core/FindRerankingProvidersCommandOptions.cs

@@ -40,7 +40,7 @@ public enum RerankingProviderStatus
 }
 
 /// <summary>
-/// Options for Find Available Regions command.
+/// Options for Find Reranking Providers command.
 /// </summary>
 public class FindRerankingProvidersCommandOptions : CommandOptions
 {

src/DataStax.AstraDB.DataApi/Core/Query/IQueryRunner.cs

@@ -8,4 +8,4 @@ internal interface IQueryRunner<TBase, TSort> where TSort : SortBuilder<TBase>
     internal Task<ApiResponseWithData<ApiFindResult<TProjected>, FindStatusResult>> RunFindManyAsync<TProjected>(
         Filter<TBase> filter, IFindManyOptions<TBase, TSort> findOptions, CommandOptions commandOptions, bool runSynchronously)
         where TProjected : class;
-}
+}

src/DataStax.AstraDB.DataApi/Core/Results/FindStatusResult.cs

@@ -24,7 +24,6 @@ internal class FindStatusResult
     [JsonInclude]
     [JsonPropertyName("sortVector")]
     internal float[] SortVector { get; set; }
-
 }
 
 internal class FindStatusResult<T> : FindStatusResult
@@ -33,3 +32,24 @@ internal class FindStatusResult<T> : FindStatusResult
     [JsonPropertyName("documentResponses")]
     internal List<T> DocumentResponses { get; set; }
 }
+
+internal class TableFindStatusResult : FindStatusResult
+{
+    [JsonInclude]
+    [JsonPropertyName("projectionSchema")]
+    internal Dictionary<string, SchemaColumn> ProjectionSchema { get; set; }
+}
+
+internal class TableFindStatusResult<T> : TableFindStatusResult
+{
+    [JsonInclude]
+    [JsonPropertyName("documentResponses")]
+    internal List<T> DocumentResponses { get; set; }
+}
+
+internal class SchemaColumn
+{
+    [JsonInclude]
+    [JsonPropertyName("type")]
+    public string Type { get; set; }
+}

src/DataStax.AstraDB.DataApi/Tables/Table.cs

@@ -39,7 +39,6 @@
     private readonly string _tableName;
     private readonly Database _database;
     private readonly CommandOptions _commandOptions;
-    private TableInfo _cachedTableInfo;
 
     internal Table(string tableName, Database database, CommandOptions commandOptions)
     {
@@ -706,11 +705,11 @@
     /// <summary>
     /// Find rows in the table.
     /// 
     /// The Find() methods return a <see cref="FindEnumerator{T,T,TableSortBuilder{T}}"/> object that can be used to further structure the query
     /// by adding Sort, Projection, Skip, Limit, etc. to affect the final results.
     /// 
     /// The <see cref="FindEnumerator{T,T,TableSortBuilder{T}}"/> object can be directly enumerated both synchronously and asynchronously.
     /// Secondarily, the results can be paged through manually by using the results of <see cref="FindEnumerator{T,T,TableSortBuilder{T}}.ToCursor()"/>.
     /// </summary>
     /// <returns></returns>
     /// <example>
@@ -787,7 +786,7 @@
         return new FindEnumerator<T, TResult, TableSortBuilder<T>>(this, findOptions, commandOptions);
     }
 
-    internal async Task<ApiResponseWithData<ApiFindResult<TResult>, FindStatusResult>> RunFindManyAsync<TResult>(
+    internal async Task<ApiResponseWithData<ApiFindResult<TResult>, TableFindStatusResult>> RunFindManyAsync<TResult>(
             Filter<T> filter,
             IFindManyOptions<T,
             TableSortBuilder<T>> findOptions,
@@ -799,17 +798,16 @@
         findOptions.Filter = filter;
         commandOptions = SetRowSerializationOptions<TResult>(commandOptions, false);
         var command = CreateCommand("find").WithPayload(findOptions).AddCommandOptions(commandOptions);
-        var response = await command.RunAsyncReturnData<ApiFindResult<TResult>, FindStatusResult>(runSynchronously).ConfigureAwait(false);
+        var response = await command.RunAsyncReturnData<ApiFindResult<TResult>, TableFindStatusResult>(runSynchronously).ConfigureAwait(false);
         if (typeof(Row).IsAssignableFrom(typeof(TResult)))
         {
-            if (_cachedTableInfo == null)
+            var columnsInResult = response.Status.ProjectionSchema;
+            if (response != null && response.Data != null && response.Data.Items != null)
             {
-                var tableInfos = runSynchronously ? _database.ListTables() : await _database.ListTablesAsync();
-                _cachedTableInfo = tableInfos.FirstOrDefault(t => t.Name == _tableName);
-            }
-            foreach (var row in response.Data.Items)
-            {
-                PopulateMissingColumnsInRow(row as Row, _cachedTableInfo);
+                foreach (var row in response.Data.Items)
+                {
+                    PopulateMissingColumnsInRow(row as Row, columnsInResult);
+                }
             }
         }
         return response;
@@ -1000,26 +998,25 @@
         }
         commandOptions = SetRowSerializationOptions<TResult>(commandOptions, false);
         var command = CreateCommand("findOne").WithPayload(findOptions).AddCommandOptions(commandOptions);
-        var response = await command.RunAsyncReturnData<DocumentResult<TResult>, FindStatusResult>(runSynchronously).ConfigureAwait(false);
+        var response = await command.RunAsyncReturnData<DocumentResult<TResult>, TableFindStatusResult>(runSynchronously).ConfigureAwait(false);
         if (typeof(Row).IsAssignableFrom(typeof(TResult)))
         {
-            // we are going to get the table definition and handle null values for missing columns
-            var tableInfos = runSynchronously ? _database.ListTables() : await _database.ListTablesAsync();
-            var tableInfo = tableInfos.FirstOrDefault(t => t.Name == _tableName);
-            PopulateMissingColumnsInRow(response.Data.Document as Row, tableInfo);
-
+            if (response != null && response.Data != null && response.Data.Document != null)
+            {
+                PopulateMissingColumnsInRow(response.Data.Document as Row, response.Status.ProjectionSchema);
+            }
         }
         return response.Data.Document;
     }
 
-    private void PopulateMissingColumnsInRow(Row row, TableInfo tableInfo)
+    private void PopulateMissingColumnsInRow(Row row, Dictionary<string, SchemaColumn> projectionSchema)
     {
-        foreach (var column in tableInfo.TableDefinition.Columns)
+        foreach (var column in projectionSchema)
         {
             if (!row.ContainsKey(column.Key))
             {
                 object value = null;
-                var columnType = ((Dictionary<string, object>)column.Value)["type"];
+                var columnType = column.Value.Type;
                 switch (columnType)
                 {
                     case "map":
@@ -1433,9 +1430,15 @@
         return new Command(name, _database.Client, optionsTree, new DatabaseCommandUrlBuilder(_database, _tableName));
     }
 
-    Task<ApiResponseWithData<ApiFindResult<TProjected>, FindStatusResult>> IQueryRunner<T, TableSortBuilder<T>>.RunFindManyAsync<TProjected>(Filter<T> filter, IFindManyOptions<T, TableSortBuilder<T>> findOptions, CommandOptions commandOptions, bool runSynchronously)
-        where TProjected : class
+    async Task<ApiResponseWithData<ApiFindResult<TProjected>, FindStatusResult>> IQueryRunner<T, TableSortBuilder<T>>.RunFindManyAsync<TProjected>(Filter<T> filter, IFindManyOptions<T, TableSortBuilder<T>> findOptions, CommandOptions commandOptions, bool runSynchronously)
     {
-        return RunFindManyAsync<TProjected>(filter, findOptions, commandOptions, runSynchronously);
+        var result = await RunFindManyAsync<TProjected>(filter, findOptions, commandOptions, runSynchronously).ConfigureAwait(false);
+        return new ApiResponseWithData<ApiFindResult<TProjected>, FindStatusResult>
+        {
+            Data = result.Data,
+            Status = result.Status,
+            Errors = result.Errors,
+            Warnings = result.Warnings
+        };
     }
 }

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/AdminFixture.cs

@@ -12,10 +12,14 @@ public class AdminFixture : BaseFixture
 	public AdminFixture(AssemblyFixture assemblyFixture) : base(assemblyFixture, "admin")
 	{
 		DatabaseName = assemblyFixture.DatabaseName;
-		DatabaseId = GetDatabaseIdFromUrl(assemblyFixture.DatabaseUrl).Value;
+		var dbId = GetDatabaseIdFromUrl(assemblyFixture.DatabaseUrl);
+		if (dbId != null)
+        {
+            DatabaseId = dbId.Value;
+        }
 	}
 
-	public DatabaseAdminAstra CreateAdmin(Database database = null)
+	public IDatabaseAdmin CreateAdmin(Database database = null)
 	{
 		database ??= Database;
 
@@ -25,7 +29,11 @@ public DatabaseAdminAstra CreateAdmin(Database database = null)
 			Environment = DBEnvironment.Production // or default
 		};
 
-		return new DatabaseAdminAstra(database, Client, adminOptions);
+		if (Destination.ToLower() == "astra") {
+			return new DatabaseAdminAstra(database, Client, adminOptions);
+		}
+
+		return new DatabaseAdminOther(database, Client, adminOptions);
 	}
 
 	public static Guid? GetDatabaseIdFromUrl(string url)

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/AssemblyFixture.cs

@@ -15,7 +15,7 @@ public class AssemblyFixture
 
     public string DatabaseUrl { get; private set; }
     public string DatabaseName { get; private set; }
-    public string Destination { get; private set; }
+    public string Destination { get; private set; } = "astra";
 
     public AssemblyFixture()
     {
@@ -30,7 +30,7 @@ public AssemblyFixture()
         OpenAiApiKey = configuration["OPENAI_APIKEYNAME"] ?? configuration["AstraDB:OpenAiApiKey"];
         DatabaseName = configuration["DATABASE_NAME"] ?? configuration["AstraDB:DatabaseName"];
         DatabaseUrl = configuration["URL"] ?? configuration["AstraDB:Url"];
-        Destination = configuration["DESTINATION"] ?? configuration["AstraDB:Destination"];
+        Destination = configuration["DESTINATION"] ?? configuration["AstraDB:Destination"] ?? "astra";
 
     }
 

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/BaseFixture.cs

@@ -12,6 +12,7 @@ public class BaseFixture
     public DataApiClient ClientWithoutToken { get; set; }
     public string DatabaseUrl { get; set; }
     public string Token { get; set; }
+    public string Destination => _assemblyFixture.Destination;
 
     public BaseFixture(AssemblyFixture assemblyFixture, string fixtureName)
     {

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/RerankFixture.cs

@@ -3,6 +3,8 @@
 using DataStax.AstraDB.DataApi.SerDes;
 using System.Text.Json.Serialization;
 using Xunit;
+using Xunit.v3;
+using Xunit.Sdk;
 
 namespace DataStax.AstraDB.DataApi.IntegrationTests.Fixtures;
 
@@ -24,6 +26,10 @@ public RerankFixture(AssemblyFixture assemblyFixture) : base(assemblyFixture, "r
 
     public async ValueTask InitializeAsync()
     {
+        if (Destination?.ToLower() != "astra")
+        {
+            return;
+        }
         await CreateSearchCollection();
         var collection = Database.GetCollection<HybridSearchTestObject>(_queryCollectionName);
         HybridSearchCollection = collection;

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/SkipWhenNotAstraAttribute.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Configuration;
+using System.Reflection;
+using Xunit.v3;
+
+namespace DataStax.AstraDB.DataApi.IntegrationTests.Fixtures;
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class)]
+public class SkipWhenNotAstraAttribute : BeforeAfterTestAttribute
+{
+    private static readonly Lazy<string> _destination = new(() =>
+    {
+        var config = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: true)
+            .AddEnvironmentVariables(prefix: "ASTRA_DB_")
+            .Build();
+        return (config["DESTINATION"] ?? config["AstraDB:Destination"])?.ToLower();
+    });
+
+    public override void Before(MethodInfo methodUnderTest, IXunitTest test)
+    {
+        var destination = _destination.Value;
+        if (!string.IsNullOrEmpty(destination) && destination != "astra")
+            throw new Exception($"{DynamicSkipToken.Value}Requires Astra destination (current: '{destination}')");
+    }
+}

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/TableAlterFixture.cs

@@ -14,16 +14,7 @@ public class TableAlterFixture : BaseFixture
 {
     public TableAlterFixture(AssemblyFixture assemblyFixture) : base(assemblyFixture, "tableAlter")
     {
-        try
-        {
-            var keyspaces = Database.GetAdmin().ListKeyspaces();
-            Console.WriteLine($"[Fixture] Connected. Keyspaces found: {keyspaces.Count()}");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"[Fixture] Connection failed: {ex.Message}");
-            throw;
-        }
+
     }
 
     public async Task<Table<RowEventByDay>> CreateTestTable(string tableName)

test/DataStax.AstraDB.DataApi.IntegrationTests/Fixtures/TableIndexesFixture.cs

@@ -13,16 +13,7 @@ public class TableIndexesFixture : BaseFixture, IAsyncLifetime
 {
     public TableIndexesFixture(AssemblyFixture assemblyFixture) : base(assemblyFixture, "tableIndexes")
     {
-        try
-        {
-            var keyspaces = Database.GetAdmin().ListKeyspaces();
-            Console.WriteLine($"[Fixture] Connected. Keyspaces found: {keyspaces.Count()}");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine($"[Fixture] Connection failed: {ex.Message}");
-            throw;
-        }
+
     }
 
     public Table<RowEventByDay> FixtureTestTable { get; private set; }