Merge pull request #29 from microsoft/dev/tkotian/sync-ado-main-to-github-main

Author: saurabh500

.pipeline/sync-development-to-main.yml

@@ -0,0 +1,70 @@
+# Pipeline to create a PR from development to main after a PR merges into development.
+# Can also be triggered manually. Skips PR creation if:
+# - A PR from development to main already exists
+# - There are no changes between development and main
+
+trigger: none
+
+pr: none
+
+resources:
+  repositories:
+  - repository: self
+    type: git
+    ref: development
+
+pool:
+  vmImage: ubuntu-latest
+
+steps:
+- checkout: self
+  fetchDepth: 0
+  persistCredentials: true
+
+- script: |
+    git fetch origin main development
+    if git diff --quiet origin/main..origin/development; then
+      echo "No changes between development and main. Skipping."
+      echo "##vso[task.setvariable variable=hasChanges]false"
+    else
+      echo "Changes detected between development and main."
+      echo "##vso[task.setvariable variable=hasChanges]true"
+    fi
+  displayName: Check for changes
+
+- script: |
+    PR_EXISTS=$(az repos pr list \
+      --organization "$(System.TeamFoundationCollectionUri)" \
+      --project "$(System.TeamProject)" \
+      --repository "$(Build.Repository.Name)" \
+      --source-branch development \
+      --target-branch main \
+      --status active \
+      --query "[0].pullRequestId" \
+      --output tsv)
+
+    if [ -n "$PR_EXISTS" ]; then
+      echo "Active PR #$PR_EXISTS already exists. Skipping."
+      echo "##vso[task.setvariable variable=prExists]true"
+    else
+      echo "No active PR found."
+      echo "##vso[task.setvariable variable=prExists]false"
+    fi
+  displayName: Check for existing PR
+  condition: eq(variables['hasChanges'], 'true')
+  env:
+    AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)
+
+- script: |
+    az repos pr create \
+      --organization "$(System.TeamFoundationCollectionUri)" \
+      --project "$(System.TeamProject)" \
+      --repository "$(Build.Repository.Name)" \
+      --source-branch development \
+      --target-branch main \
+      --title "Sync development to main" \
+      --description $'Sync of development to main branch.\n\nBefore merging this PR, ensure that the CI has had a good run on the development branch.'
+  displayName: Create PR
+  condition: and(eq(variables['hasChanges'], 'true'), eq(variables['prExists'], 'false'))
+  env:
+    AZURE_DEVOPS_EXT_PAT: $(System.AccessToken)

.pipeline/templates/build-template.yml

@@ -121,6 +121,7 @@ steps:
     env:
       SQL_PASSWORD: $(SQL_PASSWORD)
       RUST_BACKTRACE: full
+      SSPI_TEST: '1'
 
   - task: PublishTestResults@2
     condition: and(succeededOrFailed(), eq(variables['Build.Reason'], 'PullRequest'))

.pipeline/templates/sql-setup-template.yml

@@ -31,6 +31,19 @@ steps:
         Restart-Service -Name 'MSSQLSERVER' -Force
         sqlcmd -Q "ALTER SERVER ROLE sysadmin ADD MEMBER testuser;"
         sqlcmd -S localhost,1433 -U sa -P $(SQL_PASSWORD) -Q "SELECT @@VERSION"
+
+        # Setup the same logins on the SQLDEV named instance (used by SSRP tests)
+        $svc = Get-Service -Name 'MSSQL$SQLDEV' -ErrorAction SilentlyContinue
+        if ($svc -and $svc.Status -eq 'Running') {
+          echo "Configuring logins on SQLDEV instance..."
+          sqlcmd -S "localhost\SQLDEV" -C -Q "EXEC xp_instance_regwrite N'HKEY_LOCAL_MACHINE', N'Software\Microsoft\MSSQLServer\MSSQLServer', N'LoginMode', REG_DWORD, 2"
+          sqlcmd -S "localhost\SQLDEV" -C -Q "ALTER LOGIN sa ENABLE; ALTER LOGIN sa WITH CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF; ALTER LOGIN sa WITH PASSWORD = '$(SQL_PASSWORD)'; IF NOT EXISTS (SELECT 1 FROM sys.server_principals WHERE name = 'testuser') CREATE LOGIN testuser WITH PASSWORD = '$(SQL_PASSWORD)', CHECK_POLICY = OFF, CHECK_EXPIRATION = OFF; ALTER SERVER ROLE sysadmin ADD MEMBER testuser;"
+          Restart-Service -Name 'MSSQL$SQLDEV' -Force
+          sqlcmd -S "localhost\SQLDEV" -C -U sa -P "$(SQL_PASSWORD)" -Q "SELECT @@VERSION"
+          echo "SQLDEV instance configured."
+        } else {
+          echo "SQLDEV instance not found or not running — skipping."
+        }
     env:
       SQL_PASSWORD: $(SQL_PASSWORD)
 

mssql-mock-tds/src/lib.rs

@@ -26,7 +26,7 @@ pub mod tds_tls_wrapper;
 pub mod tls_helper;
 
 pub use query_response::{
-    ColumnDefinition, ColumnValue, QueryRegistry, QueryResponse, Row, SqlDataType,
+    ColumnDefinition, ColumnValue, InfoMessage, QueryRegistry, QueryResponse, Row, SqlDataType,
 };
 pub use server::{ConnectionInfo, ConnectionStore, MockTdsServer, RedirectionConfig};
 pub use tds_tls_wrapper::TdsTlsWrapper;

mssql-mock-tds/src/protocol.rs

@@ -614,6 +614,54 @@ pub fn build_done_token(row_count: u64) -> BytesMut {
     token_data
 }
 
+/// Build an INFO token (0xAB) matching the TDS wire format.
+///
+/// Wire layout (all integers little-endian):
+///   0xAB | u16 length | u32 number | u8 state | u8 severity
+///   | US_VARCHAR message | B_VARCHAR server_name | B_VARCHAR proc_name | u32 line_number
+///
+/// US_VARCHAR: u16 char-count prefix + UTF-16LE data
+/// B_VARCHAR:  u8  char-count prefix + UTF-16LE data
+pub fn build_info_token(info: &crate::query_response::InfoMessage) -> BytesMut {
+    let mut buf = BytesMut::new();
+
+    buf.put_u8(TokenType::Info as u8);
+
+    let msg_units: Vec<u16> = info.message.encode_utf16().collect();
+    let srv_units: Vec<u16> = info.server_name.encode_utf16().collect();
+    let proc_units: Vec<u16> = info.proc_name.encode_utf16().collect();
+
+    // token_len covers everything after the 2-byte length field
+    let token_len: u16 = 4 + 1 + 1 // number, state, severity
+        + 2 + (msg_units.len() * 2) as u16  // US_VARCHAR
+        + 1 + (srv_units.len() * 2) as u16  // B_VARCHAR
+        + 1 + (proc_units.len() * 2) as u16 // B_VARCHAR
+        + 4; // line_number
+    buf.put_u16_le(token_len);
+
+    buf.put_u32_le(info.number);
+    buf.put_u8(info.state);
+    buf.put_u8(info.severity);
+
+    buf.put_u16_le(msg_units.len() as u16);
+    for u in &msg_units {
+        buf.put_u16_le(*u);
+    }
+
+    buf.put_u8(srv_units.len() as u8);
+    for u in &srv_units {
+        buf.put_u16_le(*u);
+    }
+
+    buf.put_u8(proc_units.len() as u8);
+    for u in &proc_units {
+        buf.put_u16_le(*u);
+    }
+
+    buf.put_u32_le(info.line_number);
+    buf
+}
+
 /// Build a query result from a QueryResponse
 pub fn build_query_result(response: &crate::query_response::QueryResponse) -> BytesMut {
     let mut result = BytesMut::new();
@@ -644,6 +692,11 @@ pub fn build_query_result(response: &crate::query_response::QueryResponse) -> By
         }
     }
 
+    // Inject Info tokens between ColMetadata and Rows (Fabric DW behavior)
+    for info in &response.info_tokens {
+        result.extend_from_slice(&build_info_token(info));
+    }
+
     // Serialize each row
     for row in &response.rows {
         result.put_u8(TokenType::Row as u8);

mssql-mock-tds/src/query_response.rs

@@ -133,24 +133,64 @@ impl Row {
     }
 }
 
+/// An informational message injected into the result stream.
+///
+/// Fabric DW injects these between ColMetadata and Row tokens with tracing
+/// metadata (Statement ID, Query hash, Distributed request ID).
+#[derive(Debug, Clone)]
+pub struct InfoMessage {
+    pub number: u32,
+    pub state: u8,
+    pub severity: u8,
+    pub message: String,
+    pub server_name: String,
+    pub proc_name: String,
+    pub line_number: u32,
+}
+
+impl InfoMessage {
+    pub fn new(number: u32, severity: u8, message: impl Into<String>) -> Self {
+        Self {
+            number,
+            state: 1,
+            severity,
+            message: message.into(),
+            server_name: String::new(),
+            proc_name: String::new(),
+            line_number: 0,
+        }
+    }
+}
+
 /// A complete query response definition
 #[derive(Debug, Clone)]
 pub struct QueryResponse {
     pub columns: Vec<ColumnDefinition>,
     pub rows: Vec<Row>,
+    pub info_tokens: Vec<InfoMessage>,
 }
 
 impl QueryResponse {
     /// Create a new query response
     pub fn new(columns: Vec<ColumnDefinition>, rows: Vec<Row>) -> Self {
-        Self { columns, rows }
+        Self {
+            columns,
+            rows,
+            info_tokens: Vec::new(),
+        }
+    }
+
+    pub fn with_info_tokens(mut self, info_tokens: Vec<InfoMessage>) -> Self {
+        self.info_tokens = info_tokens;
+        self
     }
 
     /// Helper to create a response for SELECT 1
     pub fn select_one() -> Self {
         Self {
             columns: vec![ColumnDefinition::new("", SqlDataType::Int)],
             rows: vec![Row::new(vec![ColumnValue::Int(1)])],
+            info_tokens: Vec::new(),
         }
     }
 
@@ -167,6 +207,7 @@ impl QueryResponse {
                 ColumnValue::Int(2),
                 ColumnValue::Int(3),
             ])],
+            info_tokens: Vec::new(),
         }
     }
 }

mssql-mock-tds/src/server.rs

@@ -55,6 +55,8 @@ pub struct ConnectionProcessor {
     received_token: Option<Vec<u8>>,
     /// User Agent received during authentication (if any)
     pub user_agent: Option<String>,
+    /// ServerName received in the Login7 packet
+    received_server_name: Option<String>,
     /// Reference to the shared query registry
     query_registry: Arc<Mutex<QueryRegistry>>,
     /// Packet buffer for this connection
@@ -71,6 +73,7 @@ impl ConnectionProcessor {
             is_authenticated: false,
             received_token: None,
             user_agent: None,
+            received_server_name: None,
             query_registry,
             buffer: BytesMut::with_capacity(4096),
             redirection: None,
@@ -88,6 +91,7 @@ impl ConnectionProcessor {
             is_authenticated: false,
             received_token: None,
             user_agent: None,
+            received_server_name: None,
             query_registry,
             buffer: BytesMut::with_capacity(4096),
             redirection,
@@ -109,6 +113,11 @@ impl ConnectionProcessor {
         self.received_token.as_deref()
     }
 
+    /// Get the ServerName received in the Login7 packet
+    pub fn received_server_name(&self) -> Option<&str> {
+        self.received_server_name.as_deref()
+    }
+
     /// Get the received access token as a UTF-16LE decoded string
     pub fn received_token_as_string(&self) -> Option<String> {
         self.received_token.as_ref().and_then(|bytes| {
@@ -175,13 +184,16 @@ impl ConnectionProcessor {
                 // Log the server name sent by client (important for verifying redirection behavior)
                 if let Some(ref server_name) = auth_info.server_name {
                     info!(
-                        "Login7 from {}: client sent ServerName='{}'",
+                        "Login7 from {}: client sent ServerName={:?}",
                         self.addr, server_name
                     );
                 } else {
                     info!("Login7 from {}: no ServerName in packet", self.addr);
                 }
 
+                // Store the server name for test verification
+                self.received_server_name = auth_info.server_name.clone();
+
                 // FedAuth is always supported - check if client used it
                 if auth_info.has_fedauth {
                     let token_len = auth_info
@@ -336,6 +348,8 @@ pub struct ConnectionInfo {
     pub authenticated: bool,
     /// User Agent received during authentication (if any)
     pub user_agent: Option<String>,
+    /// ServerName received in the Login7 packet
+    pub received_server_name: Option<String>,
 }
 
 impl ConnectionInfo {
@@ -373,6 +387,7 @@ impl ConnectionStore {
             received_token: processor.received_token().map(|t| t.to_vec()),
             authenticated: processor.is_authenticated(),
             user_agent: processor.user_agent.clone(),
+            received_server_name: processor.received_server_name().map(|s| s.to_string()),
         };
         self.connections.insert(processor.addr(), info);
     }

mssql-py-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mssql-py-core"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2024"
 publish = false
 

mssql-tds/src/connection.rs

@@ -15,6 +15,7 @@ pub mod client_context;
 pub(crate) mod connection_actions;
 pub(crate) mod datasource_parser;
 pub(crate) mod execution_context;
+pub(crate) mod instance_cache;
 pub(crate) mod metadata_retriever;
 /// ODBC-style authentication keyword transform.
 pub mod odbc_authentication_transformer;