Permalink
Browse files

Merge erroneously multiple Oracle upgrade scripts

  • Loading branch information...
1 parent 8d25891 commit d0a7078cd6233e0064ce38a080fe0fe5e16572a9 @mwoodiupui mwoodiupui committed Oct 9, 2012
Showing with 8 additions and 28 deletions.
  1. +8 −0 dspace/etc/oracle/database_schema_18-3.sql
  2. +0 −28 dspace/etc/oracle/database_schema_18-30.sql
@@ -49,3 +49,11 @@ CREATE TABLE versionitem
CREATE SEQUENCE versionitem_seq;
CREATE SEQUENCE versionhistory_seq;
+
+
+-------------------------------------------
+-- New columns and longer hash for salted password hashing DS-861 --
+-------------------------------------------
+ALTER TABLE EPerson ALTER COLUMN password TYPE VARCHAR(128);
+ALTER TABLE EPerson ADD salt VARCHAR(32);
+ALTER TABLE EPerson ADD digest_algorithm VARCHAR(16);
@@ -1,28 +0,0 @@
---
--- database_schema_18-30.sql
---
--- Version: $Revision$
---
--- Date: $Date$
---
--- The contents of this file are subject to the license and copyright
--- detailed in the LICENSE and NOTICE files at the root of the source
--- tree and available online at
---
--- http://www.dspace.org/license/
---
-
---
--- SQL commands to upgrade the database schema of a live DSpace 1.8 or 1.8.x
--- to the DSpace 3.0 database schema
---
--- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
--- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
--- DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST. DUMP YOUR DATABASE FIRST.
---
--------------------------------------------
--- New columns and longer hash for salted password hashing DS-861 --
--------------------------------------------
-ALTER TABLE EPerson ALTER COLUMN password TYPE VARCHAR(128);
-ALTER TABLE EPerson ADD salt VARCHAR(32);
-ALTER TABLE EPerson ADD digest_algorithm VARCHAR(16);

0 comments on commit d0a7078

Please sign in to comment.