bugfix azure; bugfix build emf version

opitzconsulting · Nov 29, 2024 · c74fc25 · c74fc25
1 parent adf4f16
commit c74fc25
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 6 deletions.
diff --git a/orcas_core/build_source/build.gradle b/orcas_core/build_source/build.gradle
@@ -1,6 +1,7 @@
 subprojects 
 {
   project.ext.xtext_version = "2.6.1"
+  project.ext.emf_version = "2.11.+"
 
   project.group = "com.opitzconsulting.orcas"
   project.version = "8.5.2-SNAPSHOT"  

diff --git a/orcas_core/build_source/extension_build_plugin.gradle b/orcas_core/build_source/extension_build_plugin.gradle
@@ -6,6 +6,11 @@ dependencies
 {
   compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}"
   compile "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}"
 }
 
 class SyncWithDeleteTask extends DefaultTask 

diff --git a/...ild_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilderAzureSql.java b/...ild_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilderAzureSql.java
@@ -72,7 +72,7 @@ public void recreateColumn(StatementBuilder pP, TableDiff pTableDiff, ColumnDiff
             pP.addStmt("alter table " + pTableDiff.nameNew + " drop column " + pColumnDiff.nameOld);
             pP.addStmt("alter table " + pTableDiff.nameNew + " add " + createColumnCreatePart(pColumnDiff, false));
         } else {
-            pP.addStmt("alter table " + pTableDiff.nameNew + " alter column " + createColumnCreatePart(pColumnDiff, false));
+            pP.addStmt("alter table " + pTableDiff.nameNew + " alter column " + createColumnCreatePart(pColumnDiff, false, true));
         }
     }
 
@@ -113,11 +113,15 @@ public void dropPrimaryKey(StatementBuilder p, TableDiff pTableDiff, PrimaryKeyD
 
     @Override
     protected String createColumnCreatePart(ColumnDiff pColumnDiff, boolean pWithoutNotNull) {
+        return createColumnCreatePart(pColumnDiff, pWithoutNotNull, false);
+    }
+
+    private String createColumnCreatePart(ColumnDiff pColumnDiff, boolean pWithoutNotNull, boolean pWithoutDefault) {
         boolean isVirtual = "virtual".equals(pColumnDiff.virtualNew);
 
         String lReturn = pColumnDiff.nameNew + (isVirtual ? "" : (" " + getColumnDatatype(pColumnDiff)));
 
-        if (pColumnDiff.default_valueNew != null) {
+        if (pColumnDiff.default_valueNew != null && !pWithoutDefault) {
             if (isVirtual) {
                 lReturn = lReturn + " as (" + pColumnDiff.default_valueNew + ")";
             } else {

diff --git a/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle b/orcas_core/build_source/orcas_xtext_extension.generator/build.gradle
@@ -20,6 +20,11 @@ dependencies
   xtextConfiguration project(':orcas_syntax_extensions')
   xtextConfiguration "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}"
   xtextConfiguration "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}"
+  xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}"
+  xtextConfiguration "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}"
+  xtextConfiguration "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}"
+  xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}"
+  xtextConfiguration "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}"
 }
 
 task(build, type: JavaExec) 

diff --git a/orcas_core/build_source/xtext_generator_build_plugin.gradle b/orcas_core/build_source/xtext_generator_build_plugin.gradle
@@ -18,6 +18,11 @@ dependencies
 {
   compile "org.eclipse.xtext:org.eclipse.xtext.builder.standalone:${project.ext.xtext_version}"
   compile "org.eclipse.xtext:org.eclipse.xtext.xtext:${project.ext.xtext_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.ecore:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.common:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.codegen.ecore:${project.ext.emf_version}"
+  compile "org.eclipse.emf:org.eclipse.emf.codegen:${project.ext.emf_version}"
 }
 
 task(copyFilesToBuild, type: Copy)

diff --git a/orcas_integrationstest/gradle/wrapper/gradle-wrapper.properties b/orcas_integrationstest/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-bin.zip
diff --git a/orcas_integrationstest/tests/test_column_azuresql/erzeuge_ausgangszustand.sql b/orcas_integrationstest/tests/test_column_azuresql/erzeuge_ausgangszustand.sql
@@ -33,7 +33,8 @@ CREATE TABLE TAB_MOD_COLS
   COL_CHG_DEFAULT       NUMERIC(15)  CONSTRAINT def_test1 DEFAULT 6,
   COL_SET_NO_DEFAULT    NUMERIC(15)  CONSTRAINT def_test2  DEFAULT 5,
   COL_SET_BYTE          VARCHAR(15)  NOT NULL,
-  COL_SET_CHAR          VARCHAR(15)  NOT NULL
+  COL_SET_CHAR          VARCHAR(15)  NOT NULL,
+  COL_INC_PRECISION_DEF NUMERIC(3)   CONSTRAINT def_test3  DEFAULT 0
 );
 
 

diff --git a/orcas_integrationstest/tests/test_column_azuresql/erzeuge_zielzustand.sql b/orcas_integrationstest/tests/test_column_azuresql/erzeuge_zielzustand.sql
@@ -35,7 +35,8 @@ CREATE TABLE TAB_MOD_COLS
   COL_SET_BYTE          VARCHAR(15)  NOT NULL,
   COL_SET_CHAR          VARCHAR(15)  NOT NULL,
   COL_CHG_SIZE          NUMERIC(14)         NOT NULL,
-  COL_CHG_TYPE          VARCHAR(15)       NOT NULL
+  COL_CHG_TYPE          VARCHAR(15)       NOT NULL,
+  COL_INC_PRECISION_DEF NUMERIC(5,2)   CONSTRAINT def_test3  DEFAULT 0
 );
 
 CREATE TABLE TAB_DATATYPES

diff --git a/orcas_integrationstest/tests/test_column_azuresql/tabellen/tabelle.sql b/orcas_integrationstest/tests/test_column_azuresql/tabellen/tabelle.sql
@@ -25,7 +25,8 @@ create table tab_mod_cols
   col_chg_default       number(15)         default "7",
   col_set_no_default    number(15),
   col_set_byte          varchar2(15)  not null,
-  col_set_char          varchar2(15)  not null
+  col_set_char          varchar2(15)  not null,
+  col_inc_precision_def number(5,2)   default "0"
 );
 
 create table tab_datatypes