Skip to content

Commit 493cedd

Browse files
vjikvjik
committed
improve
1 parent 120177b commit 493cedd

12 files changed

+328
-33
lines changed

‎.github/workflows/build.yml ‎.github/workflows/build-mysql.yml

+8-17
Original file line numberDiff line numberDiff line change
@@ -50,23 +50,14 @@ jobs:
5050
coverage: pcov
5151
tools: composer:v2
5252

53-
- name: Determine composer cache directory on Linux
54-
if: matrix.os == 'ubuntu-latest'
55-
run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
53+
- name: Install Composer dependencies
54+
uses: ramsey/composer-install@v3
5655

57-
- name: Cache dependencies installed with composer
58-
uses: actions/cache@v3
59-
with:
60-
path: ${{ env.COMPOSER_CACHE_DIR }}
61-
key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
62-
restore-keys: |
63-
php${{ matrix.php }}-composer-
64-
65-
- name: Update composer
66-
run: composer self-update
56+
- name: Run unit tests
57+
run: vendor/bin/codecept run Unit
6758

68-
- name: Install dependencies with composer
69-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
59+
- name: Run integration tests
60+
run: vendor/bin/codecept run MySqlIntegration
7061

71-
- name: Run tests with codeception
72-
run: vendor/bin/codecept run
62+
- name: Run preload tests
63+
run: vendor/bin/codecept run MySqlPreload

‎tests/Integration.suite.yml ‎tests/MySqlIntegration.suite.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ modules:
77
user: '%DB_USERNAME%'
88
password: '%DB_PASSWORD%'
99
- Vjik\Codeception\DatabasePopulator\Module:
10-
dumpsPath: 'tests/_data/dumps'
10+
dumpsPath: 'tests/_data/dumps/mysql'
1111
rowsPath: 'tests/_data/rows'

‎tests/Preload.suite.yml ‎tests/MySqlPreload.suite.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ modules:
77
user: '%DB_USERNAME%'
88
password: '%DB_PASSWORD%'
99
- Vjik\Codeception\DatabasePopulator\Module:
10-
dumpsPath: 'tests/_data/dumps'
10+
dumpsPath: 'tests/_data/dumps/mysql'
1111
rowsPath: 'tests/_data/rows'
1212
preloadDump: 'blog'
1313
preloadRows: 'authors'

‎tests/PgSqlIntegration.suite.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
suite_namespace: Vjik\Codeception\DatabasePopulator\Tests\Integration
2+
actor: IntegrationTester
3+
modules:
4+
enabled:
5+
- Db:
6+
dsn: 'pgsql:host=%DB_HOST%;dbname=%DB_NAME%'
7+
user: '%DB_USERNAME%'
8+
password: '%DB_PASSWORD%'
9+
- Vjik\Codeception\DatabasePopulator\Module:
10+
dumpsPath: 'tests/_data/dumps/pgsql'
11+
rowsPath: 'tests/_data/rows'

‎tests/PgSqlPreload.suite.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
suite_namespace: Vjik\Codeception\DatabasePopulator\Tests\Preload
2+
actor: PreloadTester
3+
modules:
4+
enabled:
5+
- Db:
6+
dsn: 'mysql:host=%DB_HOST%;dbname=%DB_NAME%'
7+
user: '%DB_USERNAME%'
8+
password: '%DB_PASSWORD%'
9+
- Vjik\Codeception\DatabasePopulator\Module:
10+
dumpsPath: 'tests/_data/dumps/pgsql'
11+
rowsPath: 'tests/_data/rows'
12+
preloadDump: 'blog'
13+
preloadRows: 'authors'

‎tests/_data/dumps/blog.sql ‎tests/_data/dumps/mysql/blog.sql

File renamed without changes.

‎tests/_data/dumps/empty.sql ‎tests/_data/dumps/mysql/empty.sql

File renamed without changes.

‎tests/_data/dumps/pgsql/blog.sql

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
--
2+
-- PostgreSQL database dump
3+
--
4+
5+
-- Dumped from database version 16.3 (Debian 16.3-1.pgdg120+1)
6+
-- Dumped by pg_dump version 16.3 (Debian 16.3-1.pgdg120+1)
7+
8+
SET statement_timeout = 0;
9+
SET lock_timeout = 0;
10+
SET idle_in_transaction_session_timeout = 0;
11+
SET client_encoding = 'UTF8';
12+
SET standard_conforming_strings = on;
13+
SELECT pg_catalog.set_config('search_path', '', false);
14+
SET check_function_bodies = false;
15+
SET xmloption = content;
16+
SET client_min_messages = warning;
17+
SET row_security = off;
18+
19+
SET default_tablespace = '';
20+
21+
SET default_table_access_method = heap;
22+
23+
--
24+
-- Name: author; Type: TABLE; Schema: public; Owner: root
25+
--
26+
27+
CREATE TABLE public.author (
28+
id bigint NOT NULL,
29+
name character varying(255)
30+
);
31+
32+
33+
ALTER TABLE public.author OWNER TO root;
34+
35+
--
36+
-- Name: id_id_seq; Type: SEQUENCE; Schema: public; Owner: root
37+
--
38+
39+
CREATE SEQUENCE public.id_id_seq
40+
START WITH 1
41+
INCREMENT BY 1
42+
NO MINVALUE
43+
NO MAXVALUE
44+
CACHE 1;
45+
46+
47+
ALTER SEQUENCE public.id_id_seq OWNER TO root;
48+
49+
--
50+
-- Name: id_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: root
51+
--
52+
53+
ALTER SEQUENCE public.id_id_seq OWNED BY public.author.id;
54+
55+
56+
--
57+
-- Name: post; Type: TABLE; Schema: public; Owner: root
58+
--
59+
60+
CREATE TABLE public.post (
61+
id bigint NOT NULL,
62+
author_id bigint NOT NULL,
63+
name character varying(255) NOT NULL,
64+
body text NOT NULL
65+
);
66+
67+
68+
ALTER TABLE public.post OWNER TO root;
69+
70+
--
71+
-- Name: post_id_seq; Type: SEQUENCE; Schema: public; Owner: root
72+
--
73+
74+
CREATE SEQUENCE public.post_id_seq
75+
START WITH 1
76+
INCREMENT BY 1
77+
NO MINVALUE
78+
NO MAXVALUE
79+
CACHE 1;
80+
81+
82+
ALTER SEQUENCE public.post_id_seq OWNER TO root;
83+
84+
--
85+
-- Name: post_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: root
86+
--
87+
88+
ALTER SEQUENCE public.post_id_seq OWNED BY public.post.id;
89+
90+
91+
--
92+
-- Name: author id; Type: DEFAULT; Schema: public; Owner: root
93+
--
94+
95+
ALTER TABLE ONLY public.author ALTER COLUMN id SET DEFAULT nextval('public.id_id_seq'::regclass);
96+
97+
98+
--
99+
-- Name: post id; Type: DEFAULT; Schema: public; Owner: root
100+
--
101+
102+
ALTER TABLE ONLY public.post ALTER COLUMN id SET DEFAULT nextval('public.post_id_seq'::regclass);
103+
104+
105+
--
106+
-- Data for Name: author; Type: TABLE DATA; Schema: public; Owner: root
107+
--
108+
109+
COPY public.author (id, name) FROM stdin;
110+
\.
111+
112+
113+
--
114+
-- Data for Name: post; Type: TABLE DATA; Schema: public; Owner: root
115+
--
116+
117+
COPY public.post (id, author_id, name, body) FROM stdin;
118+
\.
119+
120+
121+
--
122+
-- Name: id_id_seq; Type: SEQUENCE SET; Schema: public; Owner: root
123+
--
124+
125+
SELECT pg_catalog.setval('public.id_id_seq', 1, false);
126+
127+
128+
--
129+
-- Name: post_id_seq; Type: SEQUENCE SET; Schema: public; Owner: root
130+
--
131+
132+
SELECT pg_catalog.setval('public.post_id_seq', 1, false);
133+
134+
135+
--
136+
-- Name: author id_pk; Type: CONSTRAINT; Schema: public; Owner: root
137+
--
138+
139+
ALTER TABLE ONLY public.author
140+
ADD CONSTRAINT id_pk PRIMARY KEY (id);
141+
142+
143+
--
144+
-- Name: post post_pk; Type: CONSTRAINT; Schema: public; Owner: root
145+
--
146+
147+
ALTER TABLE ONLY public.post
148+
ADD CONSTRAINT post_pk PRIMARY KEY (id);
149+
150+
151+
--
152+
-- Name: post post_author_id_fk; Type: FK CONSTRAINT; Schema: public; Owner: root
153+
--
154+
155+
ALTER TABLE ONLY public.post
156+
ADD CONSTRAINT post_author_id_fk FOREIGN KEY (author_id) REFERENCES public.author(id);
157+
158+
159+
--
160+
-- PostgreSQL database dump complete
161+
--
162+

‎tests/_data/dumps/pgsql/empty.sql

Whitespace-only changes.

‎tests/_support/_generated/IntegrationTesterActions.php

+65-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?php //[STAMP] 6e30fe49b98241f00675a6d908595f79
1+
<?php //[STAMP] c24edd3767fa499960577b11b53d2923
2+
// phpcs:ignoreFile
23
namespace Vjik\Codeception\DatabasePopulator\Tests\_generated;
34

45
// This class was automatically generated by build task
56
// You should not change it manually as it will be overwritten on next build
6-
// @codingStandardsIgnoreFile
77

88
trait IntegrationTesterActions
99
{
@@ -79,8 +79,8 @@ public function performInDatabase($databaseKey, $actions): void {
7979
/**
8080
* [!] Method is generated. Documentation taken from corresponding module.
8181
*
82-
* Inserts an SQL record into a database. This record will be erased after the test,
83-
* unless you've configured "skip_cleanup_if_failed", and the test fails.
82+
* Inserts an SQL record into a database. This record will be erased after the test,
83+
* unless you've configured "skip_cleanup_if_failed", and the test fails.
8484
*
8585
* ```php
8686
* <?php
@@ -277,8 +277,8 @@ public function grabColumnFromDatabase(string $table, string $column, array $cri
277277
*
278278
* ```php
279279
* <?php
280-
* $post = $I->grabFromDatabase('posts', ['num_comments >=' => 100]);
281-
* $user = $I->grabFromDatabase('users', ['email like' => 'miles%']);
280+
* $postNum = $I->grabFromDatabase('posts', 'num_comments', ['num_comments >=' => 100]);
281+
* $mail = $I->grabFromDatabase('users', 'email', ['email like' => 'miles%']);
282282
* ```
283283
*
284284
* Supported operators: `<`, `>`, `>=`, `<=`, `!=`, `like`.
@@ -291,6 +291,65 @@ public function grabFromDatabase(string $table, string $column, array $criteria
291291
}
292292

293293

294+
/**
295+
* [!] Method is generated. Documentation taken from corresponding module.
296+
*
297+
* Fetches a whole entry from a database.
298+
* Make the test fail if the entry is not found.
299+
* Provide table name, desired column and criteria.
300+
*
301+
* ``` php
302+
* <?php
303+
* $mail = $I->grabEntryFromDatabase('users', array('name' => 'Davert'));
304+
* ```
305+
* Comparison expressions can be used as well:
306+
*
307+
* ```php
308+
* <?php
309+
* $post = $I->grabEntryFromDatabase('posts', ['num_comments >=' => 100]);
310+
* $user = $I->grabEntryFromDatabase('users', ['email like' => 'miles%']);
311+
* ```
312+
*
313+
* Supported operators: `<`, `>`, `>=`, `<=`, `!=`, `like`.
314+
*
315+
* @return array Returns a single entry value
316+
* @throws PDOException|Exception
317+
* @see \Codeception\Module\Db::grabEntryFromDatabase()
318+
*/
319+
public function grabEntryFromDatabase(string $table, array $criteria = []): array {
320+
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabEntryFromDatabase', func_get_args()));
321+
}
322+
323+
324+
/**
325+
* [!] Method is generated. Documentation taken from corresponding module.
326+
*
327+
* Fetches a set of entries from a database.
328+
* Provide table name and criteria.
329+
*
330+
* ``` php
331+
* <?php
332+
* $mail = $I->grabEntriesFromDatabase('users', array('name' => 'Davert'));
333+
* ```
334+
* Comparison expressions can be used as well:
335+
*
336+
* ```php
337+
* <?php
338+
* $post = $I->grabEntriesFromDatabase('posts', ['num_comments >=' => 100]);
339+
* $user = $I->grabEntriesFromDatabase('users', ['email like' => 'miles%']);
340+
* ```
341+
*
342+
* Supported operators: `<`, `>`, `>=`, `<=`, `!=`, `like`.
343+
*
344+
* @return array<array<string, mixed>> Returns an array of all matched rows
345+
* @throws PDOException|Exception
346+
* @see \Codeception\Module\Db::grabEntriesFromDatabase()
347+
*/
348+
public function grabEntriesFromDatabase(string $table, array $criteria = []): array {
349+
return $this->getScenario()->runStep(new \Codeception\Step\Action('grabEntriesFromDatabase', func_get_args()));
350+
}
351+
352+
294353
/**
295354
* [!] Method is generated. Documentation taken from corresponding module.
296355
*

0 commit comments

Comments
 (0)