Skip to content

Commit 9bf092b

Browse files
committed
Merge branch 'SchemaInfoQuote' into 'master'
SequenceX#getSchemaName() renamed to schemaName() See merge request exedio/cope!2005
2 parents 8feecb1 + acbaf3e commit 9bf092b

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

runtime/src/com/exedio/cope/Database.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ ArrayList<String> getSequenceSchemaNames()
566566
final ArrayList<String> result = new ArrayList<>();
567567
for(final SequenceX sequence : sequences)
568568
{
569-
final String name = sequence.getSchemaName();
569+
final String name = sequence.schemaName();
570570
if(name!=null)
571571
result.add(name);
572572
}

runtime/src/com/exedio/cope/SchemaInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public static long getPrimaryKeyColumnValueL(final Item value)
192192
*/
193193
public static String primaryKeySequenceName(final Type<?> type)
194194
{
195-
final String result = type.getPrimaryKeySequenceSchemaName();
195+
final String result = type.primaryKeySequenceSchemaName();
196196
if(result==null)
197197
throw new IllegalArgumentException("no sequence for " + type);
198198

@@ -474,7 +474,7 @@ public static String getDefaultToNextSequenceName(final IntegerField field)
474474
*/
475475
public static String sequenceName(final Sequence sequence)
476476
{
477-
return sequence.sequenceX.getSchemaName();
477+
return sequence.sequenceX.schemaName();
478478
}
479479

480480
/**

runtime/src/com/exedio/cope/SequenceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ interface SequenceImpl
3434
long getNext();
3535
void delete(StringBuilder sb, Dialect dialect);
3636
void flush();
37-
String getSchemaName();
37+
String schemaName();
3838
}

runtime/src/com/exedio/cope/SequenceImplBatchedSequence.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public void flush()
117117
}
118118

119119
@Override
120-
public String getSchemaName()
120+
public String schemaName()
121121
{
122-
return sequence.getSchemaName();
122+
return sequence.schemaName();
123123
}
124124
}

runtime/src/com/exedio/cope/SequenceImplMax.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void flush()
115115
}
116116

117117
@Override
118-
public String getSchemaName()
118+
public String schemaName()
119119
{
120120
return null;
121121
}

runtime/src/com/exedio/cope/SequenceImplSequence.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void flush()
126126
}
127127

128128
@Override
129-
public String getSchemaName()
129+
public String schemaName()
130130
{
131131
return name;
132132
}

runtime/src/com/exedio/cope/SequenceX.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ SequenceBehindInfo check(final Model model, final IntegerColumn column)
136136
return new SequenceBehindInfo(feature, featureMaximum, impl().getNext());
137137
}
138138

139-
String getSchemaName()
139+
String schemaName()
140140
{
141-
return impl().getSchemaName();
141+
return impl().schemaName();
142142
}
143143

144144
boolean isKnownToBeEmptyForTest()

runtime/src/com/exedio/cope/Type.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,9 +703,9 @@ public SequenceBehindInfo checkSequenceBehindPrimaryKey()
703703
return primaryKeySequence.check(getModel(), table.primaryKey);
704704
}
705705

706-
String getPrimaryKeySequenceSchemaName()
706+
String primaryKeySequenceSchemaName()
707707
{
708-
return primaryKeySequence.getSchemaName();
708+
return primaryKeySequence.schemaName();
709709
}
710710

711711
/**

0 commit comments

Comments
 (0)