Revision: 13271
http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13271&view=rev
Author: andy_jefferson
Date: 2011-07-12 10:59:44 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
[NUCCORE-743] Respect autoCreate flags in value generation
Modified Paths:
--------------
platform/accessplatform/trunk/build.properties
platform/store.excel/trunk/META-INF/MANIFEST.MF
platform/store.excel/trunk/pom.xml
platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/IncrementGenerator.java
platform/store.hbase/trunk/META-INF/MANIFEST.MF
platform/store.hbase/trunk/pom.xml
platform/store.hbase/trunk/src/java/org/datanucleus/store/hbase/valuegenerator/IncrementGenerator.java
platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/valuegenerator/IncrementGenerator.java
platform/store.odf/trunk/META-INF/MANIFEST.MF
platform/store.odf/trunk/pom.xml
platform/store.odf/trunk/src/java/org/datanucleus/store/odf/valuegenerator/IncrementGenerator.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java
Modified: platform/accessplatform/trunk/build.properties
===================================================================
--- platform/accessplatform/trunk/build.properties 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/accessplatform/trunk/build.properties 2011-07-12 10:59:44 UTC (rev 13271)
@@ -40,10 +40,10 @@
datanucleus-rdbms.version=3.0.0-release-SNAPSHOT
datanucleus-db4o.version=3.0.0-m3
datanucleus-neodatis.version=3.0.0-m3
-datanucleus-excel.version=3.0.0-m5
-datanucleus-odf.version=3.0.0-m5
+datanucleus-excel.version=3.0.0-release-SNAPSHOT
+datanucleus-odf.version=3.0.0-release-SNAPSHOT
datanucleus-xml.version=3.0.0-m5
-datanucleus-hbase.version=3.0.0-m5
+datanucleus-hbase.version=3.0.0-release-SNAPSHOT
datanucleus-json.version=3.0.0-m5
datanucleus-mongodb.version=3.0.0-release-SNAPSHOT
datanucleus-ldap.version=3.0.0-m4
Modified: platform/store.excel/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.excel/trunk/META-INF/MANIFEST.MF 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.excel/trunk/META-INF/MANIFEST.MF 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Excel Plug-in
Bundle-SymbolicName: org.datanucleus.store.excel;singleton:=true
-Bundle-Version: 3.0.0.m5
+Bundle-Version: 3.0.0.release
Bundle-Vendor: DataNucleus
-Require-Bundle: org.datanucleus;bundle-version="3.0.0.m4"
+Require-Bundle: org.datanucleus;bundle-version="3.0.0.release"
Import-Package: javax.transaction;resolution:=optional,
javax.transaction.xa;resolution:=optional,
org.apache.poi.hssf.usermodel,
Modified: platform/store.excel/trunk/pom.xml
===================================================================
--- platform/store.excel/trunk/pom.xml 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.excel/trunk/pom.xml 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.datanucleus</groupId>
- <version>3.0.0-m5</version>
+ <version>3.0.0-release-SNAPSHOT</version>
<artifactId>datanucleus-excel</artifactId>
<name>DataNucleus EXCEL plugin</name>
<description>
Modified: platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/IncrementGenerator.java
===================================================================
--- platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/IncrementGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/IncrementGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -25,6 +25,7 @@
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.connection.ManagedConnection;
import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
@@ -104,6 +105,11 @@
Cell valueCell = null;
if (sheet == null)
{
+ if (!storeMgr.isAutoCreateTables())
+ {
+ throw new NucleusUserException(LOCALISER.msg("040011", worksheetName));
+ }
+
sheet = spreadsheetDoc.createSheet(worksheetName);
row = sheet.createRow(0);
Cell cell = row.createCell(0);
Modified: platform/store.hbase/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.hbase/trunk/META-INF/MANIFEST.MF 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.hbase/trunk/META-INF/MANIFEST.MF 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Hbase Plug-in
Bundle-SymbolicName: org.datanucleus.store.hbase;singleton:=true
-Bundle-Version: 3.0.0.m5
+Bundle-Version: 3.0.0.release
Bundle-Vendor: DataNucleus
-Require-Bundle: org.datanucleus;bundle-version="3.0.0.m4"
+Require-Bundle: org.datanucleus;bundle-version="3.0.0.release"
Import-Package: javax.transaction;resolution:=optional,
javax.transaction.xa;resolution:=optional,
org.apache.hadoop.conf,
Modified: platform/store.hbase/trunk/pom.xml
===================================================================
--- platform/store.hbase/trunk/pom.xml 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.hbase/trunk/pom.xml 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.datanucleus</groupId>
- <version>3.0.0-m5</version>
+ <version>3.0.0-release-SNAPSHOT</version>
<artifactId>datanucleus-hbase</artifactId>
<name>DataNucleus HBase plugin</name>
<description>
Modified: platform/store.hbase/trunk/src/java/org/datanucleus/store/hbase/valuegenerator/IncrementGenerator.java
===================================================================
--- platform/store.hbase/trunk/src/java/org/datanucleus/store/hbase/valuegenerator/IncrementGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.hbase/trunk/src/java/org/datanucleus/store/hbase/valuegenerator/IncrementGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -30,6 +30,7 @@
import org.apache.hadoop.hbase.io.hfile.Compression.Algorithm;
import org.apache.hadoop.hbase.util.Bytes;
import org.datanucleus.exceptions.NucleusDataStoreException;
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.hbase.HBaseStoreManager;
import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
@@ -94,6 +95,11 @@
HBaseAdmin admin = new HBaseAdmin(hbaseMgr.getHbaseConfig());
if (!admin.tableExists(this.tableName))
{
+ if (!storeMgr.isAutoCreateTables())
+ {
+ throw new NucleusUserException(LOCALISER.msg("040011", tableName));
+ }
+
NucleusLogger.VALUEGENERATION.debug("IncrementGenerator: Creating Table '" + this.tableName + "'");
HTableDescriptor ht = new HTableDescriptor(this.tableName);
HColumnDescriptor hcd = new HColumnDescriptor(INCREMENT_COL_NAME);
Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/valuegenerator/IncrementGenerator.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/valuegenerator/IncrementGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/valuegenerator/IncrementGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -20,6 +20,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.connection.ManagedConnection;
import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
@@ -96,10 +98,14 @@
ManagedConnection mconn = connectionProvider.retrieveConnection();
try
{
+ DB db = (DB)mconn.getConnection();
+ if (!storeMgr.isAutoCreateTables() && !db.collectionExists(collectionName))
+ {
+ throw new NucleusUserException(LOCALISER.msg("040011", collectionName));
+ }
+
// Create the collection if not existing
- DB db = (DB)mconn.getConnection();
DBCollection dbCollection = db.getCollection(collectionName);
-
BasicDBObject query = new BasicDBObject();
query.put("field-name", key);
DBCursor curs = dbCollection.find(query);
Modified: platform/store.odf/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.odf/trunk/META-INF/MANIFEST.MF 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.odf/trunk/META-INF/MANIFEST.MF 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: ODF Plugin
Bundle-SymbolicName: org.datanucleus.store.odf;singleton:=true
-Bundle-Version: 3.0.0.m5
+Bundle-Version: 3.0.0.release
Bundle-Vendor: DataNucleus
-Require-Bundle: org.datanucleus;bundle-version="3.0.0.m4"
+Require-Bundle: org.datanucleus;bundle-version="3.0.0.release"
Import-Package: javax.transaction;resolution:=optional,
javax.transaction.xa;resolution:=optional,
org.apache.xerces.dom,
Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.odf/trunk/pom.xml 2011-07-12 10:59:44 UTC (rev 13271)
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.datanucleus</groupId>
- <version>3.0.0-m5</version>
+ <version>3.0.0-release-SNAPSHOT</version>
<artifactId>datanucleus-odf</artifactId>
<name>DataNucleus ODF plugin</name>
<description>
Modified: platform/store.odf/trunk/src/java/org/datanucleus/store/odf/valuegenerator/IncrementGenerator.java
===================================================================
--- platform/store.odf/trunk/src/java/org/datanucleus/store/odf/valuegenerator/IncrementGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.odf/trunk/src/java/org/datanucleus/store/odf/valuegenerator/IncrementGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -21,6 +21,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Properties;
+
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.connection.ManagedConnection;
import org.datanucleus.store.valuegenerator.AbstractDatastoreGenerator;
import org.datanucleus.store.valuegenerator.ValueGenerationBlock;
@@ -103,6 +105,11 @@
OdfTableRow row = null;
if (table == null)
{
+ if (!storeMgr.isAutoCreateTables())
+ {
+ throw new NucleusUserException(LOCALISER.msg("040011", worksheetName));
+ }
+
table = OdfTable.newTable(spreadsheetDoc, 1, 2);
table.setTableName(worksheetName);
row = table.getRowByIndex(0);
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/SequenceGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Properties;
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.mapped.DatastoreAdapter;
import org.datanucleus.store.mapped.DatastoreIdentifier;
import org.datanucleus.store.rdbms.RDBMSStoreManager;
@@ -243,6 +244,11 @@
RDBMSAdapter dba = (RDBMSAdapter)srm.getDatastoreAdapter();
SQLController sqlControl = srm.getSQLController();
+ if (!srm.isAutoCreateTables())
+ {
+ throw new NucleusUserException(LOCALISER.msg("040010", getSequenceName()));
+ }
+
Integer min = properties.containsKey("key-min-value") ?
Integer.valueOf(properties.getProperty("key-min-value")) : null;
Integer max = properties.containsKey("key-max-value") ?
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java 2011-07-12 10:52:05 UTC (rev 13270)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java 2011-07-12 10:59:44 UTC (rev 13271)
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Properties;
+import org.datanucleus.exceptions.NucleusUserException;
import org.datanucleus.store.mapped.DatastoreAdapter;
import org.datanucleus.store.mapped.DatastoreClass;
import org.datanucleus.store.mapped.DatastoreIdentifier;
@@ -254,6 +255,12 @@
*/
protected boolean createRepository()
{
+ RDBMSStoreManager srm = (RDBMSStoreManager)storeMgr;
+ if (!srm.isAutoCreateTables())
+ {
+ throw new NucleusUserException(LOCALISER.msg("040011", sequenceTable));
+ }
+
try
{
if (sequenceTable == null)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|