Skip to content

Commit

Permalink
#2340 Put AD_Column_ReferenceTarget_ID column is in AD_Reference, not…
Browse files Browse the repository at this point in the history 
… in relation type

#2340
  • Loading branch information
@metas-rc
metas-rc committed Sep 15, 2017
1 parent 9f7f654 commit 3080372
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 99 deletions.
27 changes: 0 additions & 27 deletions ...etas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/I_AD_RelationType.java
View file
Expand Up @@ -39,33 +39,6 @@ public interface I_AD_RelationType
/** Column name AD_Client_ID */
public static final String COLUMNNAME_AD_Client_ID = "AD_Client_ID";

/**
* Set AD_Column_ReferenceTarget_ID.
*
* <br>Type: Table
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public void setAD_Column_ReferenceTarget_ID (int AD_Column_ReferenceTarget_ID);

/**
* Get AD_Column_ReferenceTarget_ID.
*
* <br>Type: Table
* <br>Mandatory: false
* <br>Virtual Column: false
*/
public int getAD_Column_ReferenceTarget_ID();

public org.compiere.model.I_AD_Column getAD_Column_ReferenceTarget();

public void setAD_Column_ReferenceTarget(org.compiere.model.I_AD_Column AD_Column_ReferenceTarget);

/** Column definition for AD_Column_ReferenceTarget_ID */
public static final org.adempiere.model.ModelColumn<I_AD_RelationType, org.compiere.model.I_AD_Column> COLUMN_AD_Column_ReferenceTarget_ID = new org.adempiere.model.ModelColumn<I_AD_RelationType, org.compiere.model.I_AD_Column>(I_AD_RelationType.class, "AD_Column_ReferenceTarget_ID", org.compiere.model.I_AD_Column.class);
/** Column name AD_Column_ReferenceTarget_ID */
public static final String COLUMNNAME_AD_Column_ReferenceTarget_ID = "AD_Column_ReferenceTarget_ID";

/**
* Set Sektion.
* Organisatorische Einheit des Mandanten
Expand Down
36 changes: 1 addition & 35 deletions ...etas.adempiere.adempiere/base/src/main/java-gen/org/compiere/model/X_AD_RelationType.java
View file
Expand Up @@ -14,7 +14,7 @@ public class X_AD_RelationType extends org.compiere.model.PO implements I_AD_Rel
/**
*
*/
private static final long serialVersionUID = -367494829L;
private static final long serialVersionUID = 1435148794L;

/** Standard Constructor */
public X_AD_RelationType (Properties ctx, int AD_RelationType_ID, String trxName)
Expand Down Expand Up @@ -45,40 +45,6 @@ protected org.compiere.model.POInfo initPO (Properties ctx)
return poi;
}

@Override
public org.compiere.model.I_AD_Column getAD_Column_ReferenceTarget() throws RuntimeException
{
return get_ValueAsPO(COLUMNNAME_AD_Column_ReferenceTarget_ID, org.compiere.model.I_AD_Column.class);
}

@Override
public void setAD_Column_ReferenceTarget(org.compiere.model.I_AD_Column AD_Column_ReferenceTarget)
{
set_ValueFromPO(COLUMNNAME_AD_Column_ReferenceTarget_ID, org.compiere.model.I_AD_Column.class, AD_Column_ReferenceTarget);
}

/** Set AD_Column_ReferenceTarget_ID.
@param AD_Column_ReferenceTarget_ID AD_Column_ReferenceTarget_ID */
@Override
public void setAD_Column_ReferenceTarget_ID (int AD_Column_ReferenceTarget_ID)
{
if (AD_Column_ReferenceTarget_ID < 1)
set_Value (COLUMNNAME_AD_Column_ReferenceTarget_ID, null);
else
set_Value (COLUMNNAME_AD_Column_ReferenceTarget_ID, Integer.valueOf(AD_Column_ReferenceTarget_ID));
}

/** Get AD_Column_ReferenceTarget_ID.
@return AD_Column_ReferenceTarget_ID */
@Override
public int getAD_Column_ReferenceTarget_ID ()
{
Integer ii = (Integer)get_Value(COLUMNNAME_AD_Column_ReferenceTarget_ID);
if (ii == null)
return 0;
return ii.intValue();
}

@Override
public org.compiere.model.I_AD_Reference getAD_Reference_Source() throws RuntimeException
{
Expand Down
98 changes: 61 additions & 37 deletions ...eferenceTarget_Column_In_RelationType.sql → ...0_ReferenceTarget_Column_In_Reference.sql
View file
Expand Up @@ -23,35 +23,11 @@ INSERT INTO AD_Val_Rule (AD_Client_ID,AD_Org_ID,AD_Val_Rule_ID,Created,CreatedBy
UPDATE AD_Val_Rule SET Code='AD_Column.AD_Table_ID = @AD_Table_ID@ AND AD>Column.Columnname like ''%Record_ID''',Updated=TO_TIMESTAMP('2017-09-15 10:58:02','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=540371
;

-- 2017-09-15T10:58:14.460
-- URL zum Konzept
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,AD_Val_Rule_ID,AllowZoomTo,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,Help,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsSelectionColumn,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,557173,543421,0,30,53246,540371,'N','AD_Column_ReferenceTarget',TO_TIMESTAMP('2017-09-15 10:58:14','YYYY-MM-DD HH24:MI:SS'),100,'N','D',10,'','Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','AD_Column_ReferenceTarget',0,0,TO_TIMESTAMP('2017-09-15 10:58:14','YYYY-MM-DD HH24:MI:SS'),100,0)
;

-- 2017-09-15T10:58:14.465
-- URL zum Konzept
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=557173 AND NOT EXISTS (SELECT 1 FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;

-- 2017-09-15T11:00:08.789
-- URL zum Konzept
UPDATE AD_Val_Rule SET Code='AD_Column.AD_Table_ID = @AD_Table_ID@ AND AD_Column.Columnname like ''%Record_ID''',Updated=TO_TIMESTAMP('2017-09-15 11:00:08','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Val_Rule_ID=540371
;

-- 2017-09-15T11:01:45.723
-- URL zum Konzept
UPDATE AD_Column SET AD_Reference_ID=18, AD_Reference_Value_ID=3,Updated=TO_TIMESTAMP('2017-09-15 11:01:45','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557173
;

-- 2017-09-15T11:03:25.508
-- URL zum Konzept
UPDATE AD_Column SET AD_Reference_Value_ID=257,Updated=TO_TIMESTAMP('2017-09-15 11:03:25','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557173
;

-- 2017-09-15T11:04:11.454
-- URL zum Konzept
UPDATE AD_Column SET AD_Reference_ID=19,Updated=TO_TIMESTAMP('2017-09-15 11:04:11','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557173
;

-- 2017-09-15T11:05:26.362
-- URL zum Konzept
Expand All @@ -68,11 +44,6 @@ INSERT INTO AD_Reference_Trl (AD_Language,AD_Reference_ID, Description,Help,Name
INSERT INTO AD_Ref_Table (AD_Client_ID,AD_Display,AD_Key,AD_Org_ID,AD_Reference_ID,AD_Table_ID,Created,CreatedBy,EntityType,IsActive,IsValueDisplayed,Updated,UpdatedBy) VALUES (0,116,109,0,540748,101,TO_TIMESTAMP('2017-09-15 11:05:54','YYYY-MM-DD HH24:MI:SS'),100,'D','Y','N',TO_TIMESTAMP('2017-09-15 11:05:54','YYYY-MM-DD HH24:MI:SS'),100)
;

-- 2017-09-15T11:06:12.909
-- URL zum Konzept
UPDATE AD_Column SET AD_Reference_ID=18, AD_Reference_Value_ID=540748,Updated=TO_TIMESTAMP('2017-09-15 11:06:12','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557173
;

-- 2017-09-15T11:08:16.924
-- URL zum Konzept
UPDATE AD_Element SET ColumnName='AD_Column_ReferenceTarget_ID', Name='AD_Column_ReferenceTarget_ID', PrintName='AD_Column_ReferenceTarget_ID',Updated=TO_TIMESTAMP('2017-09-15 11:08:16','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Element_ID=543421
Expand Down Expand Up @@ -103,23 +74,76 @@ UPDATE AD_Field SET Name='AD_Column_ReferenceTarget_ID', Description=NULL, Help=
UPDATE AD_PrintFormatItem pi SET PrintName='AD_Column_ReferenceTarget_ID', Name='AD_Column_ReferenceTarget_ID' WHERE IsCentrallyMaintained='Y' AND EXISTS (SELECT * FROM AD_Column c WHERE c.AD_Column_ID=pi.AD_Column_ID AND c.AD_Element_ID=543421)
;

-- 2017-09-15T11:08:30.310



-- 2017-09-15T12:02:44.465
-- URL zum Konzept
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Table_ID,AllowZoomTo,ColumnName,Created,CreatedBy,DDL_NoForeignKey,DefaultValue,EntityType,FieldLength,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsSelectionColumn,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,557174,543415,0,20,102,'N','IsReferenceTarget',TO_TIMESTAMP('2017-09-15 12:02:44','YYYY-MM-DD HH24:MI:SS'),100,'N','N','D',1,'Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','Y','N','N','N','N','N','Y','N','IsReferenceTarget',0,0,TO_TIMESTAMP('2017-09-15 12:02:44','YYYY-MM-DD HH24:MI:SS'),100,0)
;

-- 2017-09-15T12:02:44.477
-- URL zum Konzept
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=557174 AND NOT EXISTS (SELECT 1 FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;

-- 2017-09-15T12:02:58.580
-- URL zum Konzept
/* DDL */ SELECT public.db_alter_table('ad_reference','ALTER TABLE public.AD_Reference ADD COLUMN IsReferenceTarget CHAR(1) DEFAULT ''N'' CHECK (IsReferenceTarget IN (''Y'',''N'')) NOT NULL')
;

-- 2017-09-15T12:03:58.479
-- URL zum Konzept
INSERT INTO AD_Column (AD_Client_ID,AD_Column_ID,AD_Element_ID,AD_Org_ID,AD_Reference_ID,AD_Reference_Value_ID,AD_Table_ID,AD_Val_Rule_ID,AllowZoomTo,ColumnName,Created,CreatedBy,DDL_NoForeignKey,EntityType,FieldLength,Help,IsActive,IsAdvancedText,IsAllowLogging,IsAlwaysUpdateable,IsAutocomplete,IsCalculated,IsDimension,IsDLMPartitionBoundary,IsEncrypted,IsGenericZoomKeyColumn,IsGenericZoomOrigin,IsIdentifier,IsKey,IsLazyLoading,IsMandatory,IsParent,IsSelectionColumn,IsStaleable,IsSyncDatabase,IsTranslated,IsUpdateable,IsUseDocSequence,Name,SelectionColumnSeqNo,SeqNo,Updated,UpdatedBy,Version) VALUES (0,557175,543421,0,18,540748,102,540371,'N','AD_Column_ReferenceTarget_ID',TO_TIMESTAMP('2017-09-15 12:03:58','YYYY-MM-DD HH24:MI:SS'),100,'N','D',10,'','Y','N','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','Y','N','AD_Column_ReferenceTarget_ID',0,0,TO_TIMESTAMP('2017-09-15 12:03:58','YYYY-MM-DD HH24:MI:SS'),100,0)
;

-- 2017-09-15T12:03:58.482
-- URL zum Konzept
INSERT INTO AD_Column_Trl (AD_Language,AD_Column_ID, Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Column_ID, t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Column t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Column_ID=557175 AND NOT EXISTS (SELECT 1 FROM AD_Column_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Column_ID=t.AD_Column_ID)
;

-- 2017-09-15T12:05:24.852
-- URL zum Konzept
UPDATE AD_Column SET MandatoryLogic='@IsReferenceTarget@=''Y''',Updated=TO_TIMESTAMP('2017-09-15 12:05:24','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557174
;

-- 2017-09-15T12:05:33.917
-- URL zum Konzept
UPDATE AD_Column SET MandatoryLogic='',Updated=TO_TIMESTAMP('2017-09-15 12:05:33','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557174
;

-- 2017-09-15T12:05:41.100
-- URL zum Konzept
UPDATE AD_Column SET MandatoryLogic='@IsReferenceTarget@=''Y''',Updated=TO_TIMESTAMP('2017-09-15 12:05:41','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=557175
;

-- 2017-09-15T12:05:46.389
-- URL zum Konzept
/* DDL */ SELECT public.db_alter_table('ad_reference','ALTER TABLE public.AD_Reference ADD COLUMN AD_Column_ReferenceTarget_ID NUMERIC(10)')
;

-- 2017-09-15T12:05:46.482
-- URL zum Konzept
ALTER TABLE AD_Reference ADD CONSTRAINT ADColumnReferenceTarget_ADRefe FOREIGN KEY (AD_Column_ReferenceTarget_ID) REFERENCES public.AD_Column DEFERRABLE INITIALLY DEFERRED
;

-- 2017-09-15T12:06:58.923
-- URL zum Konzept
/* DDL */ SELECT public.db_alter_table('ad_relationtype','ALTER TABLE public.AD_RelationType ADD COLUMN AD_Column_ReferenceTarget_ID NUMERIC(10)')
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,ColumnDisplayLength,Created,CreatedBy,DisplayLength,EntityType,IncludedTabHeight,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SeqNoGrid,SortNo,SpanX,SpanY,Updated,UpdatedBy) VALUES (0,557174,559949,0,102,0,TO_TIMESTAMP('2017-09-15 12:06:58','YYYY-MM-DD HH24:MI:SS'),100,0,'D',0,'Y','Y','Y','Y','N','N','N','N','N','IsReferenceTarget',120,120,0,1,1,TO_TIMESTAMP('2017-09-15 12:06:58','YYYY-MM-DD HH24:MI:SS'),100)
;

-- 2017-09-15T11:08:30.420
-- 2017-09-15T12:06:58.927
-- URL zum Konzept
ALTER TABLE AD_RelationType ADD CONSTRAINT ADColumnReferenceTarget_ADRela FOREIGN KEY (AD_Column_ReferenceTarget_ID) REFERENCES public.AD_Column DEFERRABLE INITIALLY DEFERRED
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=559949 AND NOT EXISTS (SELECT 1 FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;

-- 2017-09-15T11:36:16.692
-- 2017-09-15T12:07:23.688
-- URL zum Konzept
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,ColumnDisplayLength,Created,CreatedBy,DisplayLength,EntityType,Help,IncludedTabHeight,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SeqNoGrid,SortNo,SpanX,SpanY,Updated,UpdatedBy) VALUES (0,557173,559948,0,53285,0,TO_TIMESTAMP('2017-09-15 11:36:16','YYYY-MM-DD HH24:MI:SS'),100,0,'D','',0,'Y','Y','Y','Y','N','N','N','N','N','AD_Column_ReferenceTarget_ID',140,140,0,1,1,TO_TIMESTAMP('2017-09-15 11:36:16','YYYY-MM-DD HH24:MI:SS'),100)
INSERT INTO AD_Field (AD_Client_ID,AD_Column_ID,AD_Field_ID,AD_Org_ID,AD_Tab_ID,ColumnDisplayLength,Created,CreatedBy,DisplayLength,DisplayLogic,EntityType,Help,IncludedTabHeight,IsActive,IsCentrallyMaintained,IsDisplayed,IsDisplayedGrid,IsEncrypted,IsFieldOnly,IsHeading,IsReadOnly,IsSameLine,Name,SeqNo,SeqNoGrid,SortNo,SpanX,SpanY,Updated,UpdatedBy) VALUES (0,557175,559950,0,102,0,TO_TIMESTAMP('2017-09-15 12:07:23','YYYY-MM-DD HH24:MI:SS'),100,0,'@IsReferenceTarget@=''Y''','D','',0,'Y','Y','Y','Y','N','N','N','N','N','AD_Column_ReferenceTarget_ID',130,130,0,1,1,TO_TIMESTAMP('2017-09-15 12:07:23','YYYY-MM-DD HH24:MI:SS'),100)
;

-- 2017-09-15T11:36:16.699
-- 2017-09-15T12:07:23.692
-- URL zum Konzept
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=559948 AND NOT EXISTS (SELECT 1 FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
INSERT INTO AD_Field_Trl (AD_Language,AD_Field_ID, Description,Help,Name, IsTranslated,AD_Client_ID,AD_Org_ID,Created,Createdby,Updated,UpdatedBy) SELECT l.AD_Language,t.AD_Field_ID, t.Description,t.Help,t.Name, 'N',t.AD_Client_ID,t.AD_Org_ID,t.Created,t.Createdby,t.Updated,t.UpdatedBy FROM AD_Language l, AD_Field t WHERE l.IsActive='Y' AND l.IsSystemLanguage='Y' AND l.IsBaseLanguage='N' AND t.AD_Field_ID=559950 AND NOT EXISTS (SELECT 1 FROM AD_Field_Trl tt WHERE tt.AD_Language=l.AD_Language AND tt.AD_Field_ID=t.AD_Field_ID)
;

0 comments on commit 3080372

Please sign in to comment.