Spelling conformity

The jar_repository and jar_entry table names aren't plural, so
jar_descriptor should not be either.

Author: J Chapman Flack

pljava-deploy/src/main/java/org/postgresql/pljava/deploy/Deployer.java

@@ -386,14 +386,14 @@ public void initializeSQLJSchema()
 		stmt.execute("GRANT SELECT ON sqlj.jar_entry TO public");
 
 		stmt.execute(
-			"CREATE TABLE sqlj.jar_descriptors(" +
+			"CREATE TABLE sqlj.jar_descriptor(" +
 			"   jarId		INT REFERENCES sqlj.jar_repository ON DELETE CASCADE," +
 			"   ordinal     INT2," +
 			"   PRIMARY KEY (jarId, ordinal)," +
 			"   entryId     INT NOT NULL REFERENCES sqlj.jar_entry ON DELETE CASCADE" +
 			")");
 
-		stmt.execute("GRANT SELECT ON sqlj.jar_descriptors TO public");
+		stmt.execute("GRANT SELECT ON sqlj.jar_descriptor TO public");
 
 		// Create the table maintaining the class path.
 		//

pljava/src/main/java/org/postgresql/pljava/management/Commands.java

@@ -335,7 +335,7 @@ public static void addClassImages(int jarId, InputStream urlStream)
 					if ( descIdStoreStmt == null )
 						descIdStoreStmt = SQLUtils.getDefaultConnection()
 							.prepareStatement(
-								"INSERT INTO sqlj.jar_descriptors"
+								"INSERT INTO sqlj.jar_descriptor"
 									+ " (jarId, entryId, ordinal) VALUES"
 									+ " ( ?, ?, ? )");
 					descIdStoreStmt.setInt(1, jarId);
@@ -830,7 +830,7 @@ private static SQLDeploymentDescriptor[] getDeploymentDescriptor(int jarId)
 		PreparedStatement stmt = SQLUtils.getDefaultConnection()
 			.prepareStatement(
 				"SELECT e.entryImage"
-					+ " FROM sqlj.jar_descriptors d INNER JOIN sqlj.jar_entry e"
+					+ " FROM sqlj.jar_descriptor d INNER JOIN sqlj.jar_entry e"
 					+ "   ON d.entryId = e.entryId"
 					+ " WHERE d.jarId = ?"
 					+ " ORDER BY d.ordinal");

src/sql/install.sql

@@ -31,13 +31,13 @@ CREATE TABLE sqlj.jar_entry(
 );
 GRANT SELECT ON sqlj.jar_entry TO public;
 
-CREATE TABLE sqlj.jar_descriptors(
+CREATE TABLE sqlj.jar_descriptor(
 	jarId		INT REFERENCES sqlj.jar_repository ON DELETE CASCADE,
 	ordinal		INT2,
 	PRIMARY KEY (jarId, ordinal),
 	entryId     INT NOT NULL REFERENCES sqlj.jar_entry ON DELETE CASCADE
 );
-GRANT SELECT ON sqlj.jar_descriptors TO public;
+GRANT SELECT ON sqlj.jar_descriptor TO public;
 
 CREATE TABLE sqlj.classpath_entry(
 	schemaName	VARCHAR(30) NOT NULL,