[libgda: 2/5] Merge branch 'master' into wip/db_get_table

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 45b6fce61af416f154f159fb59f6e6a87cc13c47
Merge: da078d707 bd7b9568b
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Fri Oct 22 00:32:23 2021 -0500

    Merge branch 'master' into wip/db_get_table

 .gitlab-ci.yml                                     |    37 +-
 NEWS                                               |     7 +-
 doc/meson.build                                    |     2 +-
 examples/meson.build                               |     2 +-
 libgda-ui/meson.build                              |     2 +-
 libgda/gda-config.c                                |     4 +
 libgda/gda-connection.c                            |    51 +-
 libgda/gda-data-meta-wrapper.c                     |     2 +-
 libgda/gda-data-select.c                           |    13 -
 libgda/gda-db-base.c                               |    10 +-
 libgda/gda-db-catalog.c                            |    13 +-
 libgda/gda-db-column.c                             |    15 +-
 libgda/gda-db-fkey.c                               |     4 +-
 libgda/gda-db-table.c                              |     7 +-
 libgda/gda-meta-store.c                            |     2 +-
 libgda/gda-server-provider.c                       |     2 +-
 libgda/gda-value.c                                 |    49 +-
 libgda/meson.build                                 |    12 +-
 libgda/providers-support/gda-data-select-priv.h    |     1 -
 libgda/sql-parser/gda-statement-struct.c           |     8 +-
 libgda/sql-parser/lemon.c                          |    40 +-
 libgda/sqlite/gda-sqlite-provider.c                |    16 +
 libgda/test-cnc-open.c                             |     4 +-
 libgda/thread-wrapper/test-itsignaler.c            |     1 +
 meson.build                                        |    49 +-
 meson_options.txt                                  |    35 +-
 po/ca.po                                           | 13419 +++++++++----------
 po/cs.po                                           |  1143 +-
 po/da.po                                           |  5417 ++++----
 po/es.po                                           |   520 +-
 po/eu.po                                           |  7239 +++++-----
 po/hu.po                                           |   732 +-
 po/id.po                                           |   320 +-
 po/pt_BR.po                                        |   725 +-
 po/ro.po                                           | 10046 +++++++-------
 po/sr.po                                           |  4959 ++++---
 po/sv.po                                           |   609 +-
 po/tr.po                                           |  5034 ++++---
 po/uk.po                                           |  2569 ++--
 providers/meson.build                              |     8 +-
 providers/mysql/gda-mysql-provider.c               |    24 +-
 providers/mysql/gda-mysql-recordset.c              |    83 +-
 providers/mysql/meson.build                        |    10 +-
 providers/mysql/mysql_specs_dsn.xml.in             |     1 +
 providers/postgres/gda-postgres-provider.c         |     3 +-
 providers/postgres/meson.build                     |    10 +-
 providers/sqlcipher/meson.build                    |     6 +-
 providers/sqlite/meson.build                       |     5 +-
 providers/web/gda-web-provider.c                   |     4 +-
 tests/db/check-db-catalog-postgresql.c             |    31 +-
 tests/db/check-db-catalog.c                        |    20 +-
 tests/db/check-db-fkey.c                           |   126 +
 tests/db/meson.build                               |     5 +-
 tests/meson.build                                  |    13 +-
 tests/meta-store/check_meta_store_postgresql.c     |    58 +-
 tests/meta-store/check_meta_store_postgresql_new.c |   372 +
 tests/meta-store/common.c                          |    86 +-
 tests/meta-store/common.h                          |     2 +-
 tests/meta-store/meson.build                       |    33 +-
 tests/providers/meson.build                        |     2 +-
 tests/providers/prov-test-common.c                 |    14 +-
 tests/raw-ddl-creator.c                            |     3 +-
 tests/test-cnc-utils.c                             |   103 +
 tests/test-cnc-utils.h                             |    11 +
 tests/test-server-operation-postgresql.c           |    39 +-
 tools/browser/canvas/browser-canvas-text.c         |    12 +-
 tools/browser/help/Makefile.am                     |     2 +-
 tools/browser/help/es/es.po                        |    16 +-
 tools/browser/help/sv/.gitignore                   |     2 +
 tools/browser/help/sv/sv.po                        |  3143 +++++
 tools/browser/meson.build                          |     2 +-
 tools/common/meson.build                           |     2 +-
 tools/meson.build                                  |    19 +-
 tools/test-splitter.c                              |     2 +-
 74 files changed, 31733 insertions(+), 25659 deletions(-)
---
diff --cc tests/db/check-db-catalog.c
index f2ff229eb,46287959c..e99ce6215
--- a/tests/db/check-db-catalog.c
+++ b/tests/db/check-db-catalog.c
@@@ -208,15 -204,7 +216,17 @@@ static voi
  test_db_catalog_finish_db (DbCatalogCnc *self,
                              G_GNUC_UNUSED gconstpointer user_data)
  {
-   gda_connection_close(self->cnc,NULL);
    g_object_unref (self->cnc);
++<<<<<<< HEAD
 +  g_object_unref (self->catalog);
 +  g_object_unref (self->column_id);
 +  g_object_unref (self->column_name);
 +  g_object_unref (self->column_ctime);
 +  g_object_unref (self->column_ts);
 +  g_object_unref (self->table);
 +  g_object_unref (self->view);
++=======
++>>>>>>> master
  }
  
  static void