Upgrade to mysql2 0.5.5.
This commit is contained in:
parent
29e57aeffa
commit
88471b91cd
6
.gitignore
vendored
6
.gitignore
vendored
@ -1,4 +1,2 @@
|
|||||||
SOURCES/mysql2-0.5.3-tests.txz
|
/mysql2-*.gem
|
||||||
SOURCES/mysql2-0.5.3.gem
|
/mysql2-*-tests.txz
|
||||||
/mysql2-0.5.3-tests.txz
|
|
||||||
/mysql2-0.5.3.gem
|
|
||||||
|
2
.rubygem-mysql2.metadata
Normal file
2
.rubygem-mysql2.metadata
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
40bb98b39e2d8f3521c6a4350a66a3c0ac9e2dd9 mysql2-0.5.5.gem
|
||||||
|
e1f5106dda376545c654f64f0ea7b8609f03a220 mysql2-0.5.5-tests.txz
|
@ -1,22 +0,0 @@
|
|||||||
From cca57b97ad6d1b1b985376be110b89d2b487dea6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Aaron Patterson <tenderlove@ruby-lang.org>
|
|
||||||
Date: Tue, 30 Nov 2021 12:59:43 -0800
|
|
||||||
Subject: [PATCH] fix assertion on maria
|
|
||||||
|
|
||||||
downgrade psych
|
|
||||||
---
|
|
||||||
spec/mysql2/client_spec.rb | 2 +-
|
|
||||||
|
|
||||||
diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
|
|
||||||
index 1519e0f5d..41fb834bf 100644
|
|
||||||
--- a/spec/mysql2/client_spec.rb
|
|
||||||
+++ b/spec/mysql2/client_spec.rb
|
|
||||||
@@ -573,7 +573,7 @@ def run_gc
|
|
||||||
end
|
|
||||||
expect do
|
|
||||||
@client.query("SELECT SLEEP(1)")
|
|
||||||
- end.to raise_error(Mysql2::Error, /Lost connection to MySQL server/)
|
|
||||||
+ end.to raise_error(Mysql2::Error, /Lost connection/)
|
|
||||||
|
|
||||||
if RUBY_PLATFORM !~ /mingw|mswin/
|
|
||||||
expect do
|
|
@ -1,38 +0,0 @@
|
|||||||
From 4dce466f3ff1c90099d3dc1bf610bfab840d3631 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jean Boussier <jean.boussier@gmail.com>
|
|
||||||
Date: Fri, 26 Nov 2021 13:17:05 +0100
|
|
||||||
Subject: [PATCH] Update Mysql2::Result spec for Ruby 3.1
|
|
||||||
|
|
||||||
Ruby 3.1 immediately raise a TypeError if you try to
|
|
||||||
instantiate a class that doesn't have an allocator,
|
|
||||||
which is what we want anyways.
|
|
||||||
---
|
|
||||||
spec/mysql2/result_spec.rb | 17 +++++++++++------
|
|
||||||
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/spec/mysql2/result_spec.rb b/spec/mysql2/result_spec.rb
|
|
||||||
index 47a4a6de..2af6e609 100644
|
|
||||||
--- a/spec/mysql2/result_spec.rb
|
|
||||||
+++ b/spec/mysql2/result_spec.rb
|
|
||||||
@@ -6,11 +6,16 @@
|
|
||||||
end
|
|
||||||
|
|
||||||
it "should raise a TypeError exception when it doesn't wrap a result set" do
|
|
||||||
- r = Mysql2::Result.new
|
|
||||||
- expect { r.count }.to raise_error(TypeError)
|
|
||||||
- expect { r.fields }.to raise_error(TypeError)
|
|
||||||
- expect { r.size }.to raise_error(TypeError)
|
|
||||||
- expect { r.each }.to raise_error(TypeError)
|
|
||||||
+ if RUBY_VERSION >= "3.1"
|
|
||||||
+ expect { Mysql2::Result.new }.to raise_error(TypeError)
|
|
||||||
+ expect { Mysql2::Result.allocate }.to raise_error(TypeError)
|
|
||||||
+ else
|
|
||||||
+ r = Mysql2::Result.new
|
|
||||||
+ expect { r.count }.to raise_error(TypeError)
|
|
||||||
+ expect { r.fields }.to raise_error(TypeError)
|
|
||||||
+ expect { r.size }.to raise_error(TypeError)
|
|
||||||
+ expect { r.each }.to raise_error(TypeError)
|
|
||||||
+ end
|
|
||||||
end
|
|
||||||
|
|
||||||
it "should have included Enumerable" do
|
|
29
rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
Normal file
29
rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 06512d47dc1491bf5686b2bd89a8555de9f2acc9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jun Aruga <jaruga@redhat.com>
|
||||||
|
Date: Thu, 22 Dec 2022 16:14:39 +0100
|
||||||
|
Subject: [PATCH] Use the SSL pem files in the Git repository.
|
||||||
|
|
||||||
|
---
|
||||||
|
spec/mysql2/client_spec.rb | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
|
||||||
|
index 5861882..3f5cda8 100644
|
||||||
|
--- a/spec/mysql2/client_spec.rb
|
||||||
|
+++ b/spec/mysql2/client_spec.rb
|
||||||
|
@@ -154,9 +154,9 @@ RSpec.describe Mysql2::Client do # rubocop:disable Metrics/BlockLength
|
||||||
|
let(:option_overrides) do
|
||||||
|
{
|
||||||
|
'host' => 'mysql2gem.example.com', # must match the certificates
|
||||||
|
- :sslkey => '/etc/mysql/client-key.pem',
|
||||||
|
- :sslcert => '/etc/mysql/client-cert.pem',
|
||||||
|
- :sslca => '/etc/mysql/ca-cert.pem',
|
||||||
|
+ :sslkey => 'spec/ssl/client-key.pem',
|
||||||
|
+ :sslcert => 'spec/ssl/client-cert.pem',
|
||||||
|
+ :sslca => 'spec/ssl/ca-cert.pem',
|
||||||
|
:sslcipher => 'DHE-RSA-AES256-SHA',
|
||||||
|
:sslverify => true,
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.38.1
|
||||||
|
|
@ -5,24 +5,18 @@
|
|||||||
%global gem_name mysql2
|
%global gem_name mysql2
|
||||||
|
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 0.5.3
|
Version: 0.5.5
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A simple, fast Mysql library for Ruby, binding to libmysql
|
Summary: A simple, fast Mysql library for Ruby, binding to libmysql
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/brianmario/mysql2
|
URL: https://github.com/brianmario/mysql2
|
||||||
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
# git clone --no-checkout https://github.com/brianmario/mysql2.git
|
# git clone --no-checkout https://github.com/brianmario/mysql2.git
|
||||||
# cd mysql2 && git archive -v -o mysql2-0.5.3-tests.txz 0.5.3 spec/
|
# cd mysql2 && git archive -v -o mysql2-0.5.5-tests.txz 0.5.5 spec/
|
||||||
Source1: %{gem_name}-%{version}-tests.txz
|
Source1: %{gem_name}-%{version}-tests.txz
|
||||||
# Ruby 3.1 immediately raises a TypeError if you try to instantiate a class
|
# Use the SSL pem files in the upstream repositry for the SSL tests.
|
||||||
# that doesn't have an allocator, which is desired behaviour anyways.
|
# https://github.com/brianmario/mysql2/pull/1293
|
||||||
# https://github.com/brianmario/mysql2/pull/1219
|
Patch0: rubygem-mysql2-0.5.4-use-ssl-pem-files-in-repo.patch
|
||||||
# https://github.com/brianmario/mysql2/commit/62003225f3b25c36c221f01f7905658848895410
|
|
||||||
# Modified to allow patch application.
|
|
||||||
Patch1: rubygem-mysql2-0.5.3-update-Mysql2_Result-spec.patch
|
|
||||||
# Fix test assertion for mariadb-connector-c
|
|
||||||
# https://github.com/brianmario/mysql2/commit/cca57b97ad6d1b1b985376be110b89d2b487dea6
|
|
||||||
Patch2: rubygem-mysql2-0.5.3-fix-assertion-mariadb-connector-c.patch
|
|
||||||
|
|
||||||
# Required in lib/mysql2.rb
|
# Required in lib/mysql2.rb
|
||||||
Requires: rubygem(bigdecimal)
|
Requires: rubygem(bigdecimal)
|
||||||
@ -41,6 +35,8 @@ BuildRequires: rubygem(bigdecimal)
|
|||||||
# Comment out to prevent a build error by conflicting requests.
|
# Comment out to prevent a build error by conflicting requests.
|
||||||
# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine.
|
# Nothing provides libruby.so.2.4()(64bit) needed by rubygem-eventmachine.
|
||||||
#BuildRequires: rubygem(eventmachine)
|
#BuildRequires: rubygem(eventmachine)
|
||||||
|
# Used in spec/ssl/gen_certs.sh
|
||||||
|
BuildRequires: %{_bindir}/openssl
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -62,16 +58,11 @@ Documentation for %{name}
|
|||||||
%setup -q -n %{gem_name}-%{version} -b 1
|
%setup -q -n %{gem_name}-%{version} -b 1
|
||||||
|
|
||||||
pushd %{_builddir}/spec
|
pushd %{_builddir}/spec
|
||||||
%patch1 -p2
|
%patch -P 0 -p2
|
||||||
%patch2 -p2
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Create the gem as gem install only works on a gem file
|
|
||||||
gem build ../%{gem_name}-%{version}.gemspec
|
gem build ../%{gem_name}-%{version}.gemspec
|
||||||
|
|
||||||
# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
|
|
||||||
# by default, so that we can move it into the buildroot in %%install
|
|
||||||
%gem_install
|
%gem_install
|
||||||
|
|
||||||
|
|
||||||
@ -95,6 +86,24 @@ pushd .%{gem_instdir}
|
|||||||
ln -s %{_builddir}/spec spec
|
ln -s %{_builddir}/spec spec
|
||||||
|
|
||||||
TOP_DIR=$(pwd)
|
TOP_DIR=$(pwd)
|
||||||
|
|
||||||
|
# Regenerate the SSL certification files from the localhost, as we cannot set
|
||||||
|
# the host mysql2gem.example.com required for the SSL tests.
|
||||||
|
# https://github.com/brianmario/mysql2/pull/1296
|
||||||
|
sed -i '/host/ s/mysql2gem\.example\.com/localhost/' spec/mysql2/client_spec.rb
|
||||||
|
sed -i '/commonName_default/ s/mysql2gem\.example\.com/localhost/' spec/ssl/gen_certs.sh
|
||||||
|
pushd spec/ssl
|
||||||
|
bash gen_certs.sh
|
||||||
|
popd
|
||||||
|
|
||||||
|
# See https://github.com/brianmario/mysql2/blob/master/ci/ssl.sh
|
||||||
|
echo "
|
||||||
|
[mysqld]
|
||||||
|
ssl-ca=${TOP_DIR}/spec/ssl/ca-cert.pem
|
||||||
|
ssl-cert=${TOP_DIR}/spec/ssl/server-cert.pem
|
||||||
|
ssl-key=${TOP_DIR}/spec/ssl/server-key.pem
|
||||||
|
" > ~/.my.cnf
|
||||||
|
|
||||||
# Use testing port because the standard mysqld port 3306 is occupied.
|
# Use testing port because the standard mysqld port 3306 is occupied.
|
||||||
# Assign a random port to consider a case of multi builds in parallel in a host.
|
# Assign a random port to consider a case of multi builds in parallel in a host.
|
||||||
# https://src.fedoraproject.org/rpms/rubygem-pg/pull-request/3
|
# https://src.fedoraproject.org/rpms/rubygem-pg/pull-request/3
|
||||||
@ -118,15 +127,22 @@ mysql_install_db \
|
|||||||
--port="${MYSQL_TEST_PORT}" \
|
--port="${MYSQL_TEST_PORT}" \
|
||||||
--ssl &
|
--ssl &
|
||||||
|
|
||||||
|
conn_found=false
|
||||||
for i in $(seq 10); do
|
for i in $(seq 10); do
|
||||||
|
echo "Waiting for the DB server to accept connections... ${i}"
|
||||||
sleep 1
|
sleep 1
|
||||||
if grep -q 'ready for connections.' "${MYSQL_TEST_LOG}"; then
|
if grep -q 'ready for connections' "${MYSQL_TEST_LOG}"; then
|
||||||
|
conn_found=true
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
echo "Waiting connections... ${i}"
|
|
||||||
done
|
done
|
||||||
|
if ! "${conn_found}"; then
|
||||||
|
echo "ERROR: Failed to connect the DB server."
|
||||||
|
cat "${MYSQL_TEST_LOG}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# See https://github.com/brianmario/mysql2/blob/master/.travis_setup.sh
|
# See https://github.com/brianmario/mysql2/blob/master/ci/setup.sh
|
||||||
mysql -u root \
|
mysql -u root \
|
||||||
-e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
|
-e 'CREATE DATABASE /*M!50701 IF NOT EXISTS */ test' \
|
||||||
-S "${MYSQL_TEST_SOCKET}" \
|
-S "${MYSQL_TEST_SOCKET}" \
|
||||||
@ -151,17 +167,6 @@ user:
|
|||||||
socket: ${MYSQL_TEST_SOCKET}
|
socket: ${MYSQL_TEST_SOCKET}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# This test would require changes in host configuration.
|
|
||||||
sed -i '/^ it "should be able to connect via SSL options" do$/,/^ end$/ s/^/#/' \
|
|
||||||
spec/mysql2/client_spec.rb
|
|
||||||
|
|
||||||
# performance_schema.session_account_connect_attrs is unexpectedly empty.
|
|
||||||
# https://github.com/brianmario/mysql2/issues/965
|
|
||||||
sed -i '/^ it "should set default program_name in connect_attrs" do$/,/^ end$/ s/^/#/' \
|
|
||||||
spec/mysql2/client_spec.rb
|
|
||||||
sed -i '/^ it "should set custom connect_attrs" do$/,/^ end$/ s/^/#/' \
|
|
||||||
spec/mysql2/client_spec.rb
|
|
||||||
|
|
||||||
rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
|
rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
|
||||||
popd
|
popd
|
||||||
|
|
||||||
@ -186,6 +191,10 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 19 2024 Jarek Prokop <jprokop@redhat.com> - 0.5.5-1
|
||||||
|
- Upgrade to mysql2 0.5.5.
|
||||||
|
Related: RHEL-17090
|
||||||
|
|
||||||
* Fri Apr 22 2022 Jarek Prokop <jprokop@redhat.com> 0.5.3-2
|
* Fri Apr 22 2022 Jarek Prokop <jprokop@redhat.com> 0.5.3-2
|
||||||
- Update by merging Fedora rawhide branch (commit: 81e2cc9)
|
- Update by merging Fedora rawhide branch (commit: 81e2cc9)
|
||||||
- Fix Mysql2::Result test for Ruby 3.1.
|
- Fix Mysql2::Result test for Ruby 3.1.
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (mysql2-0.5.3-tests.txz) = 2922835f0ad27b5f693cbc920ee239cfe206d2a9f529b43d8e2a700f31f690956adab4c350ce32a40dace5ffb9530d78807a224e33d22aa3a3b6c56a080fd235
|
SHA512 (mysql2-0.5.5.gem) = a3865bf670c8fbb1942b631ff6eea8c26a9fa8b4d25da0faca84cb9d9c7c44eb98cd29ace83a62596eec0a522899b01044715e900d1389809b65e40fb09b258f
|
||||||
SHA512 (mysql2-0.5.3.gem) = 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
|
SHA512 (mysql2-0.5.5-tests.txz) = 0d6a81324a6466dafb859bb05e6cfc50e9758ead5cf7b50afea16f61568e0a2b9c17f22820aaa4c36c285abe00f855e87a3c7bd0934602cebbb98f299680a2c5
|
||||||
|
Loading…
Reference in New Issue
Block a user