Author: murdos
Date: 2009-11-02 22:35:11 +0000 (Mon, 02 Nov 2009)
New Revision: 12279
Modified:
search_server/branches/ngs/index/
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
Log:
Factorize insertion of reference data (types, format, ...) in unit tests.
Property changes on: search_server/branches/ngs/index
___________________________________________________________________
Added: svn:mergeinfo
+ /search_server/branches/lucene-java/index:12117-12127
/search_server/branches/ngs-playground/index:12209
/search_server/trunk/index:12128-12159
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/AbstractIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -13,7 +13,6 @@
protected Connection createConnection() throws Exception {
Class.forName("org.h2.Driver");
return DriverManager.getConnection("jdbc:h2:mem");
-
}
public void setup() throws Exception {
@@ -25,8 +24,6 @@
try {
Statement stmt = conn.createStatement();
stmt.addBatch("DROP TABLE country");
- stmt.addBatch("DROP TABLE language");
- stmt.addBatch("DROP TABLE script");
stmt.addBatch("DROP TABLE artist");
stmt.addBatch("DROP TABLE artist_alias");
@@ -42,6 +39,7 @@
stmt.addBatch("DROP TABLE label_type");
stmt.addBatch("DROP TABLE release");
+ stmt.addBatch("DROP TABLE release_meta");
stmt.addBatch("DROP TABLE release_name");
stmt.addBatch("DROP TABLE release_status");
stmt.addBatch("DROP TABLE release_packaging");
@@ -49,10 +47,10 @@
stmt.addBatch("DROP TABLE medium");
stmt.addBatch("DROP TABLE medium_format");
stmt.addBatch("DROP TABLE medium_cdtoc");
- stmt.addBatch("DROP TABLE release_meta");
stmt.addBatch("DROP TABLE tracklist");
+ stmt.addBatch("DROP TABLE language");
+ stmt.addBatch("DROP TABLE script");
-
stmt.addBatch("DROP TABLE release_group");
stmt.addBatch("DROP TABLE release_group_type");
@@ -72,8 +70,9 @@
stmt.addBatch("DROP TABLE cdtoc_raw");
stmt.addBatch("DROP TABLE track_raw");
+ stmt.addBatch("DROP TABLE work");
stmt.addBatch("DROP TABLE work_name");
- stmt.addBatch("DROP TABLE work");
+ stmt.addBatch("DROP TABLE work_type");
stmt.executeBatch();
stmt.close();
@@ -95,6 +94,8 @@
setupAnnotationTables(stmt);
setupCDStubTables(stmt);
setupWorkTables(stmt);
+ insertReferenceData(stmt);
+
stmt.executeBatch();
stmt.close();
}
@@ -106,39 +107,19 @@
}
protected void setupCommonTables(Statement stmt) throws Exception {
- stmt.addBatch("CREATE TABLE country" +
- "(" +
+ stmt.addBatch("CREATE TABLE country (" +
" id serial NOT NULL," +
" isocode character varying(2) NOT NULL," +
" name character varying(100) NOT NULL" +
")");
- stmt.addBatch("CREATE TABLE language" +
- "(" +
- " id serial NOT NULL," +
- " isocode_3t character(3) NOT NULL," +
- " isocode_3b character(3) NOT NULL," +
- " isocode_2 character(2)," +
- " name character varying(100) NOT NULL," +
- " frequency integer NOT NULL DEFAULT 0," +
- " CONSTRAINT language_pkey PRIMARY KEY (id)" +
- ")");
-
- stmt.addBatch("CREATE TABLE script" +
- "(" +
- " id serial NOT NULL," +
- " isocode character(4) NOT NULL," +
- " isonumber character(3) NOT NULL," +
- " name character varying(100) NOT NULL," +
- " frequency integer NOT NULL DEFAULT 0" +
- ")");
}
protected void setupArtistTables(Statement stmt) throws Exception {
stmt.addBatch("CREATE TABLE artist (" +
" id serial NOT NULL," +
- " gid character(36) NOT NULL," +
+ " gid uuid NOT NULL," +
" name integer NOT NULL," +
" sortname integer NOT NULL," +
" begindate_year integer," +
@@ -195,7 +176,7 @@
protected void setupLabelTables(Statement stmt) throws Exception {
stmt.addBatch("CREATE TABLE label (" +
" id serial NOT NULL," +
- " gid character(36) NOT NULL," +
+ " gid uuid NOT NULL," +
" name integer NOT NULL," +
" sortname integer NOT NULL," +
" begindate_year integer," +
@@ -234,7 +215,7 @@
stmt.addBatch("CREATE TABLE release (" +
" id serial NOT NULL," +
- " gid character(36)," +
+ " gid uuid NOT NULL," +
" name integer NOT NULL," +
" artist_credit integer NOT NULL," +
" release_group integer NOT NULL," +
@@ -290,8 +271,7 @@
" year integer" +
")");
- stmt.addBatch("CREATE TABLE release_meta" +
- "(" +
+ stmt.addBatch("CREATE TABLE release_meta (" +
" id integer NOT NULL," +
" lastupdate timestamp," +
" dateadded timestamp," +
@@ -301,8 +281,7 @@
" amazonstore character varying(20)" +
")");
- stmt.addBatch("CREATE TABLE medium_cdtoc" +
- "(" +
+ stmt.addBatch("CREATE TABLE medium_cdtoc (" +
" id serial NOT NULL," +
" medium integer NOT NULL," +
" cdtoc integer NOT NULL," +
@@ -310,18 +289,34 @@
" CONSTRAINT medium_cdtoc_pkey PRIMARY KEY (id)" +
")");
- stmt.addBatch("CREATE TABLE tracklist" +
- "(" +
+ stmt.addBatch("CREATE TABLE tracklist (" +
" id serial NOT NULL," +
" trackcount integer NOT NULL DEFAULT 0," +
" CONSTRAINT tracklist_pkey PRIMARY KEY (id)" +
")");
+
+ stmt.addBatch("CREATE TABLE language (" +
+ " id serial NOT NULL," +
+ " isocode_3t character(3) NOT NULL," +
+ " isocode_3b character(3) NOT NULL," +
+ " isocode_2 character(2)," +
+ " name character varying(100) NOT NULL," +
+ " frequency integer NOT NULL DEFAULT 0," +
+ " CONSTRAINT language_pkey PRIMARY KEY (id)" +
+ ")");
+
+ stmt.addBatch("CREATE TABLE script (" +
+ " id serial NOT NULL," +
+ " isocode character(4) NOT NULL," +
+ " isonumber character(3) NOT NULL," +
+ " name character varying(100) NOT NULL," +
+ " frequency integer NOT NULL DEFAULT 0" +
+ ")");
}
protected void setupReleaseGroupTables(Statement stmt) throws Exception {
- stmt.addBatch("CREATE TABLE release_group" +
- "(" +
+ stmt.addBatch("CREATE TABLE release_group (" +
" id serial NOT NULL," +
" gid uuid NOT NULL," +
" name integer NOT NULL," +
@@ -331,8 +326,7 @@
" editpending integer NOT NULL DEFAULT 0" +
")");
- stmt.addBatch("CREATE TABLE release_group_type" +
- "(" +
+ stmt.addBatch("CREATE TABLE release_group_type (" +
" id serial NOT NULL," +
" name character varying(255) NOT NULL" +
")");
@@ -340,16 +334,14 @@
protected void setupRecordingTables(Statement stmt) throws Exception {
- stmt.addBatch("CREATE TABLE track_name" +
- "(" +
+ stmt.addBatch("CREATE TABLE track_name (" +
" id serial NOT NULL," +
" name character varying NOT NULL," +
" refcount integer DEFAULT 0," +
" CONSTRAINT track_name_pkey PRIMARY KEY (id)" +
")");
- stmt.addBatch("CREATE TABLE track" +
- "(" +
+ stmt.addBatch("CREATE TABLE track (" +
" id serial NOT NULL," +
" recording integer NOT NULL," +
" tracklist integer NOT NULL," +
@@ -361,8 +353,7 @@
" CONSTRAINT track_pkey PRIMARY KEY (id)" +
")");
- stmt.addBatch("CREATE TABLE recording" +
- "(" +
+ stmt.addBatch("CREATE TABLE recording (" +
" id serial NOT NULL," +
" gid uuid NOT NULL," +
" name integer NOT NULL," +
@@ -375,54 +366,48 @@
}
protected void setupAnnotationTables(Statement stmt) throws Exception {
+
stmt.addBatch(
- "CREATE TABLE annotation" +
- "(" +
+ "CREATE TABLE annotation (" +
" id serial NOT NULL, " +
" editor integer NOT NULL," +
" text text," +
" changelog character varying(255), " +
" created timestamp," +
- " CONSTRAINT annotation_pkey PRIMARY KEY (id))" );
+ " CONSTRAINT annotation_pkey PRIMARY KEY (id)" +
+ ")" );
-
- stmt.addBatch("CREATE TABLE artist_annotation" +
- "(" +
+ stmt.addBatch("CREATE TABLE artist_annotation (" +
" artist integer NOT NULL," +
" annotation integer NOT NULL," +
" CONSTRAINT artist_annotation_pkey PRIMARY KEY (artist, annotation)" +
")");
- stmt.addBatch("CREATE TABLE label_annotation" +
- "(" +
+ stmt.addBatch("CREATE TABLE label_annotation (" +
" label integer NOT NULL," +
" annotation integer NOT NULL," +
" CONSTRAINT label_annotation_pkey PRIMARY KEY (label, annotation)" +
")");
- stmt.addBatch("CREATE TABLE recording_annotation" +
- "(" +
+ stmt.addBatch("CREATE TABLE recording_annotation (" +
" recording integer NOT NULL," +
" annotation integer NOT NULL," +
" CONSTRAINT recording_annotation_pkey PRIMARY KEY (recording, annotation)" +
")");
- stmt.addBatch("CREATE TABLE release_annotation" +
- "(" +
- " release integer NOT NULL," +
- " annotation integer NOT NULL," +
- " CONSTRAINT release_annotation_pkey PRIMARY KEY (release, annotation)" +
- ")");
+ stmt.addBatch("CREATE TABLE release_annotation (" +
+ " release integer NOT NULL," +
+ " annotation integer NOT NULL," +
+ " CONSTRAINT release_annotation_pkey PRIMARY KEY (release, annotation)" +
+ ")");
- stmt.addBatch("CREATE TABLE release_group_annotation" +
- "(" +
+ stmt.addBatch("CREATE TABLE release_group_annotation (" +
" release_group integer NOT NULL," +
" annotation integer NOT NULL," +
" CONSTRAINT release_group_annotation_pkey PRIMARY KEY (release_group, annotation)" +
")");
- stmt.addBatch("CREATE TABLE work_annotation" +
- "(" +
+ stmt.addBatch("CREATE TABLE work_annotation (" +
" work integer NOT NULL," +
" annotation integer NOT NULL," +
" CONSTRAINT work_annotation_pkey PRIMARY KEY (work, annotation)" +
@@ -430,8 +415,8 @@
}
protected void setupCDStubTables(Statement stmt) throws Exception {
- stmt.addBatch("CREATE TABLE release_raw" +
- "(" +
+
+ stmt.addBatch("CREATE TABLE release_raw (" +
" id serial NOT NULL," +
" title character varying(255) NOT NULL," +
" artist character varying(255)," +
@@ -443,28 +428,28 @@
" barcode character varying(255)," +
" comment character varying(255)" +
")");
- stmt.addBatch("CREATE TABLE track_raw" +
- "(" +
+
+ stmt.addBatch("CREATE TABLE track_raw (" +
" id serial NOT NULL," +
" release integer NOT NULL," +
" title character varying(255) NOT NULL," +
" artist character varying(255)," +
" sequence integer NOT NULL" +
")");
- stmt.addBatch("CREATE TABLE cdtoc_raw" +
- "(" +
+
+ stmt.addBatch("CREATE TABLE cdtoc_raw (" +
" id serial NOT NULL," +
" release integer NOT NULL," +
" discid character(28) NOT NULL," +
" trackcount integer NOT NULL," +
- " leadoutoffset integer NOT NULL," +
- // " trackoffset integer[] NOT NULL" + //NOt need for our purposes hsql doesnt like syntax
+ " leadoutoffset integer NOT NULL" +
+ // " trackoffset integer[] NOT NULL" // Not needed for our purposes (and h2 doesn't support array)
")");
}
protected void setupWorkTables(Statement stmt) throws Exception {
- stmt.addBatch("CREATE TABLE work" +
- "(" +
+
+ stmt.addBatch("CREATE TABLE work (" +
" id serial NOT NULL," +
" gid uuid NOT NULL," +
" name integer NOT NULL," +
@@ -475,15 +460,91 @@
" editpending integer NOT NULL DEFAULT 0," +
" CONSTRAINT work_pkey PRIMARY KEY (id)" +
")");
- stmt.addBatch("CREATE TABLE work_name" +
- "(" +
+
+ stmt.addBatch("CREATE TABLE work_name (" +
" id serial NOT NULL," +
" name character varying NOT NULL," +
" refcount integer DEFAULT 0," +
" CONSTRAINT work_name_pkey PRIMARY KEY (id)" +
")");
- //stmt.addBatch("");
-
+
+ stmt.addBatch("CREATE TABLE work_type (" +
+ " id serial NOT NULL," +
+ " name character varying(255) NOT NULL" +
+ ")");
}
+
+ protected void insertReferenceData(Statement stmt) throws Exception {
+ stmt.addBatch("INSERT INTO gender (id, name) VALUES " +
+ "(1, 'Male'), " +
+ "(2, 'Female') "
+ );
+
+ stmt.addBatch("INSERT INTO artist_type (id, name) VALUES " +
+ "(1, 'Person'), " +
+ "(2, 'Group') "
+ );
+
+ stmt.addBatch("INSERT INTO label_type (id, name) VALUES " +
+ "(1, 'Distributor'), " +
+ "(2, 'Holding'), " +
+ "(3, 'Production'), " +
+ "(4, 'Original Production'), " +
+ "(5, 'Bootleg Production'), " +
+ "(6, 'Reissue Production'), " +
+ "(7, 'Publisher') "
+ );
+
+ stmt.addBatch("INSERT INTO release_status (id, name) VALUES " +
+ "(1, 'Official'), " +
+ "(2, 'Promotion'), " +
+ "(3, 'Bootleg'), " +
+ "(4, 'Pseudo-Release') "
+ );
+
+ stmt.addBatch("INSERT INTO release_packaging (id, name) VALUES " +
+ "(1, 'Jewel Case'), " +
+ "(2, 'Slim Jewel Case'), " +
+ "(3, 'Digipak'), " +
+ "(4, 'Paper Sleeve'), " +
+ "(5, 'Other') "
+ );
+
+ stmt.addBatch("INSERT INTO release_group_type (id, name) VALUES " +
+ "(1, 'Non-Album Tracks'), " +
+ "(2, 'Album'), " +
+ "(3, 'Single'), " +
+ "(4, 'EP'), " +
+ "(5, 'Compilation'), " +
+ "(6, 'Soundtrack'), " +
+ "(7, 'Spokenword'), " +
+ "(8, 'Interview'), " +
+ "(9, 'Audiobook'), " +
+ "(10, 'Live'), " +
+ "(11, 'Remix'), " +
+ "(12, 'Other') "
+ );
+
+ stmt.addBatch("INSERT INTO medium_format (id, name, year) VALUES " +
+ "(1, 'CD', 1982), " +
+ "(2, 'DVD', 1995), " +
+ "(3, 'SACD', 1999), " +
+ "(4, 'DualDisc', 2004), " +
+ "(5, 'LaserDisc', 1978), " +
+ "(6, 'MiniDisc', 1992), " +
+ "(7, 'Vinyl', 1895), " +
+ "(8, 'Cassette', 1964), " +
+ "(9, 'Cartridge', 1962), " +
+ "(10, 'Reel-to-reel', 1935), " +
+ "(11, 'DAT', 1976), " +
+ "(12, 'Digital Media', NULL), " +
+ "(13, 'Other', NULL), " +
+ "(14, 'Wax Cylinder', 1877), " +
+ "(15, 'Piano Roll', 1883), " +
+ "(16, 'DCC', 1992) "
+ );
+
+ }
+
}
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ArtistIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -38,13 +38,9 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Farming Incident',1)");
stmt.addBatch("INSERT INTO artist(id,name, gid, sortname,comment, begindate_year,begindate_month,enddate_year,type,editpending,gender,country)" +
" VALUES (521316,1, '4302e264-1cf0-4d1f-aca7-2a6f89e34b36',1,null, 1999,4, null, 2, 0,1,1)");
- stmt.addBatch("INSERT INTO gender(id, name)VALUES (1,'Male')");
- stmt.addBatch("INSERT INTO gender(id, name)VALUES (2,'Female')");
stmt.addBatch("INSERT INTO country( id, isocode, name)VALUES (1,'AF','Afghanistan')");
stmt.executeBatch();
@@ -57,8 +53,6 @@
conn.setAutoCommit(true);
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -79,8 +73,6 @@
conn.setAutoCommit(true);
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Farming Incident',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Siobhan Lynch',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Lynch, Siobhan',1)");
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/LabelIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -5,7 +5,6 @@
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
-import org.musicbrainz.search.analysis.StandardUnaccentAnalyzer;
import org.musicbrainz.search.analysis.PerFieldEntityAnalyzer;
import org.musicbrainz.search.index.LabelIndex;
import org.musicbrainz.search.index.LabelIndexField;
@@ -45,7 +44,6 @@
stmt.addBatch("INSERT INTO label_name (id, name) VALUES (1, '4AD')");
stmt.addBatch("INSERT INTO label_name (id, name) VALUES (2, '4AD US')");
- stmt.addBatch("INSERT INTO label_type (id, name) VALUES (4, 'Original Production')");
stmt.addBatch("INSERT INTO label(id, gid, name, sortname, type, labelcode, country, comment, " +
" begindate_year, begindate_month, begindate_day, enddate_year, enddate_month, enddate_day) " +
@@ -73,7 +71,6 @@
stmt.addBatch("INSERT INTO country (id, isocode, name) VALUES (38, 'CA','Canada')");
stmt.addBatch("INSERT INTO label_name (id, name) VALUES (3, 'MusicBrainz Data Testing Label')");
stmt.addBatch("INSERT INTO label_name (id, name) VALUES (4, 'Data Testing Label, MusicBrainz')");
- stmt.addBatch("INSERT INTO label_type (id, name) VALUES (7, 'Publisher')");
stmt.addBatch("INSERT INTO label(id, gid, name, sortname, type, labelcode, country, comment, " +
" begindate_year, begindate_month, begindate_day, enddate_year, enddate_month, enddate_day) " +
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -45,9 +45,6 @@
Statement stmt = conn.createStatement();
-
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -72,22 +69,11 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, 1, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,null,1,1,1, 1, 1, 1, 1, null, null, 1)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (1, 1, 1, 1)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (2, 1, 3, 1)");
stmt.addBatch("INSERT INTO tracklist(id, trackcount) VALUES (1,2)");
@@ -114,8 +100,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -140,22 +124,11 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1,null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,null,1,1,1, 1, 1, 1, 1, null, null, 1)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (1, 1, 1, 1)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (2, 1, 3, 1)");
stmt.addBatch("INSERT INTO tracklist(id, trackcount) VALUES (1,2)");
@@ -218,7 +191,7 @@
Document doc = ir.document(0);
assertEquals(1, doc.getFields(RecordingIndexField.RECORDING.getName()).length);
assertEquals(1, doc.getFields(RecordingIndexField.RELEASE_TYPE.getName()).length);
- assertEquals("Non Album Tracks", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
+ assertEquals("Non-Album Tracks", doc.getField(RecordingIndexField.RELEASE_TYPE.getName()).stringValue());
}
ir.close();
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseGroupIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -42,8 +42,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -69,10 +67,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, 2, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 1, 1, 1, 1, null, null, 1)");
@@ -94,8 +88,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -122,10 +114,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0);");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 1, 1, 1, 1, null, null, 1)");
@@ -147,8 +135,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -161,7 +147,6 @@
stmt.addBatch("INSERT INTO artist(id,name, gid, sortname,comment, begindate_year,begindate_month,enddate_year,type,editpending)" +
" VALUES (16153,1, 'ccd4879c-5e88-4385-b131-bf65296bf245',1,'a comment', 1978,null, 1995, 2, 0)");
-
stmt.addBatch("INSERT INTO release_name(id,name, refcount)VALUES (1, 'Crocodiles', 0)");
stmt.addBatch("INSERT INTO release_name(id,name, refcount)VALUES (2, 'Crocodiles (Bonus disc)', 0)");
stmt.addBatch("INSERT INTO release_name(id,name, refcount)VALUES (3, 'Crocodiles (Special disc)', 0)");
@@ -170,10 +155,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, 2, null, 0);");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 1, 1, 1, 1, null, null, 1)");
@@ -196,8 +177,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Erich Kunzel',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Kunzel, Eric',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'The Cincinnati Pops Orchestra',1)");
@@ -210,7 +189,6 @@
stmt.addBatch("INSERT INTO artist(id,name, gid, sortname,comment, begindate_year,begindate_month,enddate_year,type,editpending)" +
" VALUES (2,3, 'd8fbd94c-cd06-4e8b-a559-761ad969d07e',4,'a comment', 1978,null, 1995, 2, 0)");
-
stmt.addBatch("INSERT INTO artist_credit( id, artistcount, refcount) VALUES (1, 1, 1)");
stmt.addBatch("INSERT INTO artist_credit_name( artist_credit, position, artist,name, joinphrase)" +
" VALUES (1, 0, 1, 1, 'and')");
@@ -220,10 +198,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (1, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, 2, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (1,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 1, 1,1,1,1,1,1, 1, 1, 1, 1, null, null, 1)");
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/ReleaseIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -45,8 +45,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -72,22 +70,11 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, 3, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 1, 1, 1, 1, null, null, 1)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.addBatch("INSERT INTO medium_cdtoc( id, medium, cdtoc, editpending) VALUES (1, 1, 1, 0)");
@@ -109,8 +96,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -137,22 +122,11 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 1, null,null,null, null, null, 1)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, null, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.executeBatch();
stmt.close();
@@ -172,8 +146,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -198,22 +170,11 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,null,1,1,1, 1, 1, 1, 1, null, null, 1)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (1, 1, 1, 1)");
stmt.addBatch("INSERT INTO medium_cdtoc(id, medium, cdtoc, editpending) VALUES (2, 1, 3, 1)");
stmt.addBatch("INSERT INTO tracklist(id, trackcount) VALUES (1,10)");
@@ -235,8 +196,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -262,15 +221,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,1,1, 28, 1, 1, 1, null, null, 1)");
@@ -278,8 +228,6 @@
stmt.addBatch("INSERT INTO script(id, isocode, isonumber, name, frequency) VALUES (28,'Latn' , 215, 'Latin', 4)");
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.executeBatch();
stmt.close();
@@ -299,8 +247,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -326,15 +272,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,221,1, 28, 1970, 1, 1, '1212121212', null, 1)");
@@ -352,8 +289,6 @@
stmt.addBatch("INSERT INTO release_meta(id, lastupdate, dateadded, coverarturl, infourl, amazonasin,amazonstore) VALUES (491240, null,null,null,null,'123456789',null)");
stmt.addBatch("INSERT INTO medium(id, tracklist, release, position, format, name, editpending) VALUES (1, 1, 491240, 1, 7, null, 1)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (1, 'CD', 1982)");
- stmt.addBatch("INSERT INTO medium_format(id, name,year )VALUES (7, 'Vinyl', 1895)");
stmt.executeBatch();
stmt.close();
@@ -373,8 +308,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
@@ -400,15 +333,6 @@
stmt.addBatch("INSERT INTO release_group( id, gid,name,artist_credit,type,comment,editpending)" +
" VALUES (491240, 'efd2ace2-b3b9-305f-8a53-9803595c0e37', 1, 1, null, null, 0)");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (1,'Non Album Tracks')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (2,'Album')");
- stmt.addBatch("INSERT INTO release_group_type(id,name) VALUES (3,'Single')");
-
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (1,'Official')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (2,'Promotion')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (3,'Bootleg')");
- stmt.addBatch("INSERT INTO release_status(id,name) VALUES (4,'Psuedo-Release')");
-
stmt.addBatch("INSERT INTO release(id, gid, name, artist_credit, release_group, status, packaging,country, " +
"language, script, date_year, date_month, date_day,barcode, comment, editpending) " +
" VALUES (491240,'c3b8dbc9-c1ff-4743-9015-8d762819134e', 2, 1,491240,1,1,221,1, 28, 1, 1, 1, null, null, 1)");
Modified: search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java
===================================================================
--- search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-11-02 17:13:41 UTC (rev 12278)
+++ search_server/branches/ngs/index/src/test/java/org/musicbrainz/search/index/WorkIndexTest.java 2009-11-02 22:35:11 UTC (rev 12279)
@@ -34,8 +34,6 @@
Statement stmt = conn.createStatement();
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (1, 'Person');");
- stmt.addBatch("INSERT INTO artist_type(id,name)VALUES (2, 'Group');");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (1,'Echo & The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (2,'Echo and The Bunnymen',1)");
stmt.addBatch("INSERT INTO artist_name(id,name,refcount) values (3,'Echo & The Bunnyman',1)");
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
