2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-10-07 13:36:21 +00:00
Commit Graph

23 Commits

Author SHA1 Message Date
Thomas Markwalder
f0fb9f35a3 [master] Fixes MySQL InnoDB engine issue, MySQL version bump to 4.1
Merges branch 'trac4237'
2015-12-17 09:20:18 -05:00
Thomas Markwalder
c112be7c66 [4237] Addressed review comments
AUTHORS
    Added pull submitter,https://github.com/isc-projects/kea/pull/16,
    Sebastien Couture.

src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    Fixed "FROm"
2015-12-17 09:05:32 -05:00
Thomas Markwalder
36e5204eb2 [4237] Fixes #4238, adds lease dump order by, bumps MySQL schema to 4.1
Bumps MySQL schema version from 4.0 to 4.1.

Fixes the issue spelled out in 4238 by adding an entry for hardware
address source of zero. This change was added here to limit the
number of schema version bumps.

Changes the MySQL lease dump functions to order by the lease address.
This ensures the dumps always ordered in a predictable manner.

src/bin/admin/scripts/mysql/upgrade_4.0_to_4.1.sh.in
    New file to upgrade from 4.0 to 4.1

configure.ac
    Added entry for mysql/upgrade_4.0_to_4.1.sh

src/bin/admin/scripts/mysql/Makefile.am
    Added entry form upgrade_4.0_to_4.1.sh

src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    Added insert of HWADDR_SOURCE_UNKNOWN  into lease_hwaddr_source
    Added order by clauses to lease4DumpData and lease6DumpData
    Updated schema version from 4.0 to 4.1

src/bin/admin/tests/mysql_tests.sh.in
    mysql_upgrade_test()
        Added test for 4.0 to 4.1 upgrade
        Changed final version check to 4.1
2015-12-16 14:44:16 -05:00
Marcin Siodelski
3d18318f68 [4236] Updated copyright dates in all files. 2015-12-16 15:28:44 +01:00
Marcin Siodelski
fe9dd86d20 [4236] Replaced license text in all files containing it. 2015-12-16 13:37:29 +01:00
Thomas Markwalder
6bd7ac72bc [4237] Added MySQL ENGINE to all table creates, fixed hosts table not dropping
All MySQL text to create tables sets ENGINE to INNODB
MySQL unit tests now reliably drop the "hosts" table

src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/scripts/mysql/upgrade_1.0_to_2.0.sh.in
src/bin/admin/scripts/mysql/upgrade_2.0_to_3.0.sh.in
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
    Reversed order of reference file to match INNODB result

src/bin/admin/tests/dhcpdb_create_1.0.mysql
    Added "ENGINE = INNODB" table creates where needed

src/bin/admin/tests/mysql_tests.sh.in
    Removed unnecessary explicit drop of ipv6_reservations

src/lib/dhcpsrv/tests/mysql_schema.cc
    Added MySQL error output on statement failures

src/lib/dhcpsrv/tests/schema_mysql_copy.h
    const char* destroy_statement[]
        Added statement to turn off referential integrity checks, so all
        tables will get dropped.  "hosts" table was being left behind.

    const char* create_statement[]
        Added "ENGINE = INNODB" table creates where needed
2015-12-11 14:51:18 -05:00
Marcin Siodelski
640d3538c0 [3968] Added ASC sorting for indexes by expiration. 2015-10-15 21:48:01 +02:00
Marcin Siodelski
e7fd02a54c [3968] New constraints added to the upgrade scripts and tests.
Also, updated the lease_hwaddr_source table with missing
entries from the lease.cc.
2015-10-15 21:33:38 +02:00
Marcin Siodelski
f87000bd5d [3968] Merge branch 'master' into trac3968 2015-10-15 19:59:12 +02:00
Marcin Siodelski
acb688a9cb [3968] Added additional constraints to mysql creation script. 2015-10-15 19:57:15 +02:00
Thomas Markwalder
2e13ac3b0b [master] Implemented schema upgrade for MySQL schema 4.0
Merged in trac3967.
2015-10-13 12:04:29 -04:00
Tomek Mrugalski
884d8bb4a5 [master] Merge branch 'trac3681_rebase' (Common MySQL Connection class)
Conflicts:
	src/lib/dhcpsrv/lease_mgr.h
	src/lib/dhcpsrv/memfile_lease_mgr.cc
	src/lib/dhcpsrv/mysql_lease_mgr.cc
	src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
	src/lib/dhcpsrv/tests/schema_mysql_copy.h
2015-10-09 23:28:19 +02:00
Thomas Markwalder
52476f730a [3967] Added lookup of hwaddr_source name to lease6 dump
src/bin/admin/scripts/mysql/dhcpdb_create.mysql
    lease6DumpData() -  added lookup of lease_hwaddr_source name

src/bin/admin/scripts/mysql/upgrade_3.0_to_4.0.sh.in
    lease6DumpData() -  added lookup of lease_hwaddr_source name

src/bin/admin/tests/data/mysql.lease6_dump_test.reference.csv
    added hwaddr_source names to test reference data

src/bin/admin/tests/mysql_tests.sh.in
    mysql_lease6_dump_test() - changed hwaddr_source test values
2015-10-06 07:25:53 -04:00
Thomas Markwalder
9ca02bd624 [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
2015-10-01 08:46:18 -04:00
Marcin Siodelski
47152f051e [3966] Updated schema files per review comments. 2015-09-15 14:02:18 +02:00
Marcin Siodelski
979edee42e [3966] Added lease_states table to the MySQL database. 2015-09-09 10:36:02 +02:00
Marcin Siodelski
fb3e34a898 [3966] Updated MySQL schema to version 4.0 2015-09-07 10:19:32 +02:00
Tomek Mrugalski
f1f7926262 [3681] Updated dhcpdb_create.mysql, upgrade_2.0_to_3.0.sh.in from master 2015-06-25 21:02:17 +02:00
Tomek Mrugalski
17f639468f [3567] Applied updated patch by Adam
- upgrade 2.0 to 3.0 script added
 - added unit-tests
 - dhcpdb_create.mysql script now uses the same database
2015-05-15 20:03:26 +02:00
Tomek Mrugalski
e9fc3ede80 [3567] MySQL schema updated to 3.0
- Applied patch as submitted by Adam Kalmus
2015-04-16 14:59:26 +02:00
Tomek Mrugalski
35357a30fa [3599] Changes after review
- mysql/upgrade_1.0_to_2.0.sh renamed to .in
 - header added to admin-utils.sh, revoked exec bit
 - kea-admin clarified (db => lease db)
 - kea-admin manpage corrected
 - lease6_hwaddr_source renamed to lease_hwaddr_source
 - mysql_tests are now working without installation
2014-12-05 23:33:53 +01:00
Tomek Mrugalski
b58943959d [3599] MySQL init script updated to 2.0. 2014-11-05 11:46:08 +01:00
Tomek Mrugalski
03e8c63be2 [3599] Init script moved again. 2014-11-05 11:29:30 +01:00