impl(bq_driver): metadata descriptors for SQLPrimaryKeys and SQLForeignKeys by Anshu6250 · Pull Request #1292 · googleapis/cpp-bigquery-odbc

Anshu6250 · 2025-11-14T10:35:43Z

This PR adds metadata descriptors for SQLPrimaryKeys and SQLForeignKeys, similar to what we already do for SQLTables and SQLColumns.

NeerajDwivedii · 2025-11-17T16:24:39Z

 //    ODBCBQClient::GetAllQueryResults() to fetch all the results. In this case,
 //    the GetQueryResults will be populated in DSResults structure.
 //
+static std::map<std::string, ColumnSchema> const kODBCForeignKeysMap = {


Remove ODBC From variable name

NeerajDwivedii · 2025-11-17T16:25:07Z

 //    ODBCBQClient::GetAllQueryResults() to fetch all the results. In this case,
 //    the GetQueryResults will be populated in DSResults structure.
 //
+static std::map<std::string, ColumnSchema> const kODBCPrimaryKeysMap = {


Remove ODBC from variable name

NeerajDwivedii · 2025-11-17T16:26:08Z

                                     type_info.col_size,
                                     descriptor_record.precision);
+    auto const& col_name = res.name;
+    bool is_128_wvarchar_col =


please follow variable naming convection, remove numerical value from variable name.

NeerajDwivedii · 2025-11-17T16:26:29Z

+        col_name == "PKTABLE_SCHEM" || col_name == "PKTABLE_NAME" ||
+        col_name == "FKTABLE_SCHEM" || col_name == "FKTABLE_NAME";
+
+    if (is_128_wvarchar_col || is_1024_wvarchar_col) {


same https://github.com/googleapis/cpp-bigquery-odbc/pull/1292/files#r2534741788

NeerajDwivedii · 2025-11-17T16:26:44Z

+      descriptor_record.local_type_name = "WVARCHAR";
+      (void)descriptor_record.SetConciseType(SQL_WVARCHAR,
+                                             DescriptorType::kIRD);
+      descriptor_record.length = is_1024_wvarchar_col ? 1024 : 128;


same https://github.com/googleapis/cpp-bigquery-odbc/pull/1292/files#r2534741788

NeerajDwivedii · 2025-11-17T16:41:45Z

+  SQLSMALLINT col_count = 0;
+  ret = SQLNumResultCols(conn->hstmt, &col_count);
+  ASSERT_TRUE(SQL_SUCCEEDED(ret));
+  std::cout << "num cols = " << col_count << std::endl;


remove this std::cout

NeerajDwivedii · 2025-11-17T16:42:09Z

+                         &data_type, &col_size, &decimal_digits, &nullable);
+    ASSERT_TRUE(SQL_SUCCEEDED(ret));
+
+    std::cout << "Column " << i << ": Name='" << col_name


same https://github.com/googleapis/cpp-bigquery-odbc/pull/1292/files#r2534799069

NeerajDwivedii · 2025-11-17T16:43:23Z

Remove all std::cout which in internal and test case implementation

shivamd-gpartner · 2025-11-21T11:44:52Z

 }

+TEST(StatementTest, Check_SQL_Primary_key) {
+  auto conn = std::make_shared<ODBCHandles>();


these test cases will pass even on main branch as SQLNumResultCols is succedding even on main with column count as 0 and for loop won't be triggered, please modify them to check for explicit column count number

test cases are now updated

NeerajDwivedii · 2025-11-25T09:27:47Z

+# Ignores this word globally across the project
+[default.extend-words]


Revert this file changes.

This change is necessary because the checkers were failing

NeerajDwivedii · 2025-11-25T09:29:02Z

                                     type_info.col_size,
                                     descriptor_record.precision);
+    std::string const& col_name = res.name;
+


have you verified with simba? , each group taking same descriptor values

yes i have verified

shivamd-gpartner · 2025-11-26T07:57:59Z

 }

+TEST(StatementTest, Check_SQL_Primary_key) {
+  auto conn = std::make_shared<ODBCHandles>();


see to combine the common functionality in both the test cases in one single function as can see a lot of common functionality including the ExpectedCol structure

sachinpro · 2025-12-17T09:43:48Z

+    {"TABLE_SCHEM", ColumnSchema{1, BQDataType::kString}},
+    {"TABLE_NAME", ColumnSchema{2, BQDataType::kString}},
+    {"COLUMN_NAME", ColumnSchema{3, BQDataType::kString}},
+    {"KEY_SEQ", ColumnSchema{4, BQDataType::kInt64}},


You can probably add KEY_SEQ and PK_NAME to kODBCColumnsMap.

Please see if code duplication can be avoided in other places as well.

@Anshu6250 Any update on this?

hi @sachinpro
Yes, I’ve updated this. I introduced a common schema containing shared metadata columns like TABLE_CAT, TABLE_SCHEM, TABLE_NAME, COLUMN_NAME, KEY_SEQ, and PK_NAME, and reused it to avoid duplication.

…LForeignKeys

Anshu6250 temporarily deployed to internal November 14, 2025 10:35 — with GitHub Actions Inactive

Anshu6250 requested a review from NeerajDwivedii November 14, 2025 10:39

Anshu6250 changed the title ~~impl(bq_driver): added metadata descriptors for SQLPrimaryKeys and SQ…~~ impl(bq_driver): metadata descriptors for SQLPrimaryKeys and SQLForeignKeys Nov 14, 2025

Anshu6250 temporarily deployed to internal November 17, 2025 11:38 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 11:47 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 11:48 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 11:49 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 11:57 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 12:15 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 12:44 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 17, 2025 12:51 — with GitHub Actions Inactive

NeerajDwivedii reviewed Nov 17, 2025

View reviewed changes

Anshu6250 temporarily deployed to internal November 18, 2025 06:38 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 18, 2025 06:41 — with GitHub Actions Inactive

Anshu6250 requested review from NeerajDwivedii and shivamd-gpartner November 18, 2025 06:54

shivamd-gpartner reviewed Nov 21, 2025

View reviewed changes

Anshu6250 temporarily deployed to internal November 24, 2025 04:26 — with GitHub Actions Inactive

Anshu6250 force-pushed the metadata_descriptor_pri_and_sec branch from 039322c to 33b5851 Compare November 24, 2025 04:27

Anshu6250 temporarily deployed to internal November 24, 2025 04:27 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 24, 2025 04:32 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 24, 2025 10:51 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 24, 2025 11:12 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 24, 2025 13:13 — with GitHub Actions Inactive

NeerajDwivedii reviewed Nov 25, 2025

View reviewed changes

NeerajDwivedii force-pushed the metadata_descriptor_pri_and_sec branch from ba11869 to 3efe3f9 Compare November 25, 2025 09:50

NeerajDwivedii temporarily deployed to internal November 25, 2025 09:50 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 26, 2025 05:44 — with GitHub Actions Inactive

Anshu6250 requested a review from NeerajDwivedii November 26, 2025 07:33

NeerajDwivedii approved these changes Nov 26, 2025

View reviewed changes

Anshu6250 requested a review from shivamd-gpartner November 26, 2025 07:48

shivamd-gpartner reviewed Nov 26, 2025

View reviewed changes

Anshu6250 temporarily deployed to internal November 26, 2025 08:33 — with GitHub Actions Inactive

Anshu6250 temporarily deployed to internal November 26, 2025 08:34 — with GitHub Actions Inactive

Anshu6250 force-pushed the metadata_descriptor_pri_and_sec branch from 86fe8df to cf8da38 Compare November 26, 2025 08:35

Anshu6250 temporarily deployed to internal November 26, 2025 08:36 — with GitHub Actions Inactive

Anshu6250 requested a review from shivamd-gpartner November 26, 2025 10:51

sachinpro marked this pull request as ready for review November 27, 2025 11:24

sachinpro requested a review from a team November 27, 2025 11:24

Anshu6250 requested a review from sachinpro December 2, 2025 08:17

sachinpro force-pushed the metadata_descriptor_pri_and_sec branch from cf8da38 to 47d13cf Compare December 9, 2025 15:52

sachinpro temporarily deployed to internal December 9, 2025 15:53 — with GitHub Actions Inactive

Anshu6250 force-pushed the metadata_descriptor_pri_and_sec branch from 47d13cf to 48e7f73 Compare December 17, 2025 05:55

Anshu6250 temporarily deployed to internal December 17, 2025 05:55 — with GitHub Actions Inactive

sachinpro reviewed Dec 17, 2025

View reviewed changes

Anshu6250 added 6 commits December 22, 2025 10:52

impl(bq_driver): added metadata descriptors for SQLPrimaryKeys and SQ…

04b57c5

…LForeignKeys

checkers changes

c3bc02b

structured the test cases

efe73f9

checkers

56fc24a

reduce code redundancy and checkers

bf91c1a

reduced code redundancy

6daa6d9

Anshu6250 force-pushed the metadata_descriptor_pri_and_sec branch from 24256da to 6daa6d9 Compare December 22, 2025 11:04

		# Ignores this word globally across the project
		[default.extend-words]

Conversation

Anshu6250 commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NeerajDwivedii commented Nov 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Anshu6250 Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Anshu6250 commented Nov 14, 2025 •

edited

Loading

Anshu6250 Nov 26, 2025 •

edited

Loading