diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilder.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilder.java
index 3d1e774f..7fc556d4 100644
--- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilder.java
+++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilder.java
@@ -61,6 +61,7 @@ public class RDBMSTableMetaDataBuilder
       typeMap.put("VARBINARY", QFieldType.BLOB);
       typeMap.put("MEDIUMBLOB", QFieldType.BLOB);
       typeMap.put("NUMERIC", QFieldType.INTEGER);
+      typeMap.put("INTEGER", QFieldType.INTEGER);
       typeMap.put("BIGINT UNSIGNED", QFieldType.LONG);
       typeMap.put("MEDIUMINT UNSIGNED", QFieldType.INTEGER);
       typeMap.put("SMALLINT UNSIGNED", QFieldType.INTEGER);
@@ -95,9 +96,18 @@ public class RDBMSTableMetaDataBuilder
             dataTypeMap.put(id, name);
          }
 
+         // todo - for h2, uppercase both db & table names...
          String databaseName = backendMetaData.getDatabaseName(); // these work for mysql - unclear about other vendors.
          String schemaName   = null;
-         try(ResultSet tableResultSet = databaseMetaData.getTables(databaseName, schemaName, tableName, null))
+         String tableNameForMetaDataQueries = tableName;
+
+         if(backendMetaData.getVendor().equals("h2"))
+         {
+            databaseName = databaseName.toUpperCase();
+            tableNameForMetaDataQueries = tableName.toUpperCase();
+         }
+
+         try(ResultSet tableResultSet = databaseMetaData.getTables(databaseName, schemaName, tableNameForMetaDataQueries, null))
          {
             if(!tableResultSet.next())
             {
@@ -105,7 +115,7 @@ public class RDBMSTableMetaDataBuilder
             }
          }
 
-         try(ResultSet columnsResultSet = databaseMetaData.getColumns(databaseName, schemaName, tableName, null))
+         try(ResultSet columnsResultSet = databaseMetaData.getColumns(databaseName, schemaName, tableNameForMetaDataQueries, null))
          {
             while(columnsResultSet.next())
             {
@@ -119,7 +129,7 @@ public class RDBMSTableMetaDataBuilder
                QFieldType type         = typeMap.get(dataTypeName);
                if(type == null)
                {
-                  LOG.info("Table " + tableName + " column " + columnName + " has an unampped type: " + dataTypeId + ".  Field will not be added to QTableMetaData");
+                  LOG.info("Table " + tableName + " column " + columnName + " has an unmapped type: " + dataTypeId + ".  Field will not be added to QTableMetaData");
                   continue;
                }
 
@@ -133,7 +143,7 @@ public class RDBMSTableMetaDataBuilder
 
                if("YES".equals(isAutoIncrement))
                {
-                  primaryKey = columnName;
+                  primaryKey = qqqFieldName;
                }
             }
          }
diff --git a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilderTest.java b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilderTest.java
new file mode 100644
index 00000000..c6b8fc17
--- /dev/null
+++ b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/model/metadata/RDBMSTableMetaDataBuilderTest.java
@@ -0,0 +1,70 @@
+/*
+ * QQQ - Low-code Application Framework for Engineers.
+ * Copyright (C) 2021-2024.  Kingsrook, LLC
+ * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
+ * contact@kingsrook.com
+ * https://github.com/Kingsrook/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.kingsrook.qqq.backend.module.rdbms.model.metadata;
+
+
+import com.kingsrook.qqq.backend.core.context.QContext;
+import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
+import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType;
+import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
+import com.kingsrook.qqq.backend.module.rdbms.BaseTest;
+import com.kingsrook.qqq.backend.module.rdbms.TestUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+/*******************************************************************************
+ ** Unit test for RDBMSTableMetaDataBuilder 
+ *******************************************************************************/
+class RDBMSTableMetaDataBuilderTest extends BaseTest
+{
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @BeforeEach
+   void beforeEach() throws Exception
+   {
+      TestUtils.primeTestDatabase("prime-test-database.sql");
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   void test() throws QException
+   {
+      QBackendMetaData backend = QContext.getQInstance().getBackend(TestUtils.DEFAULT_BACKEND_NAME);
+      QTableMetaData   table   = new RDBMSTableMetaDataBuilder().buildTableMetaData((RDBMSBackendMetaData) backend, "order");
+
+      assertNotNull(table);
+      assertEquals("order", table.getName());
+      assertEquals("id", table.getPrimaryKeyField());
+      assertEquals(QFieldType.INTEGER, table.getField(table.getPrimaryKeyField()).getType());
+      assertNotNull(table.getField("storeId"));
+   }
+
+}
\ No newline at end of file