moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-54947 database: Update PostgreSQL binary handling.

Browse source 
PostgreSQL 9.1 allows hex formating for binary which is handled better
by pg_query_params().

Getting bytea isn't required on connection, it can be used as pg_field_type()
when binary needs to be checked.
This commit is contained in:
Russell Smith 2016-06-14 13:47:36 +10:00
parent b8474fe0c7
commit 1b0b082a08
3 changed files with 70 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/dml/tests/dml_test.php
View file

@ -1919,13 +1919,16 @@ class core_dml_testcase extends database_driver_testcase {
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
$table->add_field('course', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0');
$table->add_field('onebinary', XMLDB_TYPE_BINARY, 'big', null, null, null);
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
$dbman->create_table($table);
$DB->insert_record($tablename, array('course' => 1));
$DB->insert_record($tablename, array('course' => 3));
$DB->insert_record($tablename, array('course' => 2));
$DB->insert_record($tablename, array('course' => 6));
$binarydata = '\\'.chr(241);
$DB->insert_record($tablename, array('course' => 1, 'onebinary' => $binarydata));
$DB->insert_record($tablename, array('course' => 3, 'onebinary' => $binarydata));
$DB->insert_record($tablename, array('course' => 2, 'onebinary' => $binarydata));
$DB->insert_record($tablename, array('course' => 6, 'onebinary' => $binarydata));
$fieldset = $DB->get_fieldset_sql("SELECT * FROM {{$tablename}} WHERE course > ?", array(1));
$this->assertInternalType('array', $fieldset);
@ -1934,6 +1937,14 @@ class core_dml_testcase extends database_driver_testcase {
$this->assertEquals(2, $fieldset[0]);
$this->assertEquals(3, $fieldset[1]);
$this->assertEquals(4, $fieldset[2]);
$fieldset = $DB->get_fieldset_sql("SELECT onebinary FROM {{$tablename}} WHERE course > ?", array(1));
$this->assertInternalType('array', $fieldset);
$this->assertCount(3, $fieldset);
$this->assertEquals($binarydata, $fieldset[0]);
$this->assertEquals($binarydata, $fieldset[1]);
$this->assertEquals($binarydata, $fieldset[2]);
}
public function test_insert_record_raw() {
@ -3016,6 +3027,10 @@ class core_dml_testcase extends database_driver_testcase {
$this->assertEquals($clob, $DB->get_field($tablename, 'onetext', array('id' => 1)), 'Test CLOB set_field (full contents output disabled)');
$this->assertEquals($blob, $DB->get_field($tablename, 'onebinary', array('id' => 1)), 'Test BLOB set_field (full contents output disabled)');
// Empty data in binary columns works.
$DB->set_field_select($tablename, 'onebinary', '', 'id = ?', array(1));
$this->assertEquals('', $DB->get_field($tablename, 'onebinary', array('id' => 1)), 'Blobs need to accept empty values.');
// And "small" LOBs too, just in case.
$newclob = substr($clob, 0, 500);
$newblob = substr($blob, 0, 250);