Skip to content

Commit a0ef4c4

Browse files
ricco24dg
ricco24
authored and
dg
committed
Insert to table with multi primary or without autoicrement primary (#105)
* Insert to table with multi primary or without autoicrement primary returns inserted record * Simplify getPrimaryKeySequence function * Switched sequence delimiting in Selection * Mysql 5.7 tests fix * Remove slow in_array function from Structure
1 parent 8fbb6dd commit a0ef4c4

10 files changed

+325
-32
lines changed

‎src/Database/IStructure.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ function getColumns($table);
4545
*/
4646
function getPrimaryKey($table);
4747

48+
/**
49+
* Returns autoincrement primary key name.
50+
* @param string
51+
* @return string|NULL
52+
*/
53+
function getPrimaryAutoincrementKey($table);
54+
4855
/**
4956
* Returns table primary key sequence.
5057
* @param string

‎src/Database/Structure.php

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,33 @@ public function getPrimaryKey($table)
6565
return $this->structure['primary'][$table];
6666
}
6767

68+
public function getPrimaryAutoincrementKey($table)
69+
{
70+
$primaryKey = $this->getPrimaryKey($table);
71+
if (!$primaryKey) {
72+
return NULL;
73+
}
74+
75+
// Search for autoincrement key from multi primary key
76+
if (is_array($primaryKey)) {
77+
$keys = array_flip($primaryKey);
78+
foreach ($this->getColumns($table) as $column) {
79+
if (isset($keys[$column['name']]) && $column['autoincrement']) {
80+
return $column['name'];
81+
}
82+
}
83+
return NULL;
84+
}
85+
86+
// Search for autoincrement key from simple primary key
87+
foreach ($this->getColumns($table) as $column) {
88+
if ($column['name'] == $primaryKey) {
89+
return $column['autoincrement'] ? $column['name'] : NULL;
90+
}
91+
}
92+
93+
return NULL;
94+
}
6895

6996
public function getPrimaryKeySequence($table)
7097
{
@@ -75,13 +102,14 @@ public function getPrimaryKeySequence($table)
75102
return NULL;
76103
}
77104

78-
$primary = $this->getPrimaryKey($table);
79-
if (!$primary || is_array($primary)) {
105+
$autoincrementPrimaryKeyName = $this->getPrimaryAutoincrementKey($table);
106+
if (!$autoincrementPrimaryKeyName) {
80107
return NULL;
81108
}
82109

110+
// Search for sequence from simple primary key
83111
foreach ($this->structure['columns'][$table] as $columnMeta) {
84-
if ($columnMeta['name'] === $primary) {
112+
if ($columnMeta['name'] === $autoincrementPrimaryKeyName) {
85113
return isset($columnMeta['vendor']['sequence']) ? $columnMeta['vendor']['sequence'] : NULL;
86114
}
87115
}

‎src/Database/Table/Selection.php

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -828,29 +828,40 @@ public function insert($data)
828828
return $return->getRowCount();
829829
}
830830

831-
$primaryKey = $this->context->getInsertId(
832-
($tmp = $this->getPrimarySequence())
833-
? implode('.', array_map([$this->context->getConnection()->getSupplementalDriver(), 'delimite'], explode('.', $tmp)))
834-
: NULL
835-
);
836-
if (!$primaryKey) {
837-
unset($this->refCache['referencing'][$this->getGeneralCacheKey()][$this->getSpecificCacheKey()]);
838-
return $return->getRowCount();
831+
$primarySequenceName = $this->getPrimarySequence();
832+
$primaryAutoincrementKey = $this->context->getStructure()->getPrimaryAutoincrementKey($this->name);
833+
834+
$primaryKey = [];
835+
foreach ((array) $this->primary as $key) {
836+
if (isset($data[$key])) {
837+
$primaryKey[$key] = $data[$key];
838+
}
839839
}
840840

841-
if (is_array($this->getPrimary())) {
842-
$primaryKey = [];
841+
// First check sequence
842+
if (!empty($primarySequenceName) && $primaryAutoincrementKey) {
843+
$primaryKey[$primaryAutoincrementKey] = $this->context->getInsertId($this->context->getConnection()->getSupplementalDriver()->delimite($primarySequenceName));
844+
845+
// Autoincrement primary without sequence
846+
} elseif ($primaryAutoincrementKey) {
847+
$primaryKey[$primaryAutoincrementKey] = $this->context->getInsertId($primarySequenceName);
843848

844-
foreach ((array) $this->getPrimary() as $key) {
849+
// Multi column primary without autoincrement
850+
} elseif (is_array($this->primary)) {
851+
foreach ($this->primary as $key) {
845852
if (!isset($data[$key])) {
846853
return $data;
847854
}
848-
849-
$primaryKey[$key] = $data[$key];
850-
}
851-
if (count($primaryKey) === 1) {
852-
$primaryKey = reset($primaryKey);
853855
}
856+
857+
// Primary without autoincrement, try get primary from inserting data
858+
} elseif ($this->primary && isset($data[$this->primary])) {
859+
$primaryKey = $data[$this->primary];
860+
861+
// If primaryKey cannot be prepared, return inserted rows count
862+
} else {
863+
unset($this->refCache['referencing'][$this->getGeneralCacheKey()][$this->getSpecificCacheKey()]);
864+
return $return->getRowCount();
854865
}
855866

856867
$row = $this->createSelectionInstance()

‎tests/Database/Structure.phpt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,24 @@ class StructureTestCase extends TestCase
5858
['name' => 'books_view', 'view' => TRUE],
5959
]);
6060
$this->driver->shouldReceive('getColumns')->with('authors')->once()->andReturn([
61-
['name' => 'id', 'primary' => TRUE, 'vendor' => ['sequence' => '"public"."authors_id_seq"']],
62-
['name' => 'name', 'primary' => FALSE, 'vendor' => []],
61+
['name' => 'id', 'primary' => TRUE, 'autoincrement' => TRUE, 'vendor' => ['sequence' => '"public"."authors_id_seq"']],
62+
['name' => 'name', 'primary' => FALSE, 'autoincrement' => FALSE, 'vendor' => []],
6363
]);
6464
$this->driver->shouldReceive('getColumns')->with('Books')->once()->andReturn([
65-
['name' => 'id', 'primary' => TRUE, 'vendor' => ['sequence' => '"public"."Books_id_seq"']],
66-
['name' => 'title', 'primary' => FALSE, 'vendor' => []],
65+
['name' => 'id', 'primary' => TRUE, 'autoincrement' => TRUE, 'vendor' => ['sequence' => '"public"."Books_id_seq"']],
66+
['name' => 'title', 'primary' => FALSE, 'autoincrement' => FALSE, 'vendor' => []],
6767
]);
6868
$this->driver->shouldReceive('getColumns')->with('tags')->once()->andReturn([
69-
['name' => 'id', 'primary' => TRUE, 'vendor' => []],
70-
['name' => 'name', 'primary' => FALSE, 'vendor' => []],
69+
['name' => 'id', 'primary' => TRUE, 'autoincrement' => FALSE, 'vendor' => []],
70+
['name' => 'name', 'primary' => FALSE, 'autoincrement' => FALSE, 'vendor' => []],
7171
]);
7272
$this->driver->shouldReceive('getColumns')->with('books_x_tags')->once()->andReturn([
73-
['name' => 'book_id', 'primary' => TRUE, 'vendor' => []],
74-
['name' => 'tag_id', 'primary' => TRUE, 'vendor' => []],
73+
['name' => 'book_id', 'primary' => TRUE, 'autoincrement' => FALSE, 'vendor' => []],
74+
['name' => 'tag_id', 'primary' => TRUE, 'autoincrement' => FALSE, 'vendor' => []],
7575
]);
7676
$this->driver->shouldReceive('getColumns')->with('books_view')->once()->andReturn([
77-
['name' => 'id', 'primary' => FALSE, 'vendor' => []],
78-
['name' => 'title', 'primary' => FALSE, 'vendor' => []],
77+
['name' => 'id', 'primary' => FALSE, 'autoincrement' => FALSE, 'vendor' => []],
78+
['name' => 'title', 'primary' => FALSE, 'autoincrement' => FALSE, 'vendor' => []],
7979
]);
8080
$this->connection->shouldReceive('getSupplementalDriver')->times(4)->andReturn($this->driver);
8181
$this->driver->shouldReceive('getForeignKeys')->with('authors')->once()->andReturn([]);
@@ -108,8 +108,8 @@ class StructureTestCase extends TestCase
108108
public function testGetColumns()
109109
{
110110
$columns = [
111-
['name' => 'id', 'primary' => TRUE, 'vendor' => []],
112-
['name' => 'name', 'primary' => FALSE, 'vendor' => []],
111+
['name' => 'id', 'primary' => TRUE, 'autoincrement' => FALSE, 'vendor' => []],
112+
['name' => 'name', 'primary' => FALSE,'autoincrement' => FALSE, 'vendor' => []],
113113
];
114114

115115
Assert::same($columns, $this->structure->getColumns('tags'));

‎tests/Database/Table/Selection.insert().primaryKeys.phpt

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?php
2+
3+
/**
4+
* Test: Nette\Database\Table\Selection: Different setup for primary keys
5+
* @dataProvider? ../databases.ini
6+
*/
7+
8+
use Tester\Assert;
9+
10+
require __DIR__ . '/../connect.inc.php'; // create $connection
11+
12+
Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../files/{$driverName}-nette_test4.sql");
13+
14+
// Insert into table with simple primary index (autoincrement)
15+
test(function() use ($context) {
16+
$simplePkAutoincrementResult = $context->table('simple_pk_autoincrement')->insert([
17+
'note' => 'Some note here'
18+
]);
19+
20+
Assert::type(\Nette\Database\Table\ActiveRow::class, $simplePkAutoincrementResult);
21+
Assert::equal(1, $simplePkAutoincrementResult->identifier1);
22+
Assert::equal('Some note here', $simplePkAutoincrementResult->note);
23+
24+
$simplePkAutoincrementResult2 = $context->table('simple_pk_autoincrement')->insert([
25+
'note' => 'Some note here 2'
26+
]);
27+
28+
Assert::type(\Nette\Database\Table\ActiveRow::class, $simplePkAutoincrementResult2);
29+
Assert::equal(2, $simplePkAutoincrementResult2->identifier1);
30+
Assert::equal('Some note here 2', $simplePkAutoincrementResult2->note);
31+
});
32+
33+
// Insert into table with simple primary index (no autoincrement)
34+
test(function() use ($context) {
35+
$simplePkNoAutoincrementResult = $context->table('simple_pk_no_autoincrement')->insert([
36+
'identifier1' => 100,
37+
'note' => 'Some note here'
38+
]);
39+
40+
Assert::type(\Nette\Database\Table\ActiveRow::class, $simplePkNoAutoincrementResult);
41+
Assert::equal(100, $simplePkNoAutoincrementResult->identifier1);
42+
Assert::equal('Some note here', $simplePkNoAutoincrementResult->note);
43+
44+
$simplePkNoAutoincrementResult2 = $context->table('simple_pk_no_autoincrement')->insert([
45+
'identifier1' => 200,
46+
'note' => 'Some note here 2'
47+
]);
48+
49+
Assert::type(\Nette\Database\Table\ActiveRow::class, $simplePkNoAutoincrementResult2);
50+
Assert::equal(200, $simplePkNoAutoincrementResult2->identifier1);
51+
Assert::equal('Some note here 2', $simplePkNoAutoincrementResult2->note);
52+
});
53+
54+
// Insert into table with multi column primary index (no autoincrement)
55+
test(function() use ($context) {
56+
$multiPkNoAutoincrementResult = $context->table('multi_pk_no_autoincrement')->insert([
57+
'identifier1' => 5,
58+
'identifier2' => 10,
59+
'note' => 'Some note here'
60+
]);
61+
62+
Assert::type(\Nette\Database\Table\ActiveRow::class, $multiPkNoAutoincrementResult);
63+
Assert::equal(5, $multiPkNoAutoincrementResult->identifier1);
64+
Assert::equal(10, $multiPkNoAutoincrementResult->identifier2);
65+
Assert::equal('Some note here', $multiPkNoAutoincrementResult->note);
66+
67+
$multiPkNoAutoincrementResult2 = $context->table('multi_pk_no_autoincrement')->insert([
68+
'identifier1' => 5,
69+
'identifier2' => 100,
70+
'note' => 'Some note here 2'
71+
]);
72+
73+
Assert::type(\Nette\Database\Table\ActiveRow::class, $multiPkNoAutoincrementResult2);
74+
Assert::equal(5, $multiPkNoAutoincrementResult2->identifier1);
75+
Assert::equal(100, $multiPkNoAutoincrementResult2->identifier2);
76+
Assert::equal('Some note here 2', $multiPkNoAutoincrementResult2->note);
77+
});
78+
79+
// Insert into table with multi column primary index (autoincrement)
80+
test(function() use ($driverName, $context) {
81+
if (in_array($driverName, ['mysql', 'pgsql'])) {
82+
$multiPkAutoincrementResult = $context->table('multi_pk_autoincrement')->insert([
83+
'identifier2' => 999,
84+
'note' => 'Some note here'
85+
]);
86+
87+
Assert::type(\Nette\Database\Table\ActiveRow::class, $multiPkAutoincrementResult);
88+
Assert::equal(1, $multiPkAutoincrementResult->identifier1);
89+
Assert::equal(999, $multiPkAutoincrementResult->identifier2);
90+
Assert::equal('Some note here', $multiPkAutoincrementResult->note);
91+
92+
$multiPkAutoincrementResult2 = $context->table('multi_pk_autoincrement')->insert([
93+
'identifier2' => 999,
94+
'note' => 'Some note here 2'
95+
]);
96+
97+
Assert::type(\Nette\Database\Table\ActiveRow::class, $multiPkAutoincrementResult2);
98+
Assert::equal(2, $multiPkAutoincrementResult2->identifier1);
99+
Assert::equal(999, $multiPkAutoincrementResult2->identifier2);
100+
Assert::equal('Some note here 2', $multiPkAutoincrementResult2->note);
101+
}
102+
});
103+
104+
// Insert into table without primary key
105+
test(function() use ($context) {
106+
$noPkResult1 = $context->table('no_pk')->insert([
107+
'note' => 'Some note here',
108+
]);
109+
Assert::equal(1, $noPkResult1);
110+
});

‎tests/Database/Table/bugs/bug1342.postgre.phpt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,13 @@ $insertedRows = $context->table('bug1342')->insert([
2525
'a2' => 2,
2626
]);
2727

28-
Assert::same(1, $insertedRows);
28+
Assert::same($insertedRows->a1, 1);
29+
Assert::same($insertedRows->a2, 2);
30+
31+
$insertedRows = $context->table('bug1342')->insert([
32+
'a1' => 24,
33+
'a2' => 48,
34+
]);
35+
36+
Assert::same($insertedRows->a1, 24);
37+
Assert::same($insertedRows->a2, 48);

‎tests/Database/files/mysql-nette_test4.sql

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
DROP DATABASE IF EXISTS nette_test;
2+
CREATE DATABASE nette_test;
3+
USE nette_test;
4+
5+
CREATE TABLE simple_pk_autoincrement (
6+
identifier1 int NOT NULL AUTO_INCREMENT,
7+
note varchar(100),
8+
PRIMARY KEY (identifier1)
9+
) ENGINE=InnoDB;
10+
11+
CREATE TABLE simple_pk_no_autoincrement (
12+
identifier1 int NOT NULL,
13+
note varchar(100),
14+
PRIMARY KEY (identifier1)
15+
) ENGINE=InnoDB;
16+
17+
CREATE TABLE multi_pk_no_autoincrement (
18+
identifier1 int NOT NULL,
19+
identifier2 int NOT NULL,
20+
note varchar(100),
21+
PRIMARY KEY (identifier1, identifier2)
22+
) ENGINE=InnoDB;
23+
24+
CREATE TABLE multi_pk_autoincrement(
25+
identifier1 int NOT NULL AUTO_INCREMENT,
26+
identifier2 int NOT NULL,
27+
note varchar(100),
28+
PRIMARY KEY (identifier1, identifier2)
29+
) ENGINE=InnoDB;
30+
31+
CREATE TABLE no_pk (
32+
note varchar(100)
33+
) ENGINE=InnoDB;

‎tests/Database/files/pgsql-nette_test4.sql

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
DROP SCHEMA IF EXISTS public CASCADE;
2+
CREATE SCHEMA public;
3+
4+
CREATE TABLE simple_pk_autoincrement (
5+
identifier1 serial NOT NULL,
6+
note varchar(100),
7+
PRIMARY KEY (identifier1)
8+
);
9+
10+
CREATE TABLE simple_pk_no_autoincrement (
11+
identifier1 int NOT NULL,
12+
note varchar(100),
13+
PRIMARY KEY (identifier1)
14+
);
15+
16+
CREATE TABLE multi_pk_no_autoincrement (
17+
identifier1 int NOT NULL,
18+
identifier2 int NOT NULL,
19+
note varchar(100),
20+
PRIMARY KEY (identifier1, identifier2)
21+
);
22+
23+
CREATE TABLE multi_pk_autoincrement(
24+
identifier1 serial NOT NULL,
25+
identifier2 int NOT NULL,
26+
note varchar(100),
27+
PRIMARY KEY (identifier1, identifier2)
28+
);
29+
30+
CREATE TABLE no_pk (
31+
note varchar(100)
32+
);

‎tests/Database/files/sqlite-nette_test4.sql

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
DROP TABLE IF EXISTS simple_pk_autoincrement;
2+
DROP TABLE IF EXISTS simple_pk_no_autoincrement;
3+
DROP TABLE IF EXISTS multi_pk_no_autoincrement;
4+
DROP TABLE IF EXISTS multi_pk_autoincrement;
5+
DROP TABLE IF EXISTS no_pk;
6+
7+
CREATE TABLE simple_pk_autoincrement (
8+
identifier1 integer PRIMARY KEY AUTOINCREMENT,
9+
note varchar(100)
10+
);
11+
12+
CREATE TABLE simple_pk_no_autoincrement (
13+
identifier1 int NOT NULL,
14+
note varchar(100),
15+
PRIMARY KEY (identifier1)
16+
);
17+
18+
CREATE TABLE multi_pk_no_autoincrement (
19+
identifier1 int NOT NULL,
20+
identifier2 int NOT NULL,
21+
note varchar(100),
22+
PRIMARY KEY (identifier1, identifier2)
23+
);
24+
25+
CREATE TABLE no_pk (
26+
note varchar(100)
27+
);

0 commit comments

Comments
 (0)