Skip to content

Commit 7797750

Browse files
Commit confusing code for debugging attempts
1 parent 1bcb532 commit 7797750

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

src/main/java/org/javawebstack/orm/TableInfo.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ public TableInfo(Class<? extends Model> model, ORMConfig config) throws ORMConfi
4747
tableName = table.value();
4848
} else {
4949
tableName = Helper.toSnakeCase(English.plural(model.getSimpleName()));
50-
tableName += tableName.endsWith("ss") ? "es" : "s";
51-
if (tableName.endsWith("ys"))
52-
tableName = tableName.substring(0, tableName.length() - 2) + "ies";
5350
}
5451
if (model.isAnnotationPresent(MorphType.class)) {
5552
morphType = model.getDeclaredAnnotationsByType(MorphType.class)[0].value();

src/test/java/org/javawebstack/orm/test/querybuilding/FromClauseTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package org.javawebstack.orm.test.querybuilding;
22

3+
import org.atteo.evo.inflector.English;
34
import org.javawebstack.orm.Model;
45
import org.javawebstack.orm.ORM;
56
import org.javawebstack.orm.Repo;
67
import org.javawebstack.orm.exception.ORMConfigurationException;
78
import org.javawebstack.orm.test.ORMTestCase;
9+
import org.javawebstack.orm.test.shared.models.tablenames.Word;
10+
import org.javawebstack.orm.test.shared.models.tablenames.Words;
811
import org.junit.jupiter.api.Test;
912

1013
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -19,6 +22,7 @@ class FromClauseTest extends ORMTestCase {
1922
@Test
2023
void testOneWordSAppendixPlural() throws ORMConfigurationException {
2124
ORM.register(Word.class, sql());
25+
System.out.println(English.plural(Word.class.getName()));
2226
String query = getBaseQuery(Word.class);
2327
assertTrue(query.contains("FROM `words`"));
2428
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.javawebstack.orm.test.shared.models.tablenames;
2+
3+
import org.javawebstack.orm.Model;
4+
import org.javawebstack.orm.annotation.Column;
5+
6+
/**
7+
* Like {@link Word} but in plural
8+
*/
9+
public class Words extends Model {
10+
@Column
11+
int id;
12+
}

0 commit comments

Comments
 (0)