Merge branch 'master' into fix-subscription-termination

server/.buildkite/build-cli/src/pipeline_renderer.rb

@@ -153,12 +153,13 @@ def release_artifacts_steps
   end
 
   def build_steps_for(version)
-    ['debian', 'lambda'].map do |target|
-      PipelineStep.new
-        .label(":rust: Native image [#{target}] [#{version}]")
-        .command("./server/.buildkite/pipeline.sh native-image #{target} #{version}")
-        .queue("native-linux")
-    end
+    # ['debian', 'lambda'].map do |target|
+    #   PipelineStep.new
+    #     .label(":rust: Native image [#{target}] [#{version}]")
+    #     .command("./server/.buildkite/pipeline.sh native-image #{target} #{version}")
+    #     .queue("native-linux")
+    # end
+    []
   end
 
   def calculate_next_unstable_docker_tag()

server/connectors/deploy-connector-jdbc/src/main/scala/com/prisma/deploy/connector/jdbc/persistence/JdbcProjectPersistence.scala

@@ -35,7 +35,7 @@ case class JdbcProjectPersistence(slickDatabase: SlickDatabase, dbConfig: Databa
 
   override def load(id: String): Future[Option[Project]] = {
     val query = sql
-      .select(pt.id, pt.secrets, pt.allowQueries, pt.allowMutations, mt.schema, mt.functions, mt.revision)
+      .select(pt.id, pt.secrets, pt.allowQueries, pt.allowMutations, mt.schema, mt.functions, mt.revision, mt.dataModel)
       .from(pt.t)
       .join(mt.t)
       .on(mt.projectId.equal(pt.id))
@@ -74,7 +74,7 @@ case class JdbcProjectPersistence(slickDatabase: SlickDatabase, dbConfig: Databa
       .from(mt.t.as("outer"))
 
     val query = sql
-      .select(pt.id, pt.secrets, pt.allowQueries, pt.allowMutations, mt.schema, mt.functions, mt.revision)
+      .select(pt.id, pt.secrets, pt.allowQueries, pt.allowMutations, mt.schema, mt.functions, mt.revision, mt.dataModel)
       .from(pt.t)
       .join(revisionQuery.asTable("jt"))
       .on(field(name("jt", "projectId")).equal(pt.id))
@@ -164,7 +164,8 @@ case class JdbcProjectPersistence(slickDatabase: SlickDatabase, dbConfig: Databa
       allowQueries = rs.getBoolean(pt.allowQueries.getName),
       allowMutations = rs.getBoolean(pt.allowMutations.getName),
       functions = functions,
-      manifestation = projectManifestation
+      manifestation = projectManifestation,
+      rawDataModel = rs.getString(mt.dataModel.getName)
     )
   }
 }

server/connectors/deploy-connector-mongo/src/main/scala/com/prisma/deploy/connector/mongo/impl/DbMapper.scala

@@ -53,7 +53,8 @@ object DbMapper extends JsonBsonConversion with MongoExtensions {
       revision = migration.revision,
       schema = schemaWithAddedBackRelations,
       functions = migration.functions.toList,
-      manifestation = manifestation
+      manifestation = manifestation,
+      rawDataModel = migration.rawDataModel
     )
   }
 

server/images/prisma-image-shared/src/main/scala/com/prisma/image/SangriaHandlerImpl.scala

@@ -74,6 +74,11 @@ case class SangriaHandlerImpl(managementApiEnabled: Boolean)(
             sys.error(s"The connector is missing the import / export capability.")
           }
         }
+      case Some("_datamodel") =>
+        verifyAuth(projectIdAsString, rawRequest) { project =>
+          val response = Response(Json.toJson(project.rawDataModel))
+          Future.successful(response)
+        }
 
       case _ =>
         requestThrottler.throttleCallIfNeeded(projectIdAsString, isManagementApiRequest = isManagementApiRequest(rawRequest)) {
@@ -175,7 +180,7 @@ case class SangriaHandlerImpl(managementApiEnabled: Boolean)(
   }
 
   private def splitReservedSegment(elements: List[String]): (List[String], Option[String]) = {
-    val reservedSegments = Set("private", "import", "export")
+    val reservedSegments = Set("private", "import", "export", "_datamodel")
     if (elements.nonEmpty && reservedSegments.contains(elements.last)) {
       (elements.dropRight(1), elements.lastOption)
     } else {

server/servers/deploy/src/test/scala/com/prisma/deploy/persistence/ProjectPersistenceSpec.scala

@@ -27,7 +27,9 @@ class ProjectPersistenceSpec extends FlatSpec with Matchers with DeploySpecBase
     }
 
     // Load the applied revision, which is 2 (2 steps are done in setupProject)
-    loadProject.get.revision shouldEqual 2
+    val project1 = loadProject.get
+    project1.revision shouldEqual 2
+    project1.rawDataModel should equal(basicTypesGql)
 
     // After another migration is completed, the revision is bumped to the revision of the latest migration
     migrationPersistence.updateMigrationStatus(MigrationId(project.id, 3), MigrationStatus.Success).await
@@ -48,12 +50,13 @@ class ProjectPersistenceSpec extends FlatSpec with Matchers with DeploySpecBase
     setupProject(basicTypesGql, stage = "stage1")
     setupProject(basicTypesGql, stage = "stage2")
 
-    projectPersistence.loadAll().await should have(size(2))
+    val projects = projectPersistence.loadAll().await
+    projects should have(size(2))
+    projects.foreach(p => p.rawDataModel should equal(basicTypesGql))
   }
 
   ".update()" should "update a project" in {
     val (project, _) = setupProject(basicTypesGql)
-    println(project.id)
 
     val updatedProject = project.copy(secrets = Vector("Some", "secrets"))
     projectPersistence.update(updatedProject).await()
@@ -67,7 +70,6 @@ class ProjectPersistenceSpec extends FlatSpec with Matchers with DeploySpecBase
 
   ".delete()" should "delete a project" in {
     val (project, _) = setupProject(basicTypesGql)
-    println(project.id)
 
     projectPersistence.delete(project.id).await()
     projectPersistence.load(project.id).await should be(None)

server/shared-models/src/main/scala/com/prisma/shared/models/Project.scala

@@ -10,7 +10,8 @@ case class Project(
     allowQueries: Boolean = true,
     allowMutations: Boolean = true,
     functions: List[Function] = List.empty,
-    manifestation: ProjectManifestation = ProjectManifestation.empty
+    manifestation: ProjectManifestation = ProjectManifestation.empty,
+    rawDataModel: String = ""
 ) {
   def models            = schema.models
   def relations         = schema.relations