From f2ebfe346dec0f08474286ad741ae8e2c8dff1bd Mon Sep 17 00:00:00 2001
From: andyjefferson <andy@datanucleus.org>
Date: Tue, 28 Feb 2017 07:39:56 +0000
Subject: [PATCH] Support "schema" / "catalog" of SequenceGenerator /
 <sequence-generator>. Fixes #72

---
 .../api/jpa/metadata/JPAAnnotationReader.java         | 11 +++++++++++
 .../api/jpa/metadata/JPAMetaDataHandler.java          | 10 ++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java b/src/main/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
index 89196fd..ed8c178 100644
--- a/src/main/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
+++ b/src/main/java/org/datanucleus/api/jpa/metadata/JPAAnnotationReader.java
@@ -3504,6 +3504,17 @@ private void processSequenceGeneratorAnnotation(PackageMetaData pmd, Map<String,
         seqmd.setDatastoreSequence(seqName);
         seqmd.setInitialValue(initialValue.intValue());
         seqmd.setAllocationSize(allocationSize.intValue());
+
+        String catalogName = (String)annotationValues.get("catalog");
+        if (!StringUtils.isWhitespace(catalogName))
+        {
+            seqmd.setCatalogName(catalogName);
+        }
+        String schemaName = (String)annotationValues.get("schema");
+        if (!StringUtils.isWhitespace(schemaName))
+        {
+            seqmd.setSchemaName(schemaName);
+        }
     }
 
     /**
diff --git a/src/main/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java b/src/main/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
index cd115f7..b2f1fa9 100644
--- a/src/main/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
+++ b/src/main/java/org/datanucleus/api/jpa/metadata/JPAMetaDataHandler.java
@@ -558,6 +558,16 @@ else if (localName.equals("sequence-generator"))
                 seqmd.setDatastoreSequence(datastoreSeqName);
                 seqmd.setInitialValue(initValue);
                 seqmd.setAllocationSize(allocSize);
+                String catalogName = getAttr(attrs, "catalog");
+                if (StringUtils.isWhitespace(catalogName))
+                {
+                    seqmd.setCatalogName(catalogName);
+                }
+                String schemaName = getAttr(attrs, "schema");
+                if (StringUtils.isWhitespace(schemaName))
+                {
+                    seqmd.setSchemaName(schemaName);
+                }
             }
             else if (localName.equals("table-generator"))
             {