Changeset 5883

Timestamp:

Nov 22, 2011, 12:00:03 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1630: Migrate from MySQL to PostgreSQL

Changed the export to skip exporting data if the file already exists. The main reason is to be able to create another export for a single table that has failed to be imported (eg. the '0'-value problem mentioned in [5882]) without having to run a full export.

File:

• trunk/src/core/net/sf/basedb/core/Migration.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/Migration.java

@@ -305 +305 @@
       nextTick = System.currentTimeMillis()+TICK_INTERVAL;
 
+      long approxRows = table.getRowCount(engine, connection, true);
+      File exportFile = getDataFile(table);
+      if (exportFile.exists())
+      {
+        // Skip this table and move on to the next
+        actualExported += approxRows;
+        progress.display((int)((actualExported * 100) / approxTotal), 
+            tableName + ": skipped (file already exists)\n");
+        continue; // with next table
+      }
+      
       // Get columns in sorted order
       SortedSet<ColumnInfo> columns =  new TreeSet<ColumnInfo>();
@@ -330 +341 @@
 
       // Create output file
-      File exportFile = getDataFile(table);
       writer = new BufferedWriter(
           new OutputStreamWriter(FileUtil.getOutputStream(exportFile), "UTF-8"));
 
-      long approxRows = table.getRowCount(engine, connection, true);
       ResultSet rows = st.executeQuery(select.toString());
       int actualRows = 0;