Skip to content

Commit

Permalink
Add ORDER BY to queries in the 6th and 7th examples
Browse files Browse the repository at this point in the history 
This makes sure the expected record order.

Signed-off-by: Zoltán Böszörményi <[email protected]>
  • Loading branch information
@zboszor
zboszor committed Nov 24, 2023
1 parent 15d9d0a commit 8854df0
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
36 changes: 18 additions & 18 deletions doc/examples.sgm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1080,9 +1080,9 @@ ocrpttest-> order by data.id, more_data.id;
int main(int argc, char **argv) {
opencreport *o = ocrpt_init();
ocrpt_datasource *ds = ocrpt_datasource_add_postgresql(o, "pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data;");
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data order by id;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data order by id;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data order by sk_id;");

ocrpt_expr *match = ocrpt_expr_parse(o, "q1.id = q2.boss_id", NULL);
ocrpt_query_add_follower_n_to_1(q1, q2, match);
Expand Down Expand Up @@ -1112,9 +1112,9 @@ int main(int argc, char **argv) {
<programlisting>&lt;?php
$o = new OpenCReport();
$ds = $o-&gt;datasource_add_postgresql("pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
$q1 = $ds-&gt;query_add("q1", "select * from data;");
$q2 = $ds-&gt;query_add("q2", "select * from more_data;");
$q3 = $ds-&gt;query_add("q3", "select * from moar_data;");
$q1 = $ds-&gt;query_add("q1", "select * from data order by id;");
$q2 = $ds-&gt;query_add("q2", "select * from more_data order by id;");
$q3 = $ds-&gt;query_add("q3", "select * from moar_data order by sk_id;");

$match1 = $o-&gt;expr_parse("q1.id = q2.boss_id");
$q1-&gt;add_follower_n_to_1($q2, $match1);
Expand Down Expand Up @@ -1142,9 +1142,9 @@ $o-&gt;spool();</programlisting>
$r = rlib_init();

rlib_add_datasource_postgres($r, "pgsql", "dbname=ocrpttest user=ocrpt");
rlib_add_query_as($r, "pgsql", "select * from data;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data;", "q3");
rlib_add_query_as($r, "pgsql", "select * from data order by id;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data order by id;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data order by sk_id;", "q3");

rlib_add_resultset_follower_n_to_1($r, "q1", "id", "q2", "boss_id");
rlib_add_resultset_follower_n_to_1($r, "q2", "id", "q3", "sk_id");
Expand Down Expand Up @@ -1274,9 +1274,9 @@ ocrpttest-> order by moar_data.sk_id limit 1) y on (true);
int main(int argc, char **argv) {
opencreport *o = ocrpt_init();
ocrpt_datasource *ds = ocrpt_datasource_add_postgresql(o, "pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data;");
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data order by id;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data order by id;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data order by sk_id;");

ocrpt_expr *match = ocrpt_expr_parse(o, "q1.id = q2.boss_id", NULL);
ocrpt_query_add_follower_n_to_1(q1, q2, match);
Expand Down Expand Up @@ -1306,9 +1306,9 @@ int main(int argc, char **argv) {
<programlisting>&lt;?php
$o = new OpenCReport();
$ds = $o-&gt;datasource_add_postgresql("pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
$q1 = $ds-&gt;query_add("q1", "select * from data;");
$q2 = $ds-&gt;query_add("q2", "select * from more_data;");
$q3 = $ds-&gt;query_add("q3", "select * from moar_data;");
$q1 = $ds-&gt;query_add("q1", "select * from data order by id;");
$q2 = $ds-&gt;query_add("q2", "select * from more_data order by id;");
$q3 = $ds-&gt;query_add("q3", "select * from moar_data order by sk_id;");

$match1 = $o-&gt;expr_parse("q1.id = q2.boss_id");
$q1-&gt;add_follower_n_to_1($q2, $match1);
Expand Down Expand Up @@ -1336,9 +1336,9 @@ $o-&gt;spool();</programlisting>
$r = rlib_init();

rlib_add_datasource_postgres($r, "pgsql", "dbname=ocrpttest user=ocrpt");
rlib_add_query_as($r, "pgsql", "select * from data;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data;", "q3");
rlib_add_query_as($r, "pgsql", "select * from data order by id;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data order by id;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data order by sk_id;", "q3");

rlib_add_resultset_follower_n_to_1($r, "q1", "id", "q2", "boss_id");
rlib_add_resultset_follower_n_to_1($r, "q2", "id", "q3", "sk_id");
Expand Down
Binary file modified doc/html/example6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/html/images/example6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/images/example6.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions examples/example6/example6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
int main(int argc, char **argv) {
opencreport *o = ocrpt_init();
ocrpt_datasource *ds = ocrpt_datasource_add_postgresql(o, "pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data;");
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data order by id;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data order by id;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data order by sk_id;");

ocrpt_expr *match = ocrpt_expr_parse(o, "q1.id = q2.boss_id", NULL);
ocrpt_query_add_follower_n_to_1(q1, q2, match);
Expand Down
6 changes: 3 additions & 3 deletions examples/example6/example6.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
$o = new OpenCReport();
$ds = $o->datasource_add_postgresql("pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
$q1 = $ds->query_add("q1", "select * from data;");
$q2 = $ds->query_add("q2", "select * from more_data;");
$q3 = $ds->query_add("q3", "select * from moar_data;");
$q1 = $ds->query_add("q1", "select * from data order by id;");
$q2 = $ds->query_add("q2", "select * from more_data order by id;");
$q3 = $ds->query_add("q3", "select * from moar_data order by sk_id;");

$match1 = $o->expr_parse("q1.id = q2.boss_id");
$q1->add_follower_n_to_1($q2, $match1);
Expand Down
6 changes: 3 additions & 3 deletions examples/example6/example6rlib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
$r = rlib_init();

rlib_add_datasource_postgres($r, "pgsql", "dbname=ocrpttest user=ocrpt");
rlib_add_query_as($r, "pgsql", "select * from data;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data;", "q3");
rlib_add_query_as($r, "pgsql", "select * from data order by id;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data order by id;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data order by sk_id;", "q3");

rlib_add_resultset_follower_n_to_1($r, "q1", "id", "q2", "boss_id");
rlib_add_resultset_follower_n_to_1($r, "q2", "id", "q3", "sk_id");
Expand Down
6 changes: 3 additions & 3 deletions examples/example7/example7.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
int main(int argc, char **argv) {
opencreport *o = ocrpt_init();
ocrpt_datasource *ds = ocrpt_datasource_add_postgresql(o, "pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data;");
ocrpt_query *q1 = ocrpt_query_add_postgresql(ds, "q1", "select * from data order by id;");
ocrpt_query *q2 = ocrpt_query_add_postgresql(ds, "q2", "select * from more_data order by id;");
ocrpt_query *q3 = ocrpt_query_add_postgresql(ds, "q3", "select * from moar_data order by sk_id;");

ocrpt_expr *match = ocrpt_expr_parse(o, "q1.id = q2.boss_id", NULL);
ocrpt_query_add_follower_n_to_1(q1, q2, match);
Expand Down
6 changes: 3 additions & 3 deletions examples/example7/example7.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
$o = new OpenCReport();
$ds = $o->datasource_add_postgresql("pgsql", NULL, NULL, "ocrpttest", "ocrpt", NULL);
$q1 = $ds->query_add("q1", "select * from data;");
$q2 = $ds->query_add("q2", "select * from more_data;");
$q3 = $ds->query_add("q3", "select * from moar_data;");
$q1 = $ds->query_add("q1", "select * from data order by id;");
$q2 = $ds->query_add("q2", "select * from more_data order by id;");
$q3 = $ds->query_add("q3", "select * from moar_data order by sk_id;");

$match1 = $o->expr_parse("q1.id = q2.boss_id");
$q1->add_follower_n_to_1($q2, $match1);
Expand Down
6 changes: 3 additions & 3 deletions examples/example7/example7rlib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
$r = rlib_init();

rlib_add_datasource_postgres($r, "pgsql", "dbname=ocrpttest user=ocrpt");
rlib_add_query_as($r, "pgsql", "select * from data;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data;", "q3");
rlib_add_query_as($r, "pgsql", "select * from data order by id;", "q1");
rlib_add_query_as($r, "pgsql", "select * from more_data order by id;", "q2");
rlib_add_query_as($r, "pgsql", "select * from moar_data order by sk_id;", "q3");

rlib_add_resultset_follower_n_to_1($r, "q1", "id", "q2", "boss_id");
rlib_add_resultset_follower_n_to_1($r, "q2", "id", "q3", "sk_id");
Expand Down

0 comments on commit 8854df0

Please sign in to comment.