On 06/06/2011 10:52 PM, Matt Wagner wrote:
---
src/app/models/deployment.rb | 24 +++++++++++-----------
src/app/models/event.rb | 13 ++++++-----
src/app/models/icicle.rb | 14 ++++++------
src/app/models/instance.rb | 6 ++--
src/app/models/legacy_assembly.rb | 5 ++-
src/app/models/legacy_deployable.rb | 5 ++-
src/app/models/legacy_image.rb | 24 +++++++++++-----------
src/app/models/legacy_provider_image.rb | 6 ++--
src/app/models/legacy_template.rb | 33 ++++++++++++++++---------------
src/app/models/pool.rb | 3 +-
src/app/models/pool_family.rb | 3 +-
11 files changed, 71 insertions(+), 65 deletions(-)
diff --git a/src/app/models/deployment.rb b/src/app/models/deployment.rb
index df1784d..74a9dfa 100644
--- a/src/app/models/deployment.rb
+++ b/src/app/models/deployment.rb
@@ -1,19 +1,19 @@
# == Schema Information
-# Schema version: 20110601190920
+# Schema version: 20110603204130
#
# Table name: deployments
#
-# id :integer not null, primary key
-# name :string(1024) not null
-# realm_id :integer
-# owner_id :integer
-# pool_id :integer not null
-# deployable_id :integer not null
-# lock_version :integer default(0)
-# created_at :datetime
-# updated_at :datetime
-# frontend_realm_id :integer
-# deployable_xml :text
+# id :integer not null, primary key
+# name :string(1024) not null
+# realm_id :integer
+# owner_id :integer
+# pool_id :integer not null
+# legacy_deployable_id :integer
+# lock_version :integer default(0)
+# created_at :datetime
+# updated_at :datetime
+# frontend_realm_id :integer
+# deployable_xml :text
#
#
diff --git a/src/app/models/event.rb b/src/app/models/event.rb
index 06b3936..1e17f35 100644
--- a/src/app/models/event.rb
+++ b/src/app/models/event.rb
@@ -1,14 +1,15 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
-# Table name: instance_events
+# Table name: events
#
# id :integer not null, primary key
-# instance_id :integer not null
-# event_type :string(255) not null
+# source_id :integer not null
+# source_type :string(255) not null
# event_time :datetime
-# status :string(255)
-# message :string(255)
+# status_code :string(255)
+# summary :string(255)
+# description :string(255)
# created_at :datetime
# updated_at :datetime
#
diff --git a/src/app/models/icicle.rb b/src/app/models/icicle.rb
index 9b16d74..28b857f 100644
--- a/src/app/models/icicle.rb
+++ b/src/app/models/icicle.rb
@@ -1,14 +1,14 @@
# == Schema Information
-# Schema version: 20110223132404
+# Schema version: 20110603204130
#
# Table name: icicles
#
-# id :integer not null, primary key
-# uuid :string(255)
-# xml :text
-# provider_image_id :integer
-# created_at :datetime
-# updated_at :datetime
+# id :integer not null, primary key
+# uuid :string(255)
+# xml :text
+# legacy_provider_image_id :integer
+# created_at :datetime
+# updated_at :datetime
#
class Icicle< ActiveRecord::Base
diff --git a/src/app/models/instance.rb b/src/app/models/instance.rb
index 947591f..f3f694f 100644
--- a/src/app/models/instance.rb
+++ b/src/app/models/instance.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
# Table name: instances
#
@@ -7,7 +7,7 @@
# external_key :string(255)
# name :string(1024) not null
# hardware_profile_id :integer not null
-# template_id :integer
+# legacy_template_id :integer
# frontend_realm_id :integer
# owner_id :integer
# pool_id :integer not null
@@ -29,7 +29,7 @@
# time_last_stopped :datetime
# created_at :datetime
# updated_at :datetime
-# assembly_id :integer
+# legacy_assembly_id :integer
# deployment_id :integer
#
diff --git a/src/app/models/legacy_assembly.rb b/src/app/models/legacy_assembly.rb
index 075c55c..6c663c7 100644
--- a/src/app/models/legacy_assembly.rb
+++ b/src/app/models/legacy_assembly.rb
@@ -1,7 +1,7 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
-# Table name: assemblies
+# Table name: legacy_assemblies
#
# id :integer not null, primary key
# uuid :string(255) not null
@@ -14,6 +14,7 @@
# lock_version :integer default(0)
# created_at :datetime
# updated_at :datetime
+# owner_id :integer
#
#
diff --git a/src/app/models/legacy_deployable.rb b/src/app/models/legacy_deployable.rb
index b84ff13..aa68faf 100644
--- a/src/app/models/legacy_deployable.rb
+++ b/src/app/models/legacy_deployable.rb
@@ -1,7 +1,7 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
-# Table name: deployables
+# Table name: legacy_deployables
#
# id :integer not null, primary key
# name :string(255)
@@ -13,6 +13,7 @@
# uri :string(255)
# summary :text
# uploaded :boolean
+# owner_id :integer
#
#
diff --git a/src/app/models/legacy_image.rb b/src/app/models/legacy_image.rb
index ac1225b..61ca46e 100644
--- a/src/app/models/legacy_image.rb
+++ b/src/app/models/legacy_image.rb
@@ -1,18 +1,18 @@
# == Schema Information
-# Schema version: 20110223132404
+# Schema version: 20110603204130
#
-# Table name: images
+# Table name: legacy_images
#
-# id :integer not null, primary key
-# uuid :string(255)
-# name :string(255) not null
-# build_id :string(255)
-# uri :string(255)
-# status :string(255)
-# template_id :integer
-# created_at :datetime
-# updated_at :datetime
-# provider_type_id :integer default(100), not null
+# id :integer not null, primary key
+# uuid :string(255)
+# name :string(255) not null
+# build_id :string(255)
+# uri :string(255)
+# status :string(255)
+# legacy_template_id :integer
+# created_at :datetime
+# updated_at :datetime
+# provider_type_id :integer default(100), not null
#
#
diff --git a/src/app/models/legacy_provider_image.rb
b/src/app/models/legacy_provider_image.rb
index 2967d4c..cc25944 100644
--- a/src/app/models/legacy_provider_image.rb
+++ b/src/app/models/legacy_provider_image.rb
@@ -1,10 +1,10 @@
# == Schema Information
-# Schema version: 20110302120000
+# Schema version: 20110603204130
#
-# Table name: provider_images
+# Table name: legacy_provider_images
#
# id :integer not null, primary key
-# image_id :integer not null
+# legacy_image_id :integer not null
# provider_id :integer not null
# provider_image_key :string(255)
# uuid :string(255)
diff --git a/src/app/models/legacy_template.rb b/src/app/models/legacy_template.rb
index e236072..3fbf137 100644
--- a/src/app/models/legacy_template.rb
+++ b/src/app/models/legacy_template.rb
@@ -1,23 +1,24 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
# Table name: legacy_templates
#
-# id :integer not null, primary key
-# uuid :string(255) not null
-# xml :binary not null
-# uri :string(255)
-# name :string(255)
-# platform :string(255)
-# platform_version :string(255)
-# architecture :string(255)
-# summary :text
-# complete :boolean
-# uploaded :boolean
-# imported :boolean
-# images_count :integer
-# created_at :datetime
-# updated_at :datetime
+# id :integer not null, primary key
+# uuid :string(255) not null
+# xml :binary not null
+# uri :string(255)
+# name :string(255)
+# platform :string(255)
+# platform_version :string(255)
+# architecture :string(255)
+# summary :text
+# complete :boolean
+# uploaded :boolean
+# imported :boolean
+# legacy_images_count :integer
+# created_at :datetime
+# updated_at :datetime
+# owner_id :integer
#
require 'util/image_descriptor_xml'
diff --git a/src/app/models/pool.rb b/src/app/models/pool.rb
index 081c171..a243e12 100644
--- a/src/app/models/pool.rb
+++ b/src/app/models/pool.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
# Table name: pools
#
@@ -11,6 +11,7 @@
# lock_version :integer default(0)
# created_at :datetime
# updated_at :datetime
+# enabled :boolean
#
#
diff --git a/src/app/models/pool_family.rb b/src/app/models/pool_family.rb
index 36f68a7..2caa751 100644
--- a/src/app/models/pool_family.rb
+++ b/src/app/models/pool_family.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 20110207110131
+# Schema version: 20110603204130
#
# Table name: pool_families
#
@@ -9,6 +9,7 @@
# lock_version :integer default(0)
# created_at :datetime
# updated_at :datetime
+# quota_id :integer
#
#
ACK
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.