cassandra_migrations 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTkyY2FiYmVjMzk2NGFlYzczZjJkYjE4MDE2MDc4NTM4ZmE5MzBlYg==
+    MTU2OWUzZTUzYjcxMDk1NzMxNjMwZWI4ZjE2NzY0YjcxZjc1ODE0Mw==
   data.tar.gz: !binary |-
-    Y2UxMzZlYWI3YjcwYzJjYTkyYjQ1ZmJkODg5YzBhYTRlOWRkYzVmZg==
+    M2IyMWVkNTc1YjdkMTNiZjZmMjE1YTBkZDdhNzA1ZGVlNTliZWMwYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmU2YmZhMmVhYmM3ZjU3MzBmOWMxNjRhYmI0ZjBhNTU0NTUxNjJlZmExN2U5
-    MGM5ZTk5ZWU0ZGIwY2FiZTFiZGQ2NTZjYzNiMzlmNmY2YWIwZjc4OWM3OWNl
-    MWEyMWNlN2IxOWY0ZDJmZjkxYTk0ZGMxNDAxNjg3MTk3NTdlZDk=
+    NzQxOWNkN2IyZGVlMTgxZWIwMzI3MzYxOTQ0MGEyNDM3MGQyMWU2YWEwZGI0
+    ZjY3ZGIyMzY2NTc2ZGRjMjVmMzJmODkyODMxNzZhNmU3ZTQ0ZTIyYmJiMWQ0
+    NTI2OTFhOTljOWVmZjE1MmFjOTIyNzNiYWQ0Y2FlYzUzNjNhMjM=
   data.tar.gz: !binary |-
-    OGI5YmNkZTE5ZjJjZjIxMzk2ZjJkZDBkMTY5ZDgzYzc1YWRlMGUzZGM5NzUw
-    ZTYyNmUzZDY2NWU5NGVmOTQwOGZkOTBmYmY0YjlmNjQyY2M1OGRmOWNhYmM5
-    YWFiMmU1MzhiOTFkYTkxMDNlOGVjZGVkNzQ1ZjcyNmMyYTEzZDU=
+    Yzg3NzE4YTEzZmZiYzMyOTI3NzQ2NzEyMjAzYTdlODQwMGU0ZThiNWJhOGU1
+    NGU0ZGNhYjMwOWMwMjk0NTczODRiNWI1ZWNlMzllZWJhMzAxOGY2YzYwZjdh
+    MzBhZDAzNDgyNzhjNjBiZGM3NDU4NzM5MGYyNzBjMDk2ZDdhZGU=

data/lib/cassandra_migrations/migration/table_definition.rb

@@ -16,6 +16,7 @@ module CassandraMigrations
       def initialize()
         @columns_name_type_hash = {}
         @primary_keys = []
+        @partition_keys = []
       end
       
       def to_create_cql
@@ -29,8 +30,11 @@ module CassandraMigrations
           raise Errors::MigrationDefinitionError, 'No columns defined for table.'
         end
 
-        if !@primary_keys.empty?
-          cql << "PRIMARY KEY(#{@primary_keys.join(', ')})"
+        key_info = (@primary_keys - @partition_keys)
+        key_info = ["(#{@partition_keys.join(', ')})", *key_info] if @partition_keys.any?
+
+        if key_info.any?
+          cql << "PRIMARY KEY(#{key_info.join(', ')})"
         else
           raise Errors::MigrationDefinitionError, 'No primary key defined.'
         end
@@ -152,7 +156,15 @@ module CassandraMigrations
         
         @primary_keys = keys.flatten
       end
-      
+
+      def define_partition_keys(*keys)
+        if !@partition_keys.empty?
+          raise Errors::MigrationDefinitionError, 'Partition key defined twice for the same table.'
+        end
+        
+        @partition_keys = keys.flatten
+      end
+
       private
       
         def column_type_for(ruby_type, options={})

data/lib/cassandra_migrations/migration/table_operations.rb

@@ -19,6 +19,7 @@ module CassandraMigrations
       def create_table(table_name, options = {})
         table_definition = TableDefinition.new
         table_definition.define_primary_keys(options[:primary_keys]) if options[:primary_keys]
+        table_definition.define_partition_keys(options[:partition_keys]) if options[:partition_keys]
 
         yield table_definition if block_given?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_migrations
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Henrique Gubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb