conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
private ArrayList<Location> points;
private ArrayList<BitWidth> widths;
public WidthIncompatibilityData() {
points = new ArrayList<Location>();
widths = new ArrayList<BitWidth>();
}
public void add(Location p, BitWidth w) {
for (int i = 0; i < points.size(); i++) {
... |
<<<<<<<
private final Box box;
private RenderingContext ctx;
private final double dotsPerPixel;
=======
private boolean allowScripts = false;
private boolean allowExternalResources = false;
>>>>>>>
private final Box box;
private RenderingContext ctx;
private final double dotsPerPixel;
private boole... |
<<<<<<<
@Override
public Collection<CanvasObject> getObjects() {
HashSet<CanvasObject> ret = new HashSet<CanvasObject>();
for (AttributeMapKey key : newValues.keySet()) {
ret.add(key.getObject());
}
return ret;
}
@Override
public String getName() {
... |
<<<<<<<
public void setThemesList(String themes) {
if (themes != null && !themes.isEmpty()) {
this.themes = themes.split(",");
}
}
public String[] getThemesList() {
return themes;
}
=======
public Boolean getWeeklyDigest() {
return weeklyDigest;
... |
<<<<<<<
import de.fhg.iais.roberta.factory.BotNrollFactory;
import de.fhg.iais.roberta.util.test.Helper;
=======
import de.fhg.iais.roberta.util.test.ardu.Helper;
>>>>>>>
import de.fhg.iais.roberta.factory.BotNrollFactory;
import de.fhg.iais.roberta.util.test.ardu.Helper;
<<<<<<<
BotNrollFactory robotFactory = ... |
<<<<<<<
import java.net.URISyntaxException;
=======
import java.util.ArrayList;
>>>>>>>
import java.net.URISyntaxException;
import java.util.ArrayList;
<<<<<<<
PgDatabase db = PgUIDumpLoader.loadDatabaseSchemaFromIProject(
=======
List<AntlrError> er = new ArrayList<>();
PgDatabase db = Pg... |
<<<<<<<
public static Iterable<Object[]> parameters() {
List<Object[]> p = Arrays.asList(new Object[][] {
{ "empty", "empty_usr" },
=======
public static Collection<?> parameters() {
return Arrays.asList(new Object[][] {
{"empty_usr"},
>>>>>>>
public static Iterabl... |
<<<<<<<
private PgSchema getSchema(ResultSet res) throws SQLException{
String schemaName = res.getString(NAMESPACE_NSPNAME);
=======
private PgSchema getSchema(ResultSet res) throws SQLException, UnsupportedEncodingException{
String schemaName = res.getString("nspname");
>>>>>>>
private P... |
<<<<<<<
=======
import cz.startnet.utils.pgdiff.DangerStatement;
import cz.startnet.utils.pgdiff.loader.JdbcConnector;
import cz.startnet.utils.pgdiff.loader.JdbcRunner;
import cz.startnet.utils.pgdiff.schema.PgObjLocation;
import cz.startnet.utils.pgdiff.schema.StatementActions;
import ru.taximaxim.codekeeper.apgdif... |
<<<<<<<
public void addPrivilegeScript(PgStatement oldObj, PgStatement newObj, StringBuilder sb){
// находим список старых и новых GRAND и соответственно удоляем их или удаляем
if (!oldObj.getGrants().equals(newObj.getGrants())){
Set<PgPrivilege> oldGrands = new LinkedHashSet<>(oldObj.get... |
<<<<<<<
import ru.taximaxim.codekeeper.ui.Log;
=======
import ru.taximaxim.codekeeper.ui.AddonPrefLoader;
>>>>>>>
import ru.taximaxim.codekeeper.ui.Log;
import ru.taximaxim.codekeeper.ui.AddonPrefLoader; |
<<<<<<<
import java.util.concurrent.atomic.AtomicBoolean;
=======
import java.util.Set;
>>>>>>>
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; |
<<<<<<<
loader.setMode(ParserListenerMode.REF);
PgDatabase intoDb = new PgDatabase();
intoDb.setArguments(args);
PgDatabase db = loader.loadFile(intoDb);
=======
loader.setRefMode(true);
PgDatabase db = loader.loadFile(new PgDatabase(args));
removeResFromRefs(fi... |
<<<<<<<
lblRepoRoot.setText("Select Git repository root directory (either empty folder or existing repository)");
=======
lblRepoRoot.setText("Select GIT repository root directory "
+ "(either empty folder or existing repository)");
>>>>>>>
lblRepoRoot.setText("Select Git repo... |
<<<<<<<
return new Pair<>(parser, parser.sql());
=======
saveTimeOfLastParserStart(false);
return parser.sql();
>>>>>>>
saveTimeOfLastParserStart(false);
return new Pair<>(parser, parser.sql()); |
<<<<<<<
TypedPgTable table = new TypedPgTable(tableName, getTypeName(typeName));
fillTypeColumns(typeCtx.list_of_type_column_def(), table, schemaName, tablespace);
addTypeAsDepcy(typeName, table, getDefSchemaName());
=======
String ofType = getTypeName(typeName);
TypedPgTable t... |
<<<<<<<
import java.util.Objects;
import java.util.concurrent.atomic.AtomicBoolean;
=======
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
>>>>>>>
import java.util.ArrayList;
import java.util.Collectio... |
<<<<<<<
import cz.startnet.utils.pgdiff.parsers.antlr.AntlrError;
=======
import cz.startnet.utils.pgdiff.PgDiffUtils;
>>>>>>>
import cz.startnet.utils.pgdiff.parsers.antlr.AntlrError;
import cz.startnet.utils.pgdiff.PgDiffUtils; |
<<<<<<<
@Override
protected Pair<String, GenericColumn> getActionAndObjForStmtAction() {
List<IdentifierContext> ids = ctx.function_parameters().name.identifier();
return new Pair<>(ACTION_CREATE, new GenericColumn(
QNameParser.getSchemaName(ids), QNameParser.getFirstNameCtx(ids... |
<<<<<<<
import cz.startnet.utils.pgdiff.schema.AbstractSequence;
import cz.startnet.utils.pgdiff.schema.AbstractTable;
import cz.startnet.utils.pgdiff.schema.AbstractView;
import cz.startnet.utils.pgdiff.schema.PgDatabase;
import cz.startnet.utils.pgdiff.schema.PgFtsConfiguration;
import cz.startnet.utils.pgdiff.schema... |
<<<<<<<
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.IMergeViewerContentProvider;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.core.runtime.Assert;
=======
>>>>>>>
import org.eclipse.core.runtime.Assert;
<<<<<<<
import ru.taximax... |
<<<<<<<
if (dataType.LEFT_BRACKET() == null && dataType.SETOF() == null && customType != null &&
(typeSchema == null || ApgdiffConsts.PG_CATALOG.equals(typeSchema.getText()))) {
=======
if (dataType.array_type().isEmpty() && dataType.SETOF() == null && customType != null &&... |
<<<<<<<
import cz.startnet.utils.pgdiff.loader.SupportedVersion;
import cz.startnet.utils.pgdiff.parsers.antlr.expr.ViewSelect;
=======
>>>>>>>
import cz.startnet.utils.pgdiff.loader.SupportedVersion; |
<<<<<<<
PgFunction func = new PgFunction(getName(functparam.name), null);
fillArguments(functparam.function_args(), func);
=======
PgFunction func = new PgFunction(getName(functparam.name), null, db.getDefSearchPath());
fillArguments(functparam.function_... |
<<<<<<<
PgConstraint constraint = getConstraint(result, schema, table.getName());
if (constraint != null) {
table.addConstraint(constraint);
}
=======
table.addConstraint(getConstraint(result, schema.getName(), table.getName()));
>>>>>>>
tab... |
<<<<<<<
if (dataType.LEFT_BRACKET() == null && dataType.SETOF() == null && customType != null &&
(typeSchema == null || ApgdiffConsts.PG_CATALOG.equals(typeSchema.getText()))) {
=======
if (dataType.array_type().isEmpty() && dataType.SETOF() == null && customType != null &&... |
<<<<<<<
private final boolean useAntrlForViews;
private final PgDiffArguments args;
public JdbcLoader(JdbcConnector connector, boolean useAntrlForViews, PgDiffArguments pgDiffArguments){
=======
private PgDiffArguments args;
public JdbcLoader(JdbcConnector connector, PgDiffArguments pgDiffAr... |
<<<<<<<
ParserRuleContext firstNameCtx = QNameParser.getFirstNameCtx(ids);
throw new UnresolvedReferenceException("Schema not forund for " +
=======
IdentifierContext firstNameCtx = QNameParser.getFirstNameCtx(ids);
throw new UnresolvedReferenceException("Schema not found for " +
>>>>... |
<<<<<<<
private Object lastRemote;
private DbSource dbProject;
private DbSource dbRemote;
=======
private Object currentRemote;
private DbSource dbProject, dbRemote;
>>>>>>>
private Object currentRemote;
private DbSource dbProject, dbRemote;
<<<<<<<
TreeDiffer newDiffer = TreeDif... |
<<<<<<<
private File getGitRoot(File subDir) {
File gitSubDir = subDir;
while (gitSubDir != null) {
gitSubDir = new File(gitSubDir, ".git");
if (gitSubDir.exists()) {
return gitSubDir.getParentFile();
} else {
gitSubDir = gitSubDir... |
<<<<<<<
=======
}
public JdbcConnector(String url, Map<String, String> properties,
boolean readOnly, String timezone) throws URISyntaxException {
this(url, timezone);
>>>>>>>
<<<<<<<
protected JdbcConnector() {
// no impl, unintialized instance
}
private JdbcConnect... |
<<<<<<<
AbstractPgFunction function = new PgFunction(name);
fillFuncArgs(argsContext.function_arguments(), function);
if (argsContext.agg_order() != null) {
fillFuncArgs(argsContext.agg_order().function_arguments(), function);
}
return function.getSignature();
}
... |
<<<<<<<
public static DbSource fromFile(boolean forceUnixNewlines, File filename, String encoding) {
return new DbSourceFile(forceUnixNewlines, filename, encoding);
=======
public static DbSource fromFile(boolean forceUnixNewlines, String filename, String encoding, String timezone) {
return ne... |
<<<<<<<
addField(new BooleanFieldEditor(PREF.USE_ANTLR, Messages.generalPrefPage_use_antrl,
getFieldEditorParent()));
=======
>>>>>>> |
<<<<<<<
=======
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IPageLayout;
>>>>>>>
import org.eclipse.ui.IPageLayout; |
<<<<<<<
public PgObjLocation getLocation() {
=======
public String getLocation() {
String location = getMeta().getLocation();
>>>>>>>
public PgObjLocation getLocation() {
PgObjLocation location = getMeta().getLocation();
<<<<<<<
public void setLocation(PgObjLocation location) {
... |
<<<<<<<
import ru.taximaxim.codekeeper.ui.fileutils.TempDir;
import ru.taximaxim.codekeeper.ui.localizations.Messages;
=======
>>>>>>>
import ru.taximaxim.codekeeper.ui.localizations.Messages;
<<<<<<<
try (TempDir tmpRepoMeta = new TempDir(
props.getProjectWorkingDir().toPath().getParent(),
... |
<<<<<<<
new VertexToFaunusBinary().writeVertex(vertex, out);
}
public static void write(final Vertex vertex, final DataOutput out,
final ElementIdHandler elementIdHandler) throws IOException {
new VertexToFaunusBinary(elementIdHandler).writeVertex(vertex, out);
... |
<<<<<<<
PgFunction function = new PgFunction(name, getFullCtxText(ctx.getParent()));
fillArguments(ctx.function_parameters().function_args(), function);
=======
PgFunction function = new PgFunction(name, getFullCtxText(ctx.getParent()), db.getDefSearchPath());
fillArguments(ctx.functio... |
<<<<<<<
=======
import ru.taximaxim.codekeeper.apgdiff.licensing.LicenseException;
import ru.taximaxim.codekeeper.ui.Log;
import ru.taximaxim.codekeeper.ui.UIConsts.NATURE;
>>>>>>>
import ru.taximaxim.codekeeper.ui.Log;
import ru.taximaxim.codekeeper.ui.UIConsts.NATURE;
<<<<<<<
throws InterruptedExcepti... |
<<<<<<<
{"drop_dom_tbl", false},
// Test column privilege
{"col_priv", false},
{"col_revoke_priv", false},
{"col_priv_new_tbl", false}
=======
{"drop_dom_tbl", false},
// Test au... |
<<<<<<<
=======
import ru.taximaxim.codekeeper.ui.prefs.PreferenceInitializer;
import ru.taximaxim.codekeeper.ui.pgdbproject.parser.PgDbParser;
>>>>>>>
import ru.taximaxim.codekeeper.ui.prefs.PreferenceInitializer;
<<<<<<<
=======
PgDbParser.getParser(proj.getProject()).getObjFromProject()... |
<<<<<<<
ParserAbstract.fillArguments(ctx.function_args(), func, getDefSchemaName(), db);
name = func.getSignature();
=======
ParserAbstract.fillArguments(ctx.function_args(), func, getDefSchemaName());
name = func.getBareName();
>>>>>>>
ParserAbstract.fillA... |
<<<<<<<
loader.setPrivileges(s, PgDiffUtils.getQuotedName(schemaName),
res.getString("nspacl"), owner, null);
=======
loader.setPrivileges(s, res.getString("nspacl"));
>>>>>>>
loader.setPrivileges(s, res.getString("nspacl"), null); |
<<<<<<<
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Vex_eofContext;
import cz.startnet.utils.pgdiff.parsers.antlr.exprold.AbstractExprWithNmspc;
import cz.startnet.utils.pgdiff.parsers.antlr.exprold.Select;
import cz.startnet.utils.pgdiff.parsers.antlr.exprold.ValueExpr;
import cz.startnet.utils.pgdiff.pars... |
<<<<<<<
import java.util.List;
=======
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
>>>>>>>
import java.util.LinkedList;
import java.util.List;
<<<<<<<
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.I... |
<<<<<<<
oper.setProcedure(option.func_name.getText());
addDepSafe(oper, option.func_name.identifier(), DbObjType.FUNCTION);
=======
oper.setProcedure(getFullCtxText(option.func_name));
>>>>>>>
oper.setProcedure(getFullCtxText(option.func_name));
... |
<<<<<<<
public QueriesBatchCallable(Statement st, List<List<QueryLocation>> batches,
IProgressMonitor monitor, IProgressReporter reporter, Connection connection) {
=======
public QueriesBatchCallable(Statement st, List<List<String>> batches,
IProgressMonitor monitor, IProgressReporter ... |
<<<<<<<
public CustomSQLParserListener(PgDatabase database, String filename, ParserListenerMode mode,
List<AntlrError> errors, Queue<AntlrTask<?>> antlrTasks, IProgressMonitor monitor) {
super(database, filename, mode, errors, monitor);
=======
public CustomSQLParserListener(PgDatabase dat... |
<<<<<<<
{"add_aggr_func", "add_aggr_func_usr_aggr"},
// в функции 'f1' изменяется имя аргумента функции,
// в функции 'f2' изменяется определение функции,
// пользователь выбирает 'f1'
// (опеределение обеих функций написано на языке SQL)
// ('f2' ... |
<<<<<<<
import cz.startnet.utils.pgdiff.loader.PgDumpLoader;
=======
import cz.startnet.utils.pgdiff.PgDiffUtils;
import cz.startnet.utils.pgdiff.schema.PgDatabase;
>>>>>>>
import cz.startnet.utils.pgdiff.PgDiffUtils; |
<<<<<<<
=======
import java.util.ArrayList;
>>>>>>>
<<<<<<<
schema.addTable(table);
=======
if (db.getSchema(schemaName) == null) {
logSkipedObject(schemaName, "TABLE", name);
return null;
}
db.getSchema(schemaName).addTable(table);
>>>>>>>
schema... |
<<<<<<<
PgDumpLoader.dbAnalyze(db);
arguments.getLicense().verifyDb(db);
=======
>>>>>>>
PgDumpLoader.dbAnalyze(db); |
<<<<<<<
=======
import cz.startnet.utils.pgdiff.PgDiffArguments;
import cz.startnet.utils.pgdiff.loader.JdbcConnector;
import cz.startnet.utils.pgdiff.loader.JdbcLoader;
import cz.startnet.utils.pgdiff.loader.PgDumpLoader;
import cz.startnet.utils.pgdiff.schema.PgDatabase;
>>>>>>>
<<<<<<<
public static DbSource... |
<<<<<<<
public static PgDbProject getProgFromFile(String projectName,
String pathToProject) throws PgCodekeeperUIException {
=======
public static PgDbProject getProjFromFile(String projectName,
String pathToProject) {
>>>>>>>
public static PgDbProject getProjFromFile(String pro... |
<<<<<<<
Function_defContext funcDef = null;
=======
Float cost = null;
String language = null;
>>>>>>>
Function_defContext funcDef = null;
Float cost = null;
String language = null; |
<<<<<<<
private Button btnEnableFuncDep;
=======
private Button btnSimplifyView;
>>>>>>>
private Button btnEnableFuncDep;
private Button btnSimplifyView;
<<<<<<<
btnEnableFuncDep = new Button(panel, SWT.CHECK);
btnEnableFuncDep.setText(Messages.GeneralPrefPage_enable_body_dependencie... |
<<<<<<<
loadDatabase(d);
=======
d.getSchema(schema.getName()).setLocation(inputObjectName);
Queue<AntlrTask<?>> antlrTasks = new ArrayDeque<>(1);
loadDatabase(d, antlrTasks);
AntlrParser.finishAntlr(antlrTasks);
>>>>>>>
Queue<AntlrTask<?>> antlrTasks = new ArrayDequ... |
<<<<<<<
import cz.startnet.utils.pgdiff.PgDiffArguments;
import cz.startnet.utils.pgdiff.loader.ParserListenerMode;
import cz.startnet.utils.pgdiff.loader.PgDumpLoader;
import cz.startnet.utils.pgdiff.schema.PgObjLocation;
=======
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Alter_sequence_statementContext... |
<<<<<<<
import org.gluu.oxtrust.model.scim2.Group;
import org.gluu.oxtrust.service.external.ExternalScimService;
import org.gluu.oxtrust.util.CopyUtils2;
import org.gluu.oxtrust.util.ServiceUtil;
import org.gluu.persist.exception.mapping.EntryPersistenceException;
import org.gluu.persist.exception.operation.DuplicateEn... |
<<<<<<<
@Override
public void exitRule_common(Rule_commonContext ctx) {
safeParseStatement(new CreateRule(ctx, db), ctx);
}
@Override
public void exitCreate_fts_parser(Create_fts_parserContext ctx) {
safeParseStatement(new CreateFtsParser(ctx, db), ctx);
}
@Override
pub... |
<<<<<<<
if (ParserListenerMode.REF != mode
&& (confValueCtx.size() != 1 || !ApgdiffConsts.PG_CATALOG.equals(confValue))) {
=======
if (!refMode && (vex.size() != 1 || !ApgdiffConsts.PG_CATALOG.equals(confValue))) {
>>>>>>>
if (ParserListenerMode.REF != mode
... |
<<<<<<<
import java.text.MessageFormat;
=======
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.PlatformObject;
>>>>>>>
import org.eclipse.core.resources.IProject;
import org.eclipse.core.re... |
<<<<<<<
{"drop_statistics", false, false, false, false},
// Tests scenario where DEFAULT value is set on COLUMN.
{"add_default_value", false, false, false, false},
=======
{"drop_statistics", false},
// Tests scenario ... |
<<<<<<<
@Override
protected Pair<StatementActions, GenericColumn> getActionAndObjForStmtAction() {
List<IdentifierContext> ids = ctx.function_parameters().name.identifier();
return new Pair<>(StatementActions.CREATE, new GenericColumn(
QNameParser.getSchemaName(ids), QNameParser... |
<<<<<<<
addObjReference(ctx.function_parameters().name.identifier(), type, ACTION_ALTER);
=======
addObjReference(ctx.function_parameters().schema_qualified_name().identifier(),
type, StatementActions.ALTER);
>>>>>>>
addObjReference(ctx.function_parameters().schema_qualified_n... |
<<<<<<<
public static final String CONFIGURATION = "/configuration";
public static final String STATUS = "/status";
=======
public static final String UMA = "/uma";
public static final String RESOURCES = "/resources";
>>>>>>>
public static final String CONFIGURATION = "/configuration";
public static final Stri... |
<<<<<<<
import org.eclipse.ui.ISharedImages;
=======
import org.eclipse.ui.dialogs.PreferencesUtil;
>>>>>>>
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.dialogs.PreferencesUtil;
<<<<<<<
Segments seg = (Segments)element;
DbObjType type = seg.getType();
... |
<<<<<<<
import java.util.Map;
import java.util.function.Function;
=======
>>>>>>>
import java.util.Map;
import java.util.function.Function;
<<<<<<<
import cz.startnet.utils.pgdiff.parsers.antlr.exception.UnresolvedReferenceException;
=======
import cz.startnet.utils.pgdiff.parsers.antlr.expr.ValueExpr;
import cz.... |
<<<<<<<
ExceptionNotifier.showErrorDialog(
MessageFormat.format(Messages.could_not_open_editor_for_file,
file.getAbsolutePath()), e);
=======
ExceptionNotifier.notifyDefault(
Messages.could_not... |
<<<<<<<
loader.setPrivileges(f, f.appendFunctionSignature(new StringBuilder(), false, true).toString(),
res.getString("aclarray"), f.getOwner(), null, schemaName);
=======
loader.setPrivileges(f, res.getString("aclarray"));
>>>>>>>
loader.setPrivileges(f, res.getString("aclarr... |
<<<<<<<
import ru.taximaxim.codekeeper.ui.sqledit.SqlSourceViewer;
import cz.startnet.utils.pgdiff.PgDiffUtils;
=======
import ru.taximaxim.codekeeper.ui.sqledit.SqlSourceViewerExtender;
>>>>>>>
import ru.taximaxim.codekeeper.ui.sqledit.SqlSourceViewerExtender;
import cz.startnet.utils.pgdiff.PgDiffUtils; |
<<<<<<<
batches = loader.load().getObjReferences().get(name);
=======
List<PgObjLocation> batches = loader.load().getObjDefinitions().get(name);
// empty script won't add any lists to the definition map
if (batches == null) {
batches = Collections.emptyList();
}
... |
<<<<<<<
{"authorization_schema", false},
// Test column privilege
{"col_priv", false},
{"col_revoke_priv", false},
{"col_priv_new_tbl", false},
{"col_priv_tbl", false}
=======
{"... |
<<<<<<<
if (statement.getStatementType() == DbObjType.COLUMN) {
PgStatement newTable = getObjectFromDB(statement.getParent(),
newDb);
if (newTable == null) {
return true;
}
=======
... |
<<<<<<<
public interface IProgressReporter extends AutoCloseable {
=======
import java.util.List;
public interface IProgressReporter {
>>>>>>>
import java.util.List;
public interface IProgressReporter extends AutoCloseable {
<<<<<<<
@Override
default void close() {
terminate();
}
=======
... |
<<<<<<<
String ICONWRITEOUTCONSOLE = "/icons/writeout_co.png"; //$NON-NLS-1$
=======
String ICONWRITEOUTCONSOLE = "/icons/writeout_co.gif"; //$NON-NLS-1$
String DDL_UPDATE_COMMANDS_HIST_FILENAME = "rollon_cmd_history.xml"; //$NON-NLS-1$
String IGNORED_OBJECTS = ".pgcodekeeperignore"; /... |
<<<<<<<
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.FileDialog;
=======
import org.eclipse.swt.widgets.Display;
>>>>>>>
<<<<<<<
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.ISharedImages;
=======
>>>>>>>
import org.eclipse.ui.ISharedImages;
<<<<<<<
import ru.taximaxim.code... |
<<<<<<<
public String getInvitationGuid() {
return invitationGuid;
}
public void setInvitationGuid(String invitationGuid) {
this.invitationGuid = invitationGuid;
}
=======
public String getInvitationGuid() {
return invitationGuid;
}
public String getInum() {
return inum;
}
... |
<<<<<<<
public static StringBuilder appendOwnerSQL(PgStatement st, String owner,
boolean addNewLine, StringBuilder sb) {
if (owner == null) {
=======
public static StringBuilder appendOwnerSQL(PgStatement st, String owner, StringBuilder sb) {
if (owner == null || !st.isOwned()) {
... |
<<<<<<<
import java.util.stream.Collectors;
=======
import java.util.function.Predicate;
>>>>>>>
import java.util.function.Predicate;
import java.util.stream.Collectors; |
<<<<<<<
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
=======
import ru.taximaxim.codekeeper.apgdiff.model.difftree.TreeElement.DbObjType;
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Body_rulesContext;
>>>>>>>
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
import cz.s... |
<<<<<<<
import cz.startnet.utils.pgdiff.schema.GenericColumn;
=======
import cz.startnet.utils.pgdiff.schema.PgColumn;
>>>>>>>
import cz.startnet.utils.pgdiff.schema.GenericColumn;
import cz.startnet.utils.pgdiff.schema.PgColumn;
<<<<<<<
@Override
protected void fillDescrObj() {
action = StatementA... |
<<<<<<<
FullAnalyze.fullAnalyze(d);
=======
d.getSchema(ApgdiffConsts.PUBLIC).setLocation(inputObjectName);
>>>>>>>
d.getSchema(ApgdiffConsts.PUBLIC).setLocation(inputObjectName);
FullAnalyze.fullAnalyze(d); |
<<<<<<<
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.IJobChan... |
<<<<<<<
private void initRepoFromSource(SubMonitor pm)throws InvocationTargetException,
InterruptedException, CoreException, IOException {
=======
private void initRepoFromSource(SubMonitor pm) throws InterruptedException,
CoreException, IOException, LicenseException {
>>>>>>>
private void initRe... |
<<<<<<<
import cz.startnet.utils.pgdiff.parsers.antlr.expr.launcher.ConstraintAnalysisLauncher;
import cz.startnet.utils.pgdiff.parsers.antlr.expr.launcher.VexAnalysisLauncher;
import cz.startnet.utils.pgdiff.schema.AbstractColumn;
=======
>>>>>>>
import cz.startnet.utils.pgdiff.parsers.antlr.expr.launcher.Constrain... |
<<<<<<<
import cz.startnet.utils.pgdiff.schema.StatementActions;
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
=======
import ru.taximaxim.codekeeper.apgdiff.ApgdiffConsts;
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
import ru.taximaxim.codekeeper.apgdiff.utils.Pair;
>>>>>>>
i... |
<<<<<<<
addSafe(schema, func, ids);
=======
schemaName = getSchemaNameSafe(ids);
>>>>>>>
schemaName = getSchemaNameSafe(ids);
<<<<<<<
addSafe(schema, func, ids);
=======
addSafe(AbstractSchema::addFunction, schema, f, ids);
>>>>>>>
... |
<<<<<<<
String ICONEMPTYFILTER = "/icons/empty_filter.png"; //$NON-NLS-1$
String ICONFILTER = "/icons/filter_tsk.png"; //$NON-NLS-1$
=======
String ICONFILE = "/icons/file_obj.png"; //$NON-NLS-1$
String ICONCHECK = "/icons/header_complete.gif"; //$NON-NLS-1$
>>>>>>>
String ICO... |
<<<<<<<
if (arguments.isMsSql()) {
loadMsStructure(iProject, db);
} else {
loadPgStructure(iProject, db);
}
AntlrParser.finishAntlr(antlrTasks);
=======
loadPgStructure(iProject, db);
finishLoaders();
>>>>>>>
if (arguments.isMsSql()) {
... |
<<<<<<<
alterPrivileges(newView, sb);
=======
addPrivilegeScript(oldView, newView, sb);
>>>>>>>
alterPrivileges(newView, sb);
<<<<<<<
&& Objects.equals(columnComments, view.getColumnComments());
=======
&& Objects.equals(columnComments, view.getColum... |
<<<<<<<
loadDatabase(d);
=======
d.getSchema(schema.getName()).setLocation(inputObjectName);
Queue<AntlrTask<?>> antlrTasks = new ArrayDeque<>(1);
loadDatabase(d, antlrTasks);
AntlrParser.finishAntlr(antlrTasks);
>>>>>>>
Queue<AntlrTask<?>> antlrTasks = new ArrayDequ... |
<<<<<<<
import cz.startnet.utils.pgdiff.schema.AbstractTable;
=======
import cz.startnet.utils.pgdiff.schema.AbstractTable;
import cz.startnet.utils.pgdiff.schema.IRelation;
>>>>>>>
import cz.startnet.utils.pgdiff.schema.AbstractTable;
import cz.startnet.utils.pgdiff.schema.IRelation;
<<<<<<<
PgObjLocation ... |
<<<<<<<
DbSource dbSource = DbSource.fromFile(true, sourceFile, ApgdiffConsts.UTF_8);
DbSource dbTarget = DbSource.fromFile(true, targetFile, ApgdiffConsts.UTF_8);
=======
DbSource dbSource =
DbSource.fromFile(true, sourceFile.getAbsolutePath(), ApgdiffConsts.UTF_8, ApgdiffCons... |
<<<<<<<
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Ordinary_grouping_setContext;
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Perform_stmtContext;
=======
>>>>>>>
import cz.startnet.utils.pgdiff.parsers.antlr.SQLParser.Perform_stmtContext;
<<<<<<<
groupBy(groupBy, vex);
====... |
<<<<<<<
import ru.taximaxim.codekeeper.ui.PgCodekeeperUIException;
import ru.taximaxim.codekeeper.ui.dialogs.ExceptionNotifier;
import ru.taximaxim.codekeeper.ui.editors.ProjectEditor;
=======
import ru.taximaxim.codekeeper.ui.UIConsts.EDITOR;
>>>>>>>
import ru.taximaxim.codekeeper.ui.PgCodekeeperUIException;
import... |
<<<<<<<
import ru.taximaxim.codekeeper.apgdiff.licensing.LicenseException;
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
=======
>>>>>>>
import ru.taximaxim.codekeeper.apgdiff.model.difftree.DbObjType;
<<<<<<<
dbAnalyze(d);
args.getLicense().verifyDb(d);
=======
>>>>>>>
... |
<<<<<<<
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.WorldSavedData;
=======
import net.minecraft.world.WorldSavedData;
>>>>>>>
import net.minecraft.world.storage.WorldSavedData; |
<<<<<<<
import net.minecraft.client.util.math.MatrixStack;
=======
import net.minecraft.client.sound.PositionedSoundInstance;
import net.minecraft.client.util.math.MatrixStack;
>>>>>>>
import net.minecraft.client.sound.PositionedSoundInstance;
import net.minecraft.client.util.math.MatrixStack;
<<<<<<<
import net.mi... |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.