mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-10-13 14:06:26 +00:00
[3916] Use stored procedures for MySQL lease dumps
src/bin/admin/kea-admin.in src/bin/admin/kea-admin.in get_dump_query() - modified SQL text returned for MySQL backend which calls stored procedures to produce lease dumps rather than SQL text from lease_dump_<version>.sh src/bin/admin/scripts/mysql/Makefile.am removed entries for leave_dump_<version>.sh files src/bin/admin/scripts/mysql/dhcpdb_create.mysql Added sql to create stored procedures for lease dumps: lease4DumpHeader lease4DumpData lease6DumpHeader lease6DumpData src/bin/admin/scripts/pgsql/dhcpdb_create.pgsql Changes table references in lease6DumpData() to match convention used in MySQL lease6DumpData() src/bin/admin/tests/mysql_tests.sh.in mysql_lease4_dump_test() - change lease4 test leases to have differing values for lease4.state mysql_lease6_dump_test() - change lease4 test leases to have differing values for lease6.state mysql.lease4_dump_test.reference.csv mysql.lease6_dump_test.reference.csv Changed reference files to use lease_state.name values rather than lease.state to match dump query output and new test data src/bin/admin/scripts/mysql deleted the following files as they are now obsolete leave_dump_1.0.sh leave_dump_2.0.sh leave_dump_3.0.sh leave_dump_4.0.sh Makefile.am - removed entries for deleted lease dump scripts
This commit is contained in:
@@ -164,19 +164,19 @@ CREATE FUNCTION lease6DumpData() RETURNS
|
||||
fqdn_rev int,
|
||||
hostname text
|
||||
) AS $$
|
||||
SELECT (a.address,
|
||||
encode(a.duid,'hex'),
|
||||
a.valid_lifetime,
|
||||
a.expire,
|
||||
a.subnet_id,
|
||||
a.pref_lifetime,
|
||||
b.name,
|
||||
a.iaid,
|
||||
a.prefix_len,
|
||||
a.fqdn_fwd::int,
|
||||
a.fqdn_rev::int,
|
||||
a.hostname)
|
||||
FROM lease6 a left outer join lease6_types b on (a.lease_type = b.lease_type);
|
||||
SELECT (l.address,
|
||||
encode(l.duid,'hex'),
|
||||
l.valid_lifetime,
|
||||
l.expire,
|
||||
l.subnet_id,
|
||||
l.pref_lifetime,
|
||||
t.name,
|
||||
l.iaid,
|
||||
l.prefix_len,
|
||||
l.fqdn_fwd::int,
|
||||
l.fqdn_rev::int,
|
||||
l.hostname)
|
||||
FROM lease6 l left outer join lease6_types t on (l.lease_type = t.lease_type);
|
||||
$$ LANGUAGE SQL;
|
||||
--
|
||||
|
||||
|
Reference in New Issue
Block a user