Merge branch 'main' into saumya/test

Author: gargsaumya

OneBranchPipelines/github-ado-sync.yml

@@ -1,5 +1,18 @@
 # GitHub-to-ADO Sync Pipeline
 # Syncs main branch from public GitHub to internal Azure DevOps daily at 5pm IST
+#
+# SYNC STRATEGY RATIONALE:
+# This pipeline uses a "replace-all" approach rather than traditional git merge/rebase because:
+# 1. DIVERGENT HISTORY: ADO repository contains commits from early development that don't exist
+#    in GitHub. These historical commits were made before GitHub became the source of truth.
+# 2. AVOIDING CONFLICTS: Standard git operations (merge, rebase, reset --hard) fail when
+#    repositories have divergent commit histories. Attempting to merge results in conflicts
+#    that cannot be automatically resolved.
+# 3. IMPLEMENTATION: We use 'git fetch + git rm + git checkout' to completely replace ADO's
+#    working tree with GitHub's files without attempting to reconcile git history. This creates
+#    a clean sync commit that updates all files to match GitHub exactly.
+# 4. CHANGE DETECTION: The pipeline checks if any files actually differ before creating PRs,
+#    avoiding unnecessary sync operations when repositories are already aligned.
 
 name: GitHub-Sync-$(Date:yyyyMMdd)$(Rev:.r)
 
@@ -21,25 +34,15 @@ jobs:
     vmImage: 'windows-latest'
 
   steps:
-  - checkout: none
+  - checkout: self
+    persistCredentials: true
 
   - task: CmdLine@2
-    displayName: 'Clone GitHub repo'
+    displayName: 'Add GitHub remote'
     inputs:
-      script: git clone https://github.com/microsoft/mssql-python.git repo-dir -b main
-      workingDirectory: $(Agent.TempDirectory)
-
-  - task: CmdLine@2
-    displayName: 'Add Azure DevOps remote'
-    inputs:
-      script: git remote add azdo-mirror https://$(System.AccessToken)@sqlclientdrivers.visualstudio.com/mssql-python/_git/mssql-python
-      workingDirectory: $(Agent.TempDirectory)/repo-dir
-
-  - task: CmdLine@2
-    displayName: 'Fetch ADO repo'
-    inputs:
-      script: git fetch azdo-mirror
-      workingDirectory: $(Agent.TempDirectory)/repo-dir
+      script: |
+        git remote add github https://github.com/microsoft/mssql-python.git
+        git fetch github main
 
   - task: CmdLine@2
     displayName: 'Create timestamped sync branch'
@@ -51,26 +54,35 @@ jobs:
         set SYNC_BRANCH=github-sync-%TIMESTAMP%
         echo %SYNC_BRANCH% > branchname.txt
         echo Creating sync branch: %SYNC_BRANCH%
-        git fetch azdo-mirror
-        git show-ref --verify --quiet refs/remotes/azdo-mirror/main
-        if %ERRORLEVEL% EQU 0 (
-          git checkout -b %SYNC_BRANCH% -t azdo-mirror/main
-        ) else (
-          echo azdo-mirror/main does not exist. Exiting.
-          exit /b 1
-        )
+        git checkout -b %SYNC_BRANCH%
         echo ##vso[task.setvariable variable=SYNC_BRANCH;isOutput=true]%SYNC_BRANCH%
-      workingDirectory: $(Agent.TempDirectory)/repo-dir
 
   - task: CmdLine@2
-    displayName: 'Reset branch to match GitHub main exactly'
+    displayName: 'Sync with GitHub main'
     inputs:
       script: |
-        git -c user.email="sync@microsoft.com" -c user.name="ADO Sync Bot" reset --hard origin/main
-      workingDirectory: $(Agent.TempDirectory)/repo-dir
+        echo Syncing with GitHub main...
+        git config user.email "sync@microsoft.com"
+        git config user.name "ADO Sync Bot"
+        
+        git fetch github main
+        git rm -rf .
+        git checkout github/main -- .
+        echo timestamp.txt >> .git\info\exclude
+        echo branchname.txt >> .git\info\exclude
+        git diff --cached --quiet
+        if %ERRORLEVEL% EQU 0 (
+          echo No changes detected. Skipping commit.
+          echo ##vso[task.setvariable variable=HAS_CHANGES]false
+        ) else (
+          echo Changes detected. Creating commit...
+          git add . && git commit -m "Sync from GitHub main"
+          echo ##vso[task.setvariable variable=HAS_CHANGES]true
+        )
 
   - task: CmdLine@2
     displayName: 'Push branch to Azure DevOps'
+    condition: eq(variables['HAS_CHANGES'], 'true')
     inputs:
       script: |
         set /p SYNC_BRANCH=<branchname.txt
@@ -79,18 +91,18 @@ jobs:
         git config user.email "sync@microsoft.com"
         git config user.name "ADO Sync Bot"
         
-        git push azdo-mirror %SYNC_BRANCH% --set-upstream
+        git push origin %SYNC_BRANCH% --set-upstream
         
         if %ERRORLEVEL% EQU 0 (
           echo Branch pushed successfully!
         ) else (
           echo ERROR: Push failed!
           exit /b 1
         )
-      workingDirectory: $(Agent.TempDirectory)/repo-dir
 
   - task: CmdLine@2
     displayName: 'Create pull request'
+    condition: eq(variables['HAS_CHANGES'], 'true')
     inputs:
       script: |
         echo Installing Azure DevOps extension...
@@ -124,4 +136,3 @@ jobs:
         
         if exist timestamp.txt del timestamp.txt
         if exist branchname.txt del branchname.txt
-      workingDirectory: $(Agent.TempDirectory)/repo-dir

mssql_python/connection_string_builder.py

@@ -77,10 +77,9 @@ def _escape_value(self, value: str) -> str:
         """
         Escape a parameter value if it contains special characters.
 
-        Per MS-ODBCSTR specification:
         - Values containing ';', '{', '}', '=', or spaces should be braced for safety
         - '}' inside braced values is escaped as '}}'
-        - '{' inside braced values is escaped as '{{'
+        - '{' does not need to be escaped
 
         Args:
             value: Parameter value to escape
@@ -95,7 +94,7 @@ def _escape_value(self, value: str) -> str:
             >>> builder._escape_value("local;host")
             '{local;host}'
             >>> builder._escape_value("p}w{d")
-            '{p}}w{{d}'
+            '{p}}w{d}'
             >>> builder._escape_value("ODBC Driver 18 for SQL Server")
             '{ODBC Driver 18 for SQL Server}'
         """
@@ -107,8 +106,9 @@ def _escape_value(self, value: str) -> str:
         needs_braces = any(ch in value for ch in ";{}= ")
 
         if needs_braces:
-            # Escape existing braces by doubling them
-            escaped = value.replace("}", "}}").replace("{", "{{")
+            # Escape closing braces by doubling them (ODBC requirement)
+            # Opening braces do not need to be escaped
+            escaped = value.replace("}", "}}")
             return f"{{{escaped}}}"
         else:
             return value

mssql_python/connection_string_parser.py

@@ -7,7 +7,7 @@
 Handles ODBC-specific syntax per MS-ODBCSTR specification:
 - Semicolon-separated key=value pairs
 - Braced values: {value}
-- Escaped braces: }} → }, {{ → {
+- Escaped braces: }} → } (only closing braces need escaping)
 
 Parser behavior:
 - Validates all key=value pairs
@@ -331,7 +331,7 @@ def _parse_braced_value(self, connection_str: str, start_pos: int) -> Tuple[str,
         Braced values:
         - Start with '{' and end with '}'
         - '}' inside the value is escaped as '}}'
-        - '{' inside the value is escaped as '{{'
+        - '{' inside the value does not need escaping
         - Can contain semicolons and other special characters
 
         Args:
@@ -366,18 +366,8 @@ def _parse_braced_value(self, connection_str: str, start_pos: int) -> Tuple[str,
                     # Single '}' means end of braced value
                     start_pos += 1
                     return "".join(value), start_pos
-            elif ch == "{":
-                # Check if it's an escaped left brace
-                if start_pos + 1 < str_len and connection_str[start_pos + 1] == "{":
-                    # Escaped left brace: '{{' → '{'
-                    value.append("{")
-                    start_pos += 2
-                else:
-                    # Single '{' inside braced value - keep it as is
-                    value.append(ch)
-                    start_pos += 1
             else:
-                # Regular character
+                # Regular character (including '{' which doesn't need escaping per ODBC spec)
                 value.append(ch)
                 start_pos += 1
 

tests/test_010_connection_string_parser.py

@@ -61,13 +61,13 @@ def test_parse_braced_value_with_escaped_right_brace(self):
         """Test parsing braced values with escaped }}."""
         parser = _ConnectionStringParser()
         result = parser._parse("PWD={p}}w{{d}")
-        assert result == {"pwd": "p}w{d"}
+        assert result == {"pwd": "p}w{{d"}
 
     def test_parse_braced_value_with_all_escapes(self):
-        """Test parsing braced values with both {{ and }} escapes."""
+        """Test parsing braced values with }} escape ({{ not an escape sequence)."""
         parser = _ConnectionStringParser()
         result = parser._parse("Value={test}}{{escape}")
-        assert result == {"value": "test}{escape"}
+        assert result == {"value": "test}{{escape"}
 
     def test_parse_empty_value(self):
         """Test that empty value raises error."""
@@ -146,10 +146,10 @@ def test_parse_braced_value_with_left_brace(self):
         assert result == {"value": "test{value"}
 
     def test_parse_braced_value_double_left_brace(self):
-        """Test parsing braced value with escaped {{ (left brace)."""
+        """Test parsing braced value with {{ (not an escape sequence)."""
         parser = _ConnectionStringParser()
         result = parser._parse("Value={test{{value}")
-        assert result == {"value": "test{value"}
+        assert result == {"value": "test{{value"}
 
     def test_parse_unicode_characters(self):
         """Test parsing values with unicode characters."""
@@ -197,7 +197,7 @@ def test_parse_special_characters_in_braced_values(self):
 
         # Multiple special chars including braces
         result = parser._parse("Token={Bearer: abc123; Expires={{2024-01-01}}}")
-        assert result == {"token": "Bearer: abc123; Expires={2024-01-01}"}
+        assert result == {"token": "Bearer: abc123; Expires={{2024-01-01}"}
 
     def test_parse_numbers_and_symbols_in_passwords(self):
         """Test parsing passwords with various numbers and symbols."""