Revert "Update Posgres to psycopg3 (#19322)" (#19499) (#19504)

Co-authored-by: Enrico Donnici <[email protected]>
Co-authored-by: Seth Samuel <[email protected]>

Author: 3 people

.builders/images/helpers.ps1

@@ -38,11 +38,3 @@ function Add-ToPath() {
     $target="$oldPath;$Append"
     [Environment]::SetEnvironmentVariable("Path", $target, [System.EnvironmentVariableTarget]::User)
 }
-
-function RunOnVSConsole() {
-    param(
-        [Parameter(Mandatory = $true)][string] $Command
-    )
-    Write-Host "Running $Command"
-    Start-Process -Wait -NoNewWindow "cmd.exe" -ArgumentList "/c ""$Env:VCVARSALL_BAT"" $Env:DD_TARGET_ARCH && $Command"
-}

.builders/images/linux-aarch64/Dockerfile

@@ -91,7 +91,7 @@ RUN \
  --without-debugger \
  --disable-static
 
-# libpq and pg_config as needed by psycopg
+# libpq and pg_config as needed by psycopg2
 RUN \
  DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
  VERSION="16.0" \

.builders/images/linux-x86_64/Dockerfile

@@ -95,7 +95,7 @@ RUN \
  --without-debugger \
  --disable-static
 
-# libpq and pg_config as needed by psycopg
+# libpq and pg_config as needed by psycopg2
 RUN \
  DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
  VERSION="16.0" \

.builders/images/macos-x86_64/builder_setup.sh

@@ -94,13 +94,6 @@ RELATIVE_PATH="curl-{{version}}" \
 # Remove the binary installed so that we consistenly use the same original `curl` binary
 rm "${DD_PREFIX_PATH}/bin/curl"
 
-# libpq and pg_config as needed by psycopg
-DOWNLOAD_URL="https://ftp.postgresql.org/pub/source/v{{version}}/postgresql-{{version}}.tar.bz2" \
-VERSION="16.0" \
-SHA256="df9e823eb22330444e1d48e52cc65135a652a6fdb3ce325e3f08549339f51b99" \
-RELATIVE_PATH="postgresql-{{version}}" \
-  install-from-source --without-readline --with-openssl --without-icu
-
 # Dependencies needed to build librdkafka (and thus, confluent-kafka) with kerberos support
 DOWNLOAD_URL="https://github.com/LMDB/lmdb/archive/LMDB_{{version}}.tar.gz" \
 VERSION="0.9.29" \

.builders/images/windows-x86_64/Dockerfile

@@ -25,7 +25,6 @@ RUN curl -SL --output vs_buildtools.exe https://aka.ms/vs/17/release/vs_buildtoo
      --add Microsoft.VisualStudio.Workload.VCTools `
      || IF "%ERRORLEVEL%"=="3010" EXIT 0) `
  && del /q vs_buildtools.exe
-ENV VCVARSALL_BAT="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
 
 # Upgrade PowerShell
 ENV POWERSHELL_VERSION="7.4.0"
@@ -115,42 +114,7 @@ RUN Get-RemoteFile `
     Add-ToPath -Append "C:\perl\perl\bin" && `
     Remove-Item "strawberry-perl-$Env:PERL_VERSION-64bit.zip"
 
-# Nasm
-ENV NASM_VERSION="2.16.03"
-RUN Get-RemoteFile `
-      -Uri https://www.nasm.us/pub/nasm/releasebuilds/$Env:NASM_VERSION/win64/nasm-$Env:NASM_VERSION-win64.zip `
-      -Path "nasm-$Env:NASM_VERSION-win64.zip" `
-    -Hash '3ee4782247bcb874378d02f7eab4e294a84d3d15f3f6ee2de2f47a46aa7226e6' && `
-    7z x "nasm-$Env:NASM_VERSION-win64.zip" -o"C:\nasm" && `
-    Add-ToPath -Append "C:\nasm\nasm-$Env:NASM_VERSION" && `
-    Remove-Item "nasm-$Env:NASM_VERSION-win64.zip"
-# openssl
 ENV OPENSSL_VERSION="3.3.2"
-RUN Get-RemoteFile `
-      -Uri https://www.openssl.org/source/openssl-$Env:OPENSSL_VERSION.tar.gz `
-      -Path openssl-$Env:OPENSSL_VERSION.tar.gz `
-      -Hash '2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281'; `
-    7z x openssl-$Env:OPENSSL_VERSION.tar.gz -r -y && `
-    7z x openssl-$Env:OPENSSL_VERSION.tar -oC:\openssl_3 && `
-    cd C:\openssl_3\openssl-$Env:OPENSSL_VERSION && `
-    RunOnVSConsole -Command `
-    'C:\perl\perl\bin\perl.exe Configure && `
-    nmake && `
-    nmake install_sw'
-# libpq and pg_config as needed by psycopg
-ENV PG_VERSION="16.0"
-COPY pg_config.pl C:\pg_config.pl
-RUN Get-RemoteFile `
-      -Uri https://ftp.postgresql.org/pub/source/v$Env:PG_VERSION/postgresql-$Env:PG_VERSION.tar.bz2 `
-      -Path postgresql-$Env:PG_VERSION.tar.bz2 `
-      -Hash 'df9e823eb22330444e1d48e52cc65135a652a6fdb3ce325e3f08549339f51b99'; `
-    7z x postgresql-$Env:PG_VERSION.tar.bz2 -r -y && `
-    7z x postgresql-$Env:PG_VERSION.tar -oC:\postgresql_src && `
-    cd C:\postgresql_src\postgresql-$Env:PG_VERSION\src\tools\msvc && `
-    Copy-Item C:\pg_config.pl -Destination .\config.pl && `
-    RunOnVSConsole -Command 'C:\perl\perl\bin\perl.exe build.pl' && `
-    RunOnVSConsole -Command 'C:\perl\perl\bin\perl.exe install.pl C:\postgresql' && `
-    Add-ToPath -Append "C:\postgresql\bin"
 
 ENV CURL_VERSION="8.11.1"
 

.builders/images/windows-x86_64/pg_config.pl

@@ -83,8 +83,6 @@ oauthlib = ['BSD-3-Clause']
 mmh3 = ['CC0-1.0']
 # https://github.com/paramiko/paramiko/blob/master/LICENSE
 paramiko = ['LGPL-2.1-only']
-# https://github.com/psycopg/psycopg/blob/master/LICENSE.txt
-psycopg = ['LGPL-3.0-only']
 # https://github.com/psycopg/psycopg2/blob/master/LICENSE
 # https://github.com/psycopg/psycopg2/blob/master/doc/COPYING.LESSER
 psycopg2-binary = ['LGPL-3.0-only', 'BSD-3-Clause']

.ddev/ci/scripts/postgres/linux/50_install_postgres.sh

@@ -45,7 +45,6 @@ ply,PyPI,BSD-3-Clause,Copyright (C) 2001-2018
 prometheus-client,PyPI,Apache-2.0,Copyright 2015 The Prometheus Authors
 protobuf,PyPI,BSD-3-Clause,Copyright 2008 Google Inc.  All rights reserved.
 psutil,PyPI,BSD-3-Clause,"Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola"
-psycopg,PyPI,LGPL-3.0-only,Copyright (C) 2020 The Psycopg Team
 psycopg2-binary,PyPI,BSD-3-Clause,Copyright 2013 Federico Di Gregorio
 psycopg2-binary,PyPI,LGPL-3.0-only,Copyright (C) 2013 Federico Di Gregorio
 pyOpenSSL,PyPI,Apache-2.0,Copyright The pyOpenSSL developers

.ddev/config.toml

@@ -32,7 +32,6 @@ prometheus-client==0.21.1
 protobuf==5.29.3
 psutil==6.0.0
 psycopg2-binary==2.9.9
-psycopg[c]==3.2.3
 pyasn1==0.4.8
 pycryptodomex==3.21.0
 pydantic==2.10.5